diff --git a/COPYRIGHT b/COPYRIGHT
index 830e89ff116..05d6c08e753 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -16,7 +16,6 @@ ArtiChow          1.07     Public Domain               Yes              Graphics
 CKEditor		  3.6.1	   GPL or LGPL 2.1 or MPL 1.1  Yes				Editor WYSIWYG
 EFC/XFSS		  1.0.1	   LGPL 3.0					   Yes				Enhanced File Crypt/Extended File Stealth System
 FCKEditor         2.6.6    LGPL 2.1 or Mozilla PL 1.0  Yes              Editor WYSIWYG
-Flot              0.7      MIT Licence                 Yes              JS library to build graph
 FPDF              1.6      Public domain               Yes              PDF generation (original code is modified)
 FPDF_TPL          1.1.5    Apache Software License 2.0 No GPL3 only     PDF templates management
 FPDI              1.3.4    Apache Software License 2.0 No GPL3 only     PDF templates management
@@ -24,6 +23,7 @@ FPDI_Protection   1.0.3    Apache Software License 2.0 No GPL3 only     PDF encr
 GeoIP             x.x                                  Yes              GeoIP Maxmind conversion
 jQuery            1.6.1    GPL and MIT Licence         Yes              JS library
 jQuery UI         1.8.14   GPL and MIT Licence         Yes              JS library plugin UI
+jQuery Flot       0.7      MIT Licence                 Yes              JS library to build graph
 jQuery JCrop      0.9.8    MIT Licence                 Yes              JS library plugin Crop (to crop images)
 jQuery Layout     1.3.0	   GPL and MIT Licence         Yes              JS library plugin Layout (RC-29.15)
 jQuery TableDnD   0.5      GPL and MIT Licence         Yes              JS library plugin TableDnD (to reorder table rows)
diff --git a/ChangeLog b/ChangeLog
index 2808c594086..1eeba354fd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 --------------------------------------------------------------
 English Dolibarr ChangeLog
-$Id: ChangeLog,v 1.424 2011/07/13 14:16:39 eldy Exp $
+$Id: ChangeLog,v 1.425 2011/07/29 10:55:22 simnandez Exp $
 --------------------------------------------------------------
 
 ***** ChangeLog for 3.1 compared to 3.0 *****
@@ -74,6 +74,7 @@ For users:
 - New: Look: Minor enhancements into agenda view.
 - New: Look: Nicer tooltips with transparency and shadow.
 - New: task #11004: Create invoice from intervention.
+- New: task #10501: Can use point of sale with different bank accounts.
 - Fix: Better Postgresql compatibility.
 - Fix: Numbering module for invoices use same number for invoice 
        and credit note if mask is same.
diff --git a/build/.cvsignore b/build/.cvsignore
index d97289222c3..53dd6ee2abd 100644
--- a/build/.cvsignore
+++ b/build/.cvsignore
@@ -13,3 +13,7 @@ module_pibarcode-1.0.tgz
 version-phpsane.txt
 makepack-phpsane.conf
 html
+*.deb
+*.dsc
+*.tar.gz
+*.changes
diff --git a/build/aps/configure.php b/build/aps/configure.php
index 62ca849d62a..996d617bd07 100755
--- a/build/aps/configure.php
+++ b/build/aps/configure.php
@@ -1,11 +1,12 @@
+#!/usr/bin/php
 <?php
 /*-----------------------------------------------------
  *
  *----------------------------------------------------- */
 
-// This is list of predefined languages when script is ran.
-// We set them manually for test purpose
-putenv('SETTINGS_admin_name=admin');
+// This is list of predefined variables when script is ran
+// We have to set them manually to run script outside context.
+/*putenv('SETTINGS_admin_name=admin');
 putenv('SETTINGS_admin_password=admin-ad');
 putenv('BASE_URL_SCHEME=http');
 putenv('BASE_URL_HOST=localhost');
@@ -18,7 +19,7 @@ putenv('DB_main_HOST=localhost');
 putenv('DB_main_PORT=3306');
 putenv('DB_main_LOGIN=root');
 putenv('DB_main_PASSWORD=root');
-
+*/
 
 // Check parameters
 if(count($_SERVER['argv']) < 2)
diff --git a/build/deb/README b/build/deb/README
index 6b15ee07cba..edb46ffd5a3 100644
--- a/build/deb/README
+++ b/build/deb/README
@@ -7,19 +7,30 @@ This directory contains files used by makepack-dolibarr.pl
 script to build a package, ready to be distributed,
 with format .DEB (for Debian, Ubuntu, ...).
 
+# To build a debian package, you need first
+# apt-get -i debhelper 
+# apt-get -i dpkg-source 
+# apt-get -i gpg
+
 
 # This is standard command to work on Debian packaging:
 #
-# lintian package       To test a package   
+# gpg --gen-key                          Generate a GPG key
 #
-# dpkg -l               List all packages
-# dpkg -b               To build package
-# dpkg -c package.deb   List content of package
-# dpkg -I package.deb   Give informations on package
-# dpkg -i package.deb   Install a package
+# debconf-updatepo					     To run into po dir to regenate templates.pot 
 #
-# dpkg -L packagename   List content of installed package 
-# dpkg --purge          Remove config files and interactive saved answers
+# lintian --pedantic -E -I package.deb   To test a package   
+#
+# dpkg -l                                List all packages
+# dpkg -b                                To build package
+# dpkg -c package.deb                    List content of package
+# dpkg -I package.deb                    Give informations on package
+# dpkg -i package.deb                    Install a package
+#
+# dpkg -L packagename                    List content of installed package 
+# dpkg --purge                           Remove config files and interactive saved answers
+#
+# dpkg-buildpackage -us -uc              Build a source and binary package
 
 
 To submit a package to Debian:
@@ -36,3 +47,7 @@ For first ITP submission of Dolibarr, bug id was 634783.
 - Add a line for upstream into file changelog with bug number
 
 - Call for a mentor on ML debian-mentors to upload packages
+
+- Once package is uploaded, following URL are available:
+http://packages.qa.debian.org/package.html
+http://bugs.debian.org/package
diff --git a/build/deb/README.debian b/build/deb/README.debian
new file mode 100755
index 00000000000..a4dacc288af
--- /dev/null
+++ b/build/deb/README.debian
@@ -0,0 +1,103 @@
+README (english)
+--------------------------------
+Starter documentation
+--------------------------------
+
+1) Install Dolibarr
+2) Upgrade Dolibarr from an older version
+3) What's new in this version
+4) What Dolibarr can do
+5) What Dolibarr can't do yet, todo list
+
+
+I - DOLIBARR INSTALL
+--------------------
+
+Dolibarr files and its dependencies are automatically installed when you install
+the dolibarr Debian package.
+  
+Once package is installed, go on menu entry called Dolibarr or use your web browser
+to call page http://localhost/dolibarr
+
+
+
+II - DOLIBARR UPGRADE
+---------------------
+
+Dolibarr files and its dependencies are automatically upgraded when you install
+the dolibarr Debian package.
+
+Once new package is installed, go on menu entry called Dolibarr or use your web browser
+to call page http://localhost/dolibarr
+If a database upgrade is required, you will be prompted to. 
+
+  
+
+III - WHAT'S NEW
+----------------
+
+See ChangeLog file.
+
+
+
+IV - WHAT DOLIBARR CAN DO
+-------------------------
+
+Main modules/features:
+- Products and services catalog
+- Customers, Prospects or Suppliers directory
+- Address book
+- Stock management
+- Bank accounts management
+- Orders management with PDF export
+- Commercial proposals management with PDF export
+- Contracts management
+- Invoices management with PDF export
+- Payments management
+- Standing orders management
+- Shipping management
+- ECM (Electronic Content Management)
+- EMailings
+- Agenda with ical,vcal export for third tools integration
+- Management of foundation members
+- Donation management
+
+Other modules:
+- Bookmarks management
+- Can reports Dolibarr events inside Webcalendar or Phenix
+- Data export tools
+- LDAP connectivity
+- Third parties or products categories 
+- ClickToDial phone numbers
+- RSS
+
+Miscellanous:
+- Mutli-user, with several permissions levels for each feature.
+- Serveral menu managers (can be used by internal users, as a back-office,
+  with a particular menu, or by external users, as a front-office, with
+  another menu and permissions).
+- Very user friendly and easy to use.
+- Optional WYSIWYG forms, optional Ajax forms.
+- Several skins.
+- Code is highly customizable (a lot of use of modules and submodules).
+- Works with Mysql 3.1 or higher, experimental support for PostgreSql.
+- Works with PHP 4.3 or higher.
+- An easy to understand and maintain code (PHP with no heavy frameworks).
+- A trigger architecture to allow you to make Dolibarr business events run
+  PHP code to update your own information system.
+- "NPR VAT Rate" (French particularity for managing VAT in DOM-TOM 
+  called "Non Perçue Récupérable").
+
+
+
+V - WHAT DOLIBARR CAN'T DO YET (TODO LIST)
+------------------------------------------
+This is features that Dolibarr does not support completely yet:
+- Accountancy.
+- Dolibarr can manage only one currency.
+- Dolibarr does not support the double Canadian Tax.
+- Dolibarr does not make coffee (not yet).
+- Stock management with option increase/decrease on invoice works on
+  warehouse number one only (no way to choose warehouse).
+- Stock management with option increase/decrease on orders works on
+  warehouse number one only (no way to choose warehouse).
diff --git a/build/deb/apache.conf b/build/deb/apache.conf
index a69e134b325..249c100245d 100644
--- a/build/deb/apache.conf
+++ b/build/deb/apache.conf
@@ -65,6 +65,13 @@ Alias /dolibarr /usr/share/dolibarr/htdocs
     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
diff --git a/build/deb/changelog b/build/deb/changelog
index d4a628fbb4f..b035f18ae1d 100644
--- a/build/deb/changelog
+++ b/build/deb/changelog
@@ -1,9 +1,9 @@
-dolibarr (3.1.0-1) unstable; urgency=low
+dolibarr (3.1.0-1.1) unstable; urgency=low
 
-  [ Laurent Destailleur ]
+  * Non-maintainer upload
   * New upstream release.
     closes: bug#634783
     
- -- Laurent Destailleur <eldy@destailleur.fr>  Mon, 18 Jul 2011 12:00:00 +0100     
+ -- Laurent Destailleur <eldy@users.sourceforge.net>  Mon, 30 Jul 2011 12:00:00 +0100     
 
-# More information into /usr/share/dolibarr/ChangeLog file. 
\ No newline at end of file
+# For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. 
\ No newline at end of file
diff --git a/build/deb/compat b/build/deb/compat
new file mode 100644
index 00000000000..c7930257dfe
--- /dev/null
+++ b/build/deb/compat
@@ -0,0 +1 @@
+7
\ No newline at end of file
diff --git a/build/deb/conf.php.install b/build/deb/conf.php.install
new file mode 100755
index 00000000000..c6d2d5d384b
--- /dev/null
+++ b/build/deb/conf.php.install
@@ -0,0 +1,232 @@
+<?php
+# Dolibarr conf.php file
+#
+# Do not edit this file without changing its name.
+# This file is used by Dolibarr setup process to create true Dolibarr
+# config file called "conf.php".
+#
+# $Id: conf.php.install,v 1.1 2011/07/30 14:56:12 eldy Exp $
+
+
+###################
+# Main parameters #
+###################
+
+# dolibarr_main_url_root
+# This parameter defines the root URL of your Dolibarr index.php page.
+# It must link to the htdocs directory htdocs.
+# In most cases, this is autodetected but it still required to show full
+# url bookmarks for some services (ie: agenda rss export url, ...) or
+# when using Apache dir aliases (autodetect fails).
+# Examples:
+# $dolibarr_main_url_root='http://localhost';
+# $dolibarr_main_url_root='http://mydolibarrvirtualhost';
+# $dolibarr_main_url_root='http://myserver/dolibarr/htdocs';
+# $dolibarr_main_url_root='http://myserver/dolibarralias';
+#
+$dolibarr_main_url_root='http://localhost';
+
+
+# dolibarr_main_document_root
+# This parameter contains absolute file system directory of Dolibarr
+# htdocs directory
+# Examples:
+# $dolibarr_main_document_root='/var/www/dolibarr/htdocs';
+# $dolibarr_main_document_root='C:/My web sites/dolibarr/htdocs';
+#
+$dolibarr_main_document_root='/usr/share/dolibarr/htdocs';
+
+
+# dolibarr_main_data_root
+# This parameter contains absolute file system directory of Dolibarr
+# directory used to store uploaded and generated physical files.
+# Examples:
+# $dolibarr_main_data_root='/var/www/dolibarr/documents';
+# $dolibarr_main_data_root='E:/My web sites/dolibarr/documents';
+#
+$dolibarr_main_data_root='/var/lib/dolibarr/documents';
+
+
+# dolibarr_main_db_host
+# This parameter contains host name or ip address of Dolibarr database
+# server.
+# Examples:
+# $dolibarr_main_db_host='localhost';
+# $dolibarr_main_db_host='127.0.0.1';
+# $dolibarr_main_db_host='192.168.0.10';
+# $dolibarr_main_db_host='mysql.myserver.com';
+#
+$dolibarr_main_db_host='127.0.0.1';
+
+
+# dolibarr_main_db_port
+# This parameter contains the port of the Dolibarr database.
+# Default value: none
+# Examples:
+# $dolibarr_main_db_host='3306';
+#
+$dolibarr_main_db_port='3306';
+
+
+# dolibarr_main_db_name
+# This parameter contains name of Dolibarr database.
+# Examples:
+# $dolibarr_main_db_name='dolibarr';
+# $dolibarr_main_db_name='mydatabase';
+#
+$dolibarr_main_db_name='dolibarr';
+
+
+# dolibarr_main_db_user
+# This parameter contains user name used to read and write into
+# Dolibarr database.
+# Examples:
+# $dolibarr_main_db_user='admin';
+# $dolibarr_main_db_user='dolibarruser';
+#
+$dolibarr_main_db_user='dolibarruser';
+
+
+# dolibarr_main_db_pass
+# This parameter contains password used to read and write into
+# Dolibarr database.
+# Examples:
+# $dolibarr_main_db_pass='myadminpass';
+# $dolibarr_main_db_pass='myuserpassword';
+#
+$dolibarr_main_db_pass='';
+
+
+# dolibarr_main_db_type
+# This parameter contains the name of the driver used to access your
+# Dolibarr database.
+# Default value: none
+# Possible values: mysql, mysqli, pgsql
+# Examples:
+# $dolibarr_main_db_type='mysql';
+# $dolibarr_main_db_type='mysqli';
+# $dolibarr_main_db_type='pgsql';
+#
+$dolibarr_main_db_type='mysqli';
+
+
+# dolibarr_main_db_character_set
+# Database character set used to store data (forced during database creation).
+# Default value: depends on database driver
+# Examples:
+# dolibarr_main_db_character_set='latin1';
+#
+$dolibarr_main_db_character_set='latin1';
+
+
+# dolibarr_main_db_collation
+# Database character set used to sort data (forced during database creation).
+# Default value: depends on database driver
+# Examples:
+# dolibarr_main_db_collation='latin1_swedish_ci';
+#
+$dolibarr_main_db_collation='latin1_swedish_ci';
+
+
+
+##################
+# Login          #
+##################
+
+# dolibarr_main_authentication
+# This parameter contains the way authentication is done.
+# If value "ldap" is used, you must also set parameters dolibarr_main_auth_ldap_*
+# Default value: dolibarr
+# Possible values: Any values found in files in htdocs/includes/login directory after
+# the "function_" string and before the ".php" string. You can also separate several
+# values using a ",". In this case, Dolibarr will check login/pass for each value in 
+# order defined into value. However, note that this can't work with all values.
+# Examples:
+# $dolibarr_main_authentication='http';
+# $dolibarr_main_authentication='dolibarr';
+# $dolibarr_main_authentication='ldap';
+# $dolibarr_main_authentication='openid,dolibarr';
+#
+$dolibarr_main_authentication='dolibarr';
+
+
+# Parameters used to setup LDAP authentication.
+# Uncomment them if dolibarr_main_authentication = 'ldap'
+#
+# $dolibarr_main_auth_ldap_host='127.0.0.1';
+# $dolibarr_main_auth_ldap_port='389';
+# $dolibarr_main_auth_ldap_version='3';
+# $dolibarr_main_auth_ldap_servertype='openldap';			# openldap, activedirectory or egroupware
+# $dolibarr_main_auth_ldap_login_attribute='loginfield';	   # Ex: uid or samaccountname for active directory
+# $dolibarr_main_auth_ldap_dn='ou=users,dc=my-domain,dc=com';  # Ex: ou=users,dc=my-domain,dc=com
+# $dolibarr_main_auth_ldap_filter = '';                        # If defined, two previous parameters are not used to find a user into LDAP. Ex: (uid=%1%) or &(uid=%1%)(isMemberOf=cn=Sales,ou=Groups,dc=opencsi,dc=com).
+# $dolibarr_main_auth_ldap_admin_login='';					# Required only if anonymous bind disabled. Ex: cn=admin,dc=example,dc=com
+# $dolibarr_main_auth_ldap_admin_pass='';					# Required only if anonymous bind disabled. Ex: secret
+
+# $dolibarr_main_auth_ldap_debug='false';
+
+
+# dolibarr_main_demo
+# Login and pass to use in a demo mode
+# Default value: ''
+# Examples:
+# $dolibarr_main_demo='autologin,autopass'
+
+
+
+##################
+# Security       #
+##################
+
+# dolibarr_main_force_https
+# This parameter allows to force the HTTPS mode.
+# Warning: If you enable this parameter, your web server must be configured
+# to respond URL with https protocol.
+# Default value: 0
+# Possible values: 0 or 1
+# Examples:
+# $dolibarr_main_force_https='0';
+#
+$dolibarr_main_force_https='0';
+
+# dolibarr_nocsrfcheck
+# This parameter can be used to disable CSRF protection.
+# This might be required if you access Dolibarr behind a proxy that make
+# URL rewriting to avoid false alarms.
+# Default value: 0
+# Possible values: 0 or 1
+# Examples:
+# $dolibarr_nocsrfcheck='0';
+#
+$dolibarr_nocsrfcheck='0';
+
+# dolibarr_main_prod
+# When this parameter is defined, all errors messages are not reported.
+# This feature exists for production usage to avoid to give any information to hackers.
+# Default value: 0
+# Possible values: 0 or 1
+# Examples:
+# $dolibarr_main_prod='0';
+#
+$dolibarr_main_prod='0';
+
+
+
+##################
+# Other          #
+##################
+
+# dolibarr_main_limit_users
+# Can set a limit on the number of users it will be possible to create
+# (the superadmin not included), can be used for a restricted mode.
+# Default value: 0 (unlimited)
+# Examples:
+# $dolibarr_main_limit_users='0';
+
+# dolibarr_mailing_limit_sendbyweb
+# Can set a limit for mailing send by web, can be used for a restricted mode.
+# Default value: 0 (use database value if exist)
+# Examples:
+# $dolibarr_mailing_limit_sendbyweb='0';
+
+?>
diff --git a/build/deb/control b/build/deb/control.DEBIAN
old mode 100644
new mode 100755
similarity index 54%
rename from build/deb/control
rename to build/deb/control.DEBIAN
index 0a664bb7034..7c66775bdf1
--- a/build/deb/control
+++ b/build/deb/control.DEBIAN
@@ -2,14 +2,12 @@ Package: dolibarr
 Version: __VERSION__
 Architecture: all
 Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
-Essential: no
 Installed-Size: 61200
-Depends: apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, mysql-server, perl
+Depends: xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl
 Section: web
 Priority: optional
-Recommends: firefox
 Homepage: http://www.dolibarr.org
-Description: Easy to use ERP & CRM software to manage your activity.
+Description: Easy to use web based ERP & CRM software
  Dolibarr ERP & CRM is an easy to use open source/free software for small 
  and medium companies, foundations or freelances. It includes different 
  features for Enterprise Resource Planning (ERP) and Customer Relationship
@@ -21,29 +19,28 @@ Description: Easy to use ERP & CRM software to manage your activity.
  Only features you need are visible, depending on which module were activated.
  Most common used modules are:
  .
- Customers, Suppliers or Prospects directory
- Contacts directory
- Orders management
- Commercial proposals management
- Invoices management
- Products and services catalog
- Stock management
- Foundations members management
- Bank accounts management
- Point of Sale
- Payments management
- Commercial actions management
- Contracts management
- Standing orders management
- Shipping management
- Donations management
- Bookmarks management
- Mass Emailings
- Reports
- Data export and import tools
- LDAP connectivity
- PDF exports
+ Customers, Suppliers or Prospects directory,
+ Contacts directory,
+ Orders management,
+ Commercial proposals management,
+ Invoices management,
+ Products and services catalog,
+ Stock management,
+ Foundations members management,
+ Bank accounts management,
+ Point of Sale,
+ Payments management,
+ Commercial actions management,
+ Contracts management,
+ Standing orders management,
+ Shipping management,
+ Donations management,
+ Bookmarks management,
+ Mass Emailings,
+ Reports,
+ Wizards to export and import data,
+ LDAP connectivity,
+ PDF exports,
  And a lot of more modules...
  .
  You can also add third parties external modules or develop yours.
- 
\ No newline at end of file
diff --git a/build/deb/control.debian b/build/deb/control.debian
new file mode 100755
index 00000000000..91f0705c001
--- /dev/null
+++ b/build/deb/control.debian
@@ -0,0 +1,51 @@
+Source: dolibarr
+Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
+Standards-Version: 3.9.1
+Section: web
+Priority: optional
+Homepage: http://www.dolibarr.org
+Build-Depends: debhelper, po-debconf
+
+Package: dolibarr
+Depends: ${misc:Depends}, xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl
+Architecture: all
+Section: web
+Priority: optional
+Homepage: http://www.dolibarr.org
+Description: Easy to use web based ERP & CRM software
+ Dolibarr ERP & CRM is an easy to use open source/free software for small 
+ and medium companies, foundations or freelances. It includes different 
+ features for Enterprise Resource Planning (ERP) and Customer Relationship
+ Management (CRM) but also for different other activities.
+ It's a web software you can install as a standalone program or on any web
+ hosting provider to use it from anywhere with any web browser.
+ Dolibarr was designed to provide only features you need and be easy to use.
+ .
+ Only features you need are visible, depending on which module were activated.
+ Most common used modules are:
+ .
+ Customers, Suppliers or Prospects directory,
+ Contacts directory,
+ Orders management,
+ Commercial proposals management,
+ Invoices management,
+ Products and services catalog,
+ Stock management,
+ Foundations members management,
+ Bank accounts management,
+ Point of Sale,
+ Payments management,
+ Commercial actions management,
+ Contracts management,
+ Standing orders management,
+ Shipping management,
+ Donations management,
+ Bookmarks management,
+ Mass Emailings,
+ Reports,
+ Wizards to export and import data,
+ LDAP connectivity,
+ PDF exports,
+ And a lot of more modules...
+ .
+ You can also add third parties external modules or develop yours.
\ No newline at end of file
diff --git a/build/deb/copyright b/build/deb/copyright
index 9d62fbbd285..c69ae11a4a6 100644
--- a/build/deb/copyright
+++ b/build/deb/copyright
@@ -7,13 +7,23 @@ Files: *
 Copyright: 2002-2009, Rodolphe Quiedeville   <rodolphe@quiedeville.org>
            2003-2011, Laurent Destailleur    <eldy@users.sourceforge.net>
            2004-2011, Regis Houssin          <regis@dolibarr.fr>
-           2003, Jean-Louis Bergamo          <jlb@j1b.org>
+           2006-2011, Auguria SARL           <info@auguria.org>
+           2010-2011, Juanjo Menent          <jmenent@2byte.es>
+           2003-2006, Jean-Louis Bergamo     <jlb@j1b.org>
+           2003, Xavier Dutoit               <doli@sydesy.com>
            2004, Sebastien Di Cintio         <sdicintio@ressource-toi.org>
            2004, Benoit Mortier              <benoit.mortier@opensides.be>
            2004, Christophe Combelles        <ccomb@free.fr>
+           2004, Eric Seigne                 <eric.seigne@ryxeo.com>
+           2005, Patrick Rouillon            <patrick@rouillon.net>
+           2005, Marc Barilley / Ocebo       <marc@ocebo.com>
+           2006, Andre Cianfarani            <acianfa@free.fr>
+           2006, Jean Heimburger             <jean@tiaris.info>
+           2007, Patrick Raguin              <patrick.raguin@gmail.com>
+           2007-2008, Jeremie Ollivier       <jeremie.o@laposte.net>
            2008, Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
-           2010-2011, Juanjo Menent          <jmenent@2byte.es>
-License: GPL-2+
+           2010, Servitux Servicios Informaticos <info@servitux.es>
+ License: GPL-2+
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public
  License as published by the Free Software Foundation; either
@@ -33,4 +43,36 @@ License: GPL-2+
  .
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
\ No newline at end of file
+ `/usr/share/common-licenses/GPL-2'.
+ 
+ 
+Files: htdocs/includes/artichow/*
+License: Public Domain
+
+Files: htdocs/includes/ckeditor/*
+License: GPL-2+
+
+Files: htdocs/includes/efc_xfss/*
+License: GPL-2+
+
+Files: htdocs/includes/fckeditor/*
+License: GPL-2+
+
+Files: htdocs/includes/magpierss/*
+License: GPL-2+
+
+Files: htdocs/includes/jquery/*
+License: GPL-2+ or MIT
+
+Files: htdocs/includes/jsgantt/*
+License: GPL-2+
+
+Files: htdocs/includes/phpwrite_excel/*
+License: LGPL 2.1
+
+Files: htdocs/includes/odtphp/*
+License: GPL-2+
+
+Files: htdocs/includes/tcpdf/*
+License: LGPL 3.0
+ 
\ No newline at end of file
diff --git a/build/deb/docs b/build/deb/docs
deleted file mode 100644
index 30d29dea9be..00000000000
--- a/build/deb/docs
+++ /dev/null
@@ -1 +0,0 @@
-doc/*
diff --git a/build/deb/dolibarr.desktop b/build/deb/dolibarr.desktop
index 5d11eb40ffb..a48e5048dff 100644
--- a/build/deb/dolibarr.desktop
+++ b/build/deb/dolibarr.desktop
@@ -2,7 +2,6 @@
 # This file is used to add Ubuntu menu entry
 # It must be saved into directory /usr/share/applications
 Version=1.0
-Encoding=UTF-8
 Name=Dolibarr ERP & CRM
 Name[fr]=Dolibarr ERP & CRM
 GenericName=Dolibarr ERP & CRM
@@ -10,9 +9,9 @@ Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or
 Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations
 # Command to open an URL
 # For Fedora: xdg-open 
-# For Debian/Ubuntu: x-www-browser
+# For Debian/Ubuntu: xdg-open or x-www-browser
 # (exo-open for xfde, gnome-open for gnome, ...)
-Exec=x-www-browser http://localhost/dolibarr
+Exec=xdg-open http://localhost/dolibarr
 Icon=dolibarr
 Terminal=false
 Type=Application
diff --git a/build/deb/examples b/build/deb/examples
deleted file mode 100755
index aa4824411d6..00000000000
--- a/build/deb/examples
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/dolibarr/htdocs/conf/conf.php.example
\ No newline at end of file
diff --git a/build/deb/files b/build/deb/files
deleted file mode 100644
index a75e2371260..00000000000
--- a/build/deb/files
+++ /dev/null
@@ -1,2 +0,0 @@
-etc
-usr
diff --git a/build/deb/format b/build/deb/format
new file mode 100644
index 00000000000..9f8e9b69a33
--- /dev/null
+++ b/build/deb/format
@@ -0,0 +1 @@
+1.0
\ No newline at end of file
diff --git a/build/deb/install b/build/deb/install
new file mode 100755
index 00000000000..4d41fd52c65
--- /dev/null
+++ b/build/deb/install
@@ -0,0 +1,5 @@
+etc/dolibarr/apache.conf
+usr/share/applications/dolibarr.desktop
+usr/share/doc/dolibarr
+usr/share/dolibarr
+usr/share/pixmaps
diff --git a/build/deb/install.forced.php.install b/build/deb/install.forced.php.install
index 1166abe41ae..7de8616ac15 100755
--- a/build/deb/install.forced.php.install
+++ b/build/deb/install.forced.php.install
@@ -4,19 +4,19 @@
 // This file must be present into htdocs/install directory
 // during install process to be used.
 //
-// $Id: install.forced.php.install,v 1.7 2011/07/09 15:48:19 eldy Exp $
+// $Id: install.forced.php.install,v 1.9 2011/07/30 14:56:12 eldy Exp $
 //
 
-$force_install_noedit=1;
+$force_install_noedit=2;
 $force_install_message='KeepDefaultValuesDeb';
-$force_install_main_data_root='/usr/share/dolibarr/documents';
-#$force_install_main_data_root='/var/lib/dolibarr';
+#$force_install_main_data_root='/usr/share/dolibarr/documents';
+$force_install_main_data_root='/var/lib/dolibarr/documents';
 $force_install_type='mysqli';
 $force_install_dbserver='localhost';
 $force_install_port='3306';
-$force_install_database='dolibarr';
+$force_install_database='dolibarrdebian';
 $force_install_createdatabase='1';
-$force_install_databaselogin='dolibarrmysql';
+$force_install_databaselogin='dolibarrdebian';
 $force_install_databasepass='';
 $force_install_createuser='1';
 $force_install_databaserootlogin='__SUPERUSERLOGIN__';
diff --git a/build/deb/menu b/build/deb/menu
deleted file mode 100644
index 6dc724d0a02..00000000000
--- a/build/deb/menu
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file seems to be useless for Ubuntu
-# Good way to add menu on Ubuntu is adding file dolibarr.desktop
-text Apps/Misc dolibarr none "Dolibarr ERP/CRM" rundolibarr.sh
\ No newline at end of file
diff --git a/build/deb/po/POTFILES.in b/build/deb/po/POTFILES.in
new file mode 100755
index 00000000000..98e8416d9a3
--- /dev/null
+++ b/build/deb/po/POTFILES.in
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] templates
\ No newline at end of file
diff --git a/build/deb/po/fr.po b/build/deb/po/fr.po
new file mode 100755
index 00000000000..13b8030ed0d
--- /dev/null
+++ b/build/deb/po/fr.po
@@ -0,0 +1,48 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 1.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-07-27 19:49+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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Project-Id: dolibarr\n"
+
+#
+#. Type: boolean
+#. Description
+#: ../templates:1001
+#, fuzzy
+msgid "Delete database and uploaded files ?"
+msgstr "Effacer la base de donnée et les fichiers uploadés ?"
+
+#
+#. Type: boolean
+#. Description
+#: ../templates:1001
+#, fuzzy
+msgid ""
+"Answer if you want to removed the Dolibarr MySQL database and all other "
+"datas (datas related to this question are the Dolibarr DBMS account, all "
+"Dolibarr tables, and all uploaded files)."
+msgstr ""
+"Indiquez si vous voulez supprimer la base Dolibarr et toutes ces données "
+"(les données en question ici sont les comptes de la base, les tables et tous "
+"les fichiers téléchargés)."
diff --git a/build/deb/po/templates.pot b/build/deb/po/templates.pot
new file mode 100755
index 00000000000..32c92a97cc4
--- /dev/null
+++ b/build/deb/po/templates.pot
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-07-27 19:52+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Delete database and uploaded files ?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"Answer if you want to removed the Dolibarr MySQL database and all other "
+"datas (datas related to this question are the Dolibarr DBMS account, all "
+"Dolibarr tables, and all uploaded files)."
+msgstr ""
diff --git a/build/deb/postinst b/build/deb/postinst
index 03bd18987cd..ca5fd1645dd 100644
--- a/build/deb/postinst
+++ b/build/deb/postinst
@@ -23,18 +23,32 @@ db_version 2.0
 
 echo Run the dolibarr postinst script
 
+
+# Define vars
+docdir='/var/lib/dolibarr/documents'
+#docdir='/usr/share/dolibarr/documents'
+apachefileorig="/usr/share/dolibarr/build/deb/apache.conf"
+apacheconfig="/etc/dolibarr/apache.conf"
+installfileorig="/usr/share/dolibarr/build/deb/install.forced.php.install"
+installconfig="/etc/dolibarr/install.forced.php"
+#config="/usr/share/dolibarr/htdocs/conf/conf.php"
+config="/etc/dolibarr/conf.php"
+
+
 case "$1" in
 	configure)
 
-		# Copy apache.conf file into target directory
-		fileorig="/usr/share/dolibarr/build/deb/apache.conf"
-		config="/etc/dolibarr/apache.conf"
-		mkdir -p /etc/dolibarr
-		cp -p $fileorig $config
+        # 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
 
-		# Create install.forced.php into Dolibarr install directory
-		fileorig="/usr/share/dolibarr/build/deb/install.forced.php.install"
-		config="/usr/share/dolibarr/htdocs/install/install.forced.php"
+		# Copy apache.conf file into target directory
+		#mkdir -p /etc/dolibarr
+		#cp -p $apachefileorig $apacheconfig
+
+		# Copy install config file (with matching Debian) values into target directory
 		superuserlogin=''
 		superuserpassword=''
 		if [ -f /etc/mysql/debian.cnf ] ; then
@@ -44,31 +58,24 @@ case "$1" in
 		fi
 		echo Mysql superuser found to use is $superuserlogin
 		if [ -z "$superuserlogin" ] ; then
-			cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $config
+			cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig
 		else
-			cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $config
+			cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig
 		fi
-		
-        # Create document directory
-        #docdir='/var/lib/dolibarr/documents'
-        docdir='/usr/share/dolibarr/documents'
-        mkdir -p $docdir
-        chown -R www-data:www-data $docdir
-        chmod -R 775 $docdir
-        chmod -R g+s $docdir
+		chown -R root:www-data $installconfig
+	   	chmod -R 660 $installconfig
 
 		# Create an empty conf.php with permission to web server
-		if [ ! -f /usr/share/dolibarr/htdocs/conf/conf.php ]
+		if [ ! -f $config ]
 		then 
-			echo Create empty file /usr/share/dolibarr/htdocs/conf/conf.php		
-			touch /usr/share/dolibarr/htdocs/conf/conf.php
-			chown -R root:www-data /usr/share/dolibarr/htdocs/conf/conf.php
-	    	chmod -R 660 /usr/share/dolibarr/htdocs/conf/conf.php
+			echo Create empty file $config		
+			touch $config
+			chown -R root:www-data $config
+	    	chmod -R 660 $config
 		fi
 
-		#db_reset "dolibarr/webserver"
-
 		# Get the web server type (use db_get for interactive mode).
+		#db_reset "dolibarr/webserver"
 		#db_get "dolibarr/webserver"		# Read value for webserver.
 		#webserver="$RET"
 
@@ -96,12 +103,9 @@ case "$1" in
 
 			echo Web user.group used is $webuser.$webgroup
 
-			#
-			# That may lead to problems if apache & apache-ssl do
-			# not have the same user/group.
-			#
+			# Set permissions to web server
 			chown -R $webuser:$webgroup /usr/share/dolibarr
-            chown -R root:$webgroup /usr/share/dolibarr/htdocs/conf/conf.php
+            chown -R root:$webgroup $config
 
 			# Add link to config file
             echo Setup web server $server to add dolibarr config file
@@ -109,26 +113,6 @@ case "$1" in
 			
 		done
 
-		#echo "Install menu entry"
-		# This one is for Gnome ubuntu
-		#fileorig="/usr/share/dolibarr/build/deb/dolibarr.desktop"
-		#target="/usr/share/applications/"
-		#cp -f $fileorig $target
-		# Not sure this is usefull
-		#if test -x /usr/bin/update-menus; then 
-		#	echo "update-menus"
-		#	update-menus;
-		#fi
-		
-		# TODO Create the file to force parameters in Web installer
-		#if grep DBHOST /usr/share/dolibarr/htdocs/conf/conf.php > /dev/null
-		#then
-		#    perl -pi -e "s/DBHOST/$dbserver/" /usr/share/dolibarr/htdocs/conf/conf.php
-		#    perl -pi -e "s/DBNAME/$dbname/" /usr/share/dolibarr/htdocs/conf/conf.php
-		#    perl -pi -e "s/DBUSER/$dbuser/" /usr/share/dolibarr/htdocs/conf/conf.php
-		#    perl -pi -e "s/DBPASS/$dbpass/" /usr/share/dolibarr/htdocs/conf/conf.php
-		#fi
-
 		# Restart servers
 		servers="apache2-ssl apache2 mysql"
 		# Another way to restart
diff --git a/build/deb/postrm b/build/deb/postrm
index 0ade4671858..9eae81b022b 100644
--- a/build/deb/postrm
+++ b/build/deb/postrm
@@ -23,13 +23,17 @@ db_version 2.0
 
 echo Run the dolibarr postrm script
 
-#echo "postrm db_get dolibarr/webserver"
-# We disable set -e to avoid premature end of script if error
-set +e
-#db_get "dolibarr/webserver" || true
-set -e
-export webserver="$RET"
 
+docdir='/var/lib/dolibarr/documents'
+#docdir='/usr/share/dolibarr/documents'
+apachefileorig="/usr/share/dolibarr/build/deb/apache.conf"
+apacheconfig="/etc/dolibarr/apache.conf"
+#config="/usr/share/dolibarr/htdocs/conf/conf.php"
+config="/etc/dolibarr/conf.php"
+lockfile="/usr/share/dolibarr/install.lock"
+
+
+export webserver=""
 # Allows us to loop and substitute in one pass
 case $webserver in
 	Apache)		webservers="apache2" ;;
@@ -37,12 +41,38 @@ case $webserver in
 	Both)		webservers="apache2 apache2-ssl" ;;
 	*)		    webservers="apache2 apache2-ssl" ;;
 esac
-export includefile=/etc/dolibarr/apache.conf
+
 
 case "$1" in
+
+    # Call when we upgrade
+	upgrade)
+	;;
+
+    # Call when we uninstall
+	remove)
+		rm -f $lockfile
+
+		# Remove include files
+		export restart=""
+		for server in $webservers ; do
+			export conffile="/etc/$server/conf.d/dolibarr.conf"
+            if [ -f $conffile ] ;
+            then
+               echo Delete link $conffile
+	           rm -f $conffile
+	           status=purge
+		    fi
+			
+			if [ "x$status" = "xpurge" ] ;
+				then restart="$restart $server"
+			fi
+		done
+	;;
+
     # Call when we uninstall and purge
 	purge)
-		echo "postrm purge webservers=$webservers includefile=$includefile"
+		echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig"
 
 		# Ask if we must delete database
 		echo "postrm db_input dolibarr/postrm"
@@ -59,7 +89,8 @@ case "$1" in
 			echo postrm Mysql database deletion
 			# Get database configuration
 			dbserver="localhost"
-			dbname="dolibarrmysql"
+			dbuser="dolibarrdebian"
+			dbname="dolibarrdebian"
 			#db_get "dolibarr/db/name"
 			#dbname="$RET"
 			superuserlogin=''
@@ -120,40 +151,52 @@ case "$1" in
 			fi
 			mysqlcmd="mysql $hostopt $passopt -u $dbadmin"
 
-		    # Now run the drop commands
-		    if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
-			log="${log}Droping database $dbname."
-			if eval $mysqlcmd -f -e "\"DROP DATABASE $dbname;\"" ; then
-			    if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
-				error="Database $dbname NOT successfully droped. You have to do it manually."
-				echo $error
-			    else
-				status=drop
-			    fi
+		    # Now run the drop user
+			if eval $mysqlcmd -f -e "\"DROP USER '$dbuser'@'localhost';\"" ; then
+				echo Database login $dbuser removed
 			else
-			    error="Unable to run the drop database script."
+			    error="Unable to run $mysqlcmd -f -e \"DROP USER '$dbuser'@'localhost';\""
 				echo $error
 			fi
+
+		    # Now run the drop commands
+		    if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
+				log="${log}Droping database $dbname."
+				if eval $mysqlcmd -f -e "\"DROP DATABASE $dbname;\"" ; then
+				    if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
+					error="Database $dbname NOT successfully droped. You have to do it manually."
+					echo $error
+				    else
+					status=drop
+				    fi
+				else
+				    error="Unable to run the drop database script."
+					echo $error
+				fi
 		    else
-			status=nothing
-			log="${log}Database $dbname already not exists."
+				status=nothing
+				log="${log}Database $dbname already not exists."
 		    fi
 
+		    echo "Remove directory $docdir"
+		    rm -rf $docdir ; 
+ 
 		else
-			echo "postrm Delete of dolibarr database not wanted" 
+			echo "postrm Delete of dolibarr database and uploaded files not wanted" 
 		fi
 	
 		# Remove include files
+		export restart=""
 		for server in $webservers ; do
-			# New usage
 			export conffile="/etc/$server/conf.d/dolibarr.conf"
             if [ -f $conffile ] ;
             then
+               echo Delete file $conffile
 	           rm -f $conffile
 	           status=purge
 		    fi
 			
-			if [ "$status" = "purge" ] ;
+			if [ "x$status" = "xpurge" ] ;
 				then restart="$restart $server"
 			fi
 		done
@@ -161,7 +204,7 @@ case "$1" in
 		rm -rf /etc/dolibarr
 
 		# Restart servers
-		for server in $servers ; do
+		for server in $restart ; do
             # We disable blocking errors
             set +e
             echo "Restart server $server if exists"
@@ -174,47 +217,12 @@ case "$1" in
     		set -e
 		done
 		
-		# Remove file and conf file
-		for dir in /usr/share/dolibarr ; do
-			if [ -d $dir ] ; then 
-                # We disable blocking errors
-                set +e
-			    echo "Remove directory $dir"
-			    rm -rf $dir ; 
-                # We restore blocking errors
-                set -e
-			fi
-		done
-		
 		# We clean variable (we ignore errors because db_reset can fails if var was never set)
         set +e
 		db_reset "dolibarr/postrm"
         set -e
-        
-		db_purge
-	;;
 
-    # Call when we uninstall
-	remove)
-		echo "postrm Force remove of /usr/share/dolibarr/htdocs/install"
-		rm -fr /usr/share/dolibarr/htdocs/install
-
-        echo "postrm Force remove of /usr/share/dolibarr/htdocs/conf"
-        rm -fr /usr/share/dolibarr/htdocs/conf
-
-		#echo "postrm Remove menu entry and image"
-		#fileorig="/usr/share/applications/dolibarr.desktop"
-		#rm -f $fileorig
-		#fileorig="/usr/share/pixmaps/dolibarr.xpm"
-		#rm -f $fileorig
-		# Not sure this is usefull
-        #if test -x /usr/bin/update-menus; then 
-        #   echo "update-menus"
-        #   update-menus;
-        #fi
-	;;
-
-	upgrade)
+		#db_purge
 	;;
 
 	failed-upgrade|abort-install|abort-upgrade|disappear)
@@ -226,8 +234,8 @@ case "$1" in
 	;;
 esac
 
-db_stop
-
 #DEBHELPER#
 
+db_stop
+
 exit 0
diff --git a/build/deb/rules b/build/deb/rules
index df233257ac4..9a3f9a98c7a 100644
--- a/build/deb/rules
+++ b/build/deb/rules
@@ -1,4 +1,10 @@
-#
-# Sample debian/rules
-#
-# This script is not used, so is empty.
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+export DH_OPTIONS=-v
+
+#export DH_COMPAT=7    # This is the debhelper compatability version to use, now defined into compat file
+
+%:
+	dh $@
\ No newline at end of file
diff --git a/build/deb/templates b/build/deb/templates
index f7cceb2dbe5..5c06afd8ccd 100644
--- a/build/deb/templates
+++ b/build/deb/templates
@@ -1,7 +1,7 @@
 Template: dolibarr/postrm
 Type: boolean
 Default: true
-Description: Delete database ?
- Delete the Dolibarr MySQL database and all its datas (datas related
- to this quetion are the Dolibarr DBMS account and all
- Dolibarr tables) ?
+_Description: Delete database and uploaded files ?
+ Answer if you want to removed the Dolibarr MySQL database and all other
+ datas (datas related to this question are the Dolibarr DBMS account, all
+ Dolibarr tables, and all uploaded files).
diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index c731758148d..af2dd4b1172 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -10,7 +10,7 @@
 ; only the root user with no password, stop server and catch
 ; files user.MY* to put them in the Dolibarr build/exe/doliwamp/mysql directory.
 ;
-; Version: $Id: doliwamp.iss,v 1.82 2011/07/13 21:09:30 eldy Exp $
+; Version: $Id: doliwamp.iss,v 1.83 2011/07/28 10:29:49 eldy Exp $
 ;----------------------------------------------------------------------------------------
 
 
@@ -112,7 +112,7 @@ Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion
 Source: "dev\*.*"; DestDir: "{app}\www\dolibarr\dev"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,fpdf\*,initdemo\*,iso-normes\*,samples\*,test\*,uml\*,xdebug\*"
 Source: "doc\*.*"; DestDir: "{app}\www\dolibarr\doc"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,wiki\*,plaquette\*,dev\*"
 Source: "scripts\*.*"; DestDir: "{app}\www\dolibarr\scripts"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,product\materiel.net.php,product\import-product.php"
-Source: "*.*"; DestDir: "{app}\www\dolibarr"; Flags: ignoreversion; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db"
+Source: "*.*"; DestDir: "{app}\www\dolibarr"; Flags: ignoreversion; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,default.properties,install.lock"
 ; Config files
 Source: "build\exe\doliwamp\phpmyadmin.conf.install"; DestDir: "{app}\alias"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\dolibarr.conf.install"; DestDir: "{app}\alias"; Flags: ignoreversion;
diff --git a/build/exe/doliwamp/install.forced.php.install b/build/exe/doliwamp/install.forced.php.install
index 0a7a9aa7d0a..6df14d6f6b2 100644
--- a/build/exe/doliwamp/install.forced.php.install
+++ b/build/exe/doliwamp/install.forced.php.install
@@ -4,9 +4,9 @@
 // This file must be present into htdocs/install directory
 // during install process to be used.
 //
-// $Id: install.forced.php.install,v 1.15 2011/06/26 01:52:59 eldy Exp $
+// $Id: install.forced.php.install,v 1.16 2011/07/30 14:56:12 eldy Exp $
 //
-$force_install_noedit=1;
+$force_install_noedit=2;
 $force_install_message='KeepDefaultValuesWamp';
 $force_install_main_data_root='WAMPROOT/dolibarr_documents';
 $force_install_type='mysqli';
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 533d6e1571d..ae04a704e10 100644
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -2,7 +2,7 @@
 #----------------------------------------------------------------------------
 # \file         build/makepack-dolibarr.pl
 # \brief        Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
-# \version      $Id: makepack-dolibarr.pl,v 1.111 2011/07/21 01:20:31 eldy Exp $
+# \version      $Id: makepack-dolibarr.pl,v 1.127 2011/07/31 18:06:36 eldy Exp $
 # \author       (c)2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
 #----------------------------------------------------------------------------
 
@@ -11,7 +11,7 @@ use Cwd;
 $PROJECT="dolibarr";
 $MAJOR="3";
 $MINOR="1";
-$BUILD="0-dev";		# Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
+$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","DEB","APS","EXEDOLIWAMP","SNAPSHOT");   # Possible packages
@@ -34,7 +34,7 @@ $FILENAMESNAPSHOT="$PROJECT-snapshot";
 $FILENAMETGZ="$PROJECT-$MAJOR.$MINOR.$BUILD";
 $FILENAMEZIP="$PROJECT-$MAJOR.$MINOR.$BUILD";
 $FILENAMERPM="$PROJECT-$MAJOR.$MINOR.$BUILD-$RPMSUBVERSION";
-$FILENAMEDEB="$PROJECT-$MAJOR.$MINOR.$BUILD";
+$FILENAMEDEB="${PROJECT}_${MAJOR}.${MINOR}.${BUILD}";
 $FILENAMEAPS="$PROJECT-$MAJOR.$MINOR.$BUILD.app";
 $FILENAMEEXEDOLIWAMP="$PROJECT-$MAJOR.$MINOR.$BUILD";
 if (-d "/usr/src/redhat") {
@@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") {
 
 
 use vars qw/ $REVISION $VERSION /;
-$REVISION='$Revision: 1.111 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
+$REVISION='$Revision: 1.127 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
 $VERSION="1.0 (build $REVISION)";
 
 
@@ -248,43 +248,74 @@ if ($nboftargetok) {
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/.settings`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/pom.xml`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/default.properties`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;
 
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/DoliW*-*`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/DoliM*-*`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.deb`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.deb`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.dsc`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.rpm`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tar`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tar.gz`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tgz`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.zip`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/doxygen/doxygen_warnings.log`;
+	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/install.lock`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/AerialMono*.ttf`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/Tymes*.ttf`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/Veranda*.ttf`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/fckeditor.py`;
 	    
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/mssql/README`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/mysql/README`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`;
+
+        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/spec`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/uml`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/xdebug`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot2.png`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot3.png`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot4.png`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot5.png`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot6.png`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot7.png`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot8.png`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot9.png`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot10.png`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot11.png`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/document`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/test`;
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/build/deb/po/CVS*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/CVS*`;
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/CVS*  $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/*/CVS*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`;
-	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`;
-	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/ttf2ufm`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`;
+        $ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`;
+        $ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/includes/smarty`;
+	    #$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`;
+	    #$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`;
+        #$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`;
+        #$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/ttf2ufm`;
+        $ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33`;
+        $ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-20100919`;
+        $ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`;
+        #$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`;
+        #$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`;
 	}
     
     # Build package for each target
@@ -383,14 +414,19 @@ if ($nboftargetok) {
     	}
     
     	if ($target eq 'RPM') {                 # Linux only
-    		$ARCH='i386';
+    		#$ARCH='i386';
+    		$ARCH='noarch';
 			if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; }
            	$newbuild = $BUILD;
-            $newbuild =~ s/(dev|alpha)/0/gi;				# dev
-            $newbuild =~ s/beta/1/gi;						# beta
-            $newbuild =~ s/rc./2/gi;						# rc
+           	# For fedora
+            $newbuild =~ s/(dev|alpha)/0.1.a/gi;			# dev
+            $newbuild =~ s/beta/0.2.beta1/gi;				# beta
+            $newbuild =~ s/rc./0.3.rc1/gi;					# rc
             if ($newbuild !~ /-/) { $newbuild.='-3'; }		# finale
-            # now newbuild is 0-0 or 0-3 for example
+            #$newbuild =~ s/(dev|alpha)/0/gi;				# dev
+            #$newbuild =~ s/beta/1/gi;						# beta
+            #$newbuild =~ s/rc./2/gi;						# rc
+            #if ($newbuild !~ /-/) { $newbuild.='-3'; }		# finale
             $REL1 = $newbuild; $REL1 =~ s/-.*$//gi;
             if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; }
             print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";
@@ -408,6 +444,16 @@ if ($nboftargetok) {
 
  			print "Remove other files\n";
             $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/README`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/aps`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`;
 
     		print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n";
     		$ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`;
@@ -436,10 +482,15 @@ if ($nboftargetok) {
    		    print "Move $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\n";
    		    $cmd="mv \"$RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\"";
     		$ret=`$cmd`;
+   		    print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\n";
+   		    $cmd="mv \"$RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\"";
+    		$ret=`$cmd`;
+
     		next;
     	}
     	
-    	if ($target eq 'DEB') {
+    	if ($target eq 'DEB') 
+    	{
             $newbuild = $BUILD;
             $newbuild =~ s/(dev|alpha)/1/gi;                # dev
             $newbuild =~ s/beta/2/gi;                       # beta
@@ -447,10 +498,13 @@ if ($nboftargetok) {
             if ($newbuild !~ /-/) { $newbuild.='-4'; }      # finale
             # now newbuild is 0-1 or 0-4 for example
             print "Version is $MAJOR.$MINOR.$newbuild\n";
-    		
-    		print "Remove target $FILENAMEDEB.deb...\n";
-    		unlink("$DESTI/$FILENAMEDEB.deb");
+            $build = $newbuild;
+            $build =~ s/-.*$//g;
+			# now build is 0 for example
 			
+    		print "Remove target ${FILENAMEDEB}_all.deb...\n";
+    		unlink("$DESTI/${FILENAMEDEB}_all.deb");
+
             #rmdir "$BUILDROOT/$PROJECT.tmp";
     		$ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;
     		print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share\n";
@@ -458,25 +512,73 @@ if ($nboftargetok) {
     		print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\n";
     		$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\"";
             $ret=`$cmd`;
+            
+            # Create DEBIAN directory
     		print "Create directory $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
     		$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
-    		print "Copy $SOURCE/build/deb/* to $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
-            $ret=`cp -r "$SOURCE/build/deb/config"    "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
-            $ret=`cp -r "$SOURCE/build/deb/control"   "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
-            $ret=`cp -r "$SOURCE/build/deb/postinst"  "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
-            $ret=`cp -r "$SOURCE/build/deb/postrm"    "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
-            $ret=`cp -r "$SOURCE/build/deb/templates" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
- 
+    		print "Copy $SOURCE/build/deb/xxx to $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
+            $ret=`cp -f "$SOURCE/build/deb/config"           "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
+            $ret=`cp -f "$SOURCE/build/deb/postinst"         "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
+            $ret=`cp -f "$SOURCE/build/deb/postrm"           "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
+            $ret=`cp -f "$SOURCE/build/deb/templates"        "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
+            $ret=`cp -fr "$SOURCE/build/deb/po"              "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
+            $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN/po/CVS*"`;
+            
+            print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n";
+            open (SPECFROM,"<$SOURCE/build/deb/control.DEBIAN") || die "Error";
+            open (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error";
+            while (<SPECFROM>) {
+                $_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/;
+                print SPECTO $_;
+            }
+            close SPECFROM;
+            close SPECTO;
+            print "Version set to $MAJOR.$MINOR.$newbuild\n";
+            
  			print "Remove other files\n";
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYRIGHT`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/INSTALL`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README-FR`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/README`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/README-FR`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/aps`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/dmg`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/pad/README`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/tgz/README`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/README`;
+            #$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/po`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/changelog`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/compat`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/config`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/control.*`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/copyright`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/dolibarr.desktop`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/dolibarr.menu`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/format`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/install`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/menu`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postrm`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postinst`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/rules`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/README.debian`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/templates`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/templates.futur`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/wash`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/doap`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/exe`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/live`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/patch`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/perl`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/rpm`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/zip`;
 		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/dbmodel`;
 		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/fpdf`;
 		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/initdata`;
 		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/iso-normes`;
 		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpcheckstyle`;
 		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpunit`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/spec`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/uml`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/xdebug`;
 		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/flyer`;
 		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/font`;
 		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/tshirt`;
@@ -486,30 +588,32 @@ if ($nboftargetok) {
             $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`;
             $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`;
             $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fpdf/fpdf`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
             $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`;
             $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/smarty`;
 		    
             $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`;
             $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
             # To remove once stable
             $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`;
 
- 			print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n";
-            open (SPECFROM,"<$SOURCE/build/deb/control") || die "Error";
-            open (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error";
-            while (<SPECFROM>) {
-                $_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/;
-                print SPECTO $_;
-            }
-            close SPECFROM;
-            close SPECTO;
-			print "Version set to $MAJOR.$MINOR.$newbuild\n";
-			
+			# Apache conf files
+    		print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n";
+    		$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`;
+    		$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf"`;
+
+			# Dolibarr conf files
+			# TODO
+
+			# dolibarr.desktop
 	   		print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n";
     		$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/applications"`;
     		print "Copy desktop file into $BUILDROOT/$PROJECT.tmp/usr/share/applications/dolibarr.desktop\n";
     		$ret=`cp "$SOURCE/build/deb/dolibarr.desktop" "$BUILDROOT/$PROJECT.tmp/usr/share/applications/dolibarr.desktop"`;
             
+            # pixmap
 	   		print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/pixmaps\n";
     		$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/pixmaps"`;
     		print "Copy pixmap file into $BUILDROOT/$PROJECT.tmp/usr/share/pixmaps/dolibarr.xpm\n";
@@ -518,14 +622,16 @@ if ($nboftargetok) {
             print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT\n";
             $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT"`;
             
-    		print "Copy README file into $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
-            $ret=`cp "$SOURCE/README" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/README"`;
+    		#print "Copy README file into $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
+            #$ret=`cp "$SOURCE/README" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/README"`;
 
-    		print "Copy copyright file into $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright\n";
-            $ret=`cp "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright"`;
+			# copyright (to build binary package directly without sources. Useless if we build from sources)
+    		#print "Copy copyright file into $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright\n";
+            #$ret=`cp "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright"`;
 
-            #$ret=`gzip -9 -c $SOURCE/build/deb/changelog > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`;
-            $ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`;
+            # changelog (to build binary package directly without sources. Useless if we build from sources)
+            #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`;
+            #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.gz`;
 
             print "Set owners on files/dir\n";
 		    $ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`;
@@ -538,34 +644,84 @@ if ($nboftargetok) {
             $ret=`$cmd`;
             $ret=`chmod 644 $BUILDROOT/$PROJECT.tmp/DEBIAN/control`;
             $ret=`chmod 644 $BUILDROOT/$PROJECT.tmp/DEBIAN/templates`;
-            $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build -name *.php -type f -exec chmod 755 {} \\; ";
+            $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build -name '*.php' -type f -exec chmod 755 {} \\; ";
             $ret=`$cmd`;
-            #$cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build -name *.pl -type f -exec chmod 755 {} \\; ";
-            #$ret=`$cmd`;
-            $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev -name *.php -type f -exec chmod 755 {} \\; ";
+            $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build -name '*.pl' -type f -exec chmod 755 {} \\; ";
             $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/scripts -name *.php -type f -exec chmod 755 {} \\; ";
+            $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev -name '*.php' -type f -exec chmod 755 {} \\; ";
+            $ret=`$cmd`;
+            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/translation/langAutoParser.class.php`;
+            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/skeletons/skeleton_page.php`;
+            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/skeletons/modMyModule.class.php`;
+            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/skeletons/skeleton_class.class.php`;
+            $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
+            $ret=`$cmd`;
+            $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; ";
+            $ret=`$cmd`;
+            $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; ";
             $ret=`$cmd`;
             
      		print "Go to directory $BUILDROOT\n";
             $olddir=getcwd();
      		chdir("$BUILDROOT");
  
-    		$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}.deb";
-    		print "Launch DEB build ($cmd)\n";
-    		$ret=`$cmd`;
-    		print $ret."\n";
+            # Creation of binary package (to build without sources)
+    		#$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb";
+    		#print "Launch DEB build ($cmd)\n";
+    		#$ret=`$cmd`;
+    		#print $ret."\n";
+
+            # Creation of source package
+            print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n";
+            $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`;
+            $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`;
+            $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
+            $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc"`;
+            print "Copy $SOURCE/build/deb/xxx to $BUILDROOT/$PROJECT.tmp/debian\n";
+            # Add files for dpkg-source
+            $ret=`cp -f  "$SOURCE/ChangeLog"                "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/UserChangeLog"`;
+            $ret=`cp -f  "$SOURCE/build/deb/README.debian"  "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`;
+            $ret=`cp -f  "$SOURCE/build/deb/changelog"      "$BUILDROOT/$PROJECT.tmp/debian/changelog"`;
+            $ret=`cp -f  "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`;
+            $ret=`cp -f  "$SOURCE/build/deb/install"        "$BUILDROOT/$PROJECT.tmp/debian/install"`;
+            $ret=`cp -f  "$SOURCE/build/deb/rules"          "$BUILDROOT/$PROJECT.tmp/debian/rules"`;
+            $ret=`cp -f  "$SOURCE/build/deb/copyright"      "$BUILDROOT/$PROJECT.tmp/debian/copyright"`;
+            $ret=`cp -f  "$SOURCE/build/deb/compat"         "$BUILDROOT/$PROJECT.tmp/debian/compat"`;
+            $ret=`cp -f  "$SOURCE/build/deb/format"         "$BUILDROOT/$PROJECT.tmp/debian/source/format"`;
+            $ret=`cp -fr "$SOURCE/build/deb/po"             "$BUILDROOT/$PROJECT.tmp/debian/po"`;
+			$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/debian/po/CVS"`;
+            # Add files also required to build binary package with dpkg-buildpackages
+            $ret=`cp -f  "$SOURCE/build/deb/config"         "$BUILDROOT/$PROJECT.tmp/debian"`;
+            $ret=`cp -f  "$SOURCE/build/deb/postinst"       "$BUILDROOT/$PROJECT.tmp/debian"`;
+            $ret=`cp -f  "$SOURCE/build/deb/postrm"         "$BUILDROOT/$PROJECT.tmp/debian"`;
+            $ret=`cp -f  "$SOURCE/build/deb/templates"      "$BUILDROOT/$PROJECT.tmp/debian"`;
+            
+            $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
+            $ret=`$cmd`;
+            chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build");
+            #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
+            $cmd="dpkg-buildpackage -us -uc";
+            print "Launch DEB build ($cmd)\n";
+            $ret=`$cmd`;
+            print $ret."\n";
+
             chdir("$olddir");
     		
             if ($OS =~ /windows/i)
             {
-                print "Move ${FILENAMEDEB}.deb to $DESTI/${FILENAMEDEB}.deb\n";
-                $ret=`mv "$BUILDROOT/${FILENAMEDEB}.deb" "$DESTI/${FILENAMEDEB}.deb"`;
+                print "Move *_all.deb to $DESTI\n";
+                $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`;
+                $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`;
+                $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`;
+                $ret=`mv $BUILDROOT/*.changes "$DESTI/"`;
             }
             else
             {
-                print "Move ${FILENAMEDEB}.deb to $DESTI/${FILENAMEDEB}.deb\n";
-                $ret=`mv "$BUILDROOT/${FILENAMEDEB}.deb" "$DESTI/${FILENAMEDEB}.deb"`;
+                print "Move *_all.deb to $DESTI\n";
+                $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`;
+                $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`;
+                $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`;
+                $ret=`mv $BUILDROOT/*.changes "$DESTI/"`;
             }
         	next;
         }
@@ -593,15 +749,21 @@ if ($nboftargetok) {
             $ret=`$cmd`;
 
             print "Remove other files\n";
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/rpm`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`;
             $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/dbmodel`;
             $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/fpdf`;
             $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/initdata`;
             $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/iso-normes`;
             $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/phpcheckstyle`;
             $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/phpunit`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/spec`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/uml`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/xdebug`;
             $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/doc/flyer`;
             $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/doc/font`;
             $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/doc/tshirt`;
diff --git a/build/rpm/README b/build/rpm/README
index 11439542df7..c157a195c03 100644
--- a/build/rpm/README
+++ b/build/rpm/README
@@ -22,14 +22,18 @@ with format RPM (for Redhat, Mandriva, ...).
 # On Mageia (after su - root)
 # urpmi dolibarr-...rpm             To install package and dependencies
 # urpme dolibarr                    To remove package
+#
+# More on rpm on page http://www.trustonme.net/didactels/273.html
 
 
 To submit a package to Fedora:
-
+- Create account on bugzilla.redhat.com
+- Create account on fedoraproject.org
+- Create SRPMS package.
+- Upload package onf http://fedorapeople.org
 - Create a bug with form https://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Fedora&format=fedora-review
 This is example of content of review field (used for Bug 723326):
-Spec URL: http://www.dolibarr.org/files/fedora/dolibarr.spec
-SRPM URL: http://www.dolibarr.org/files/fedora/dolibarr-3.1.0-0.src.rpm
+SRPMS URL: http://www.dolibarr.org/files/fedora/dolibarr-x.y.z-xxx.src.rpm
 Description:  Dolibarr ERP & CRM is an easy to use open source/free software
 for small and medium companies, foundations or freelances. It includes
 different features for Enterprise Resource Planning (ERP) and Customer
diff --git a/build/rpm/dolibarr.desktop b/build/rpm/dolibarr.desktop
index ab2a758867f..33fadf7624f 100755
--- a/build/rpm/dolibarr.desktop
+++ b/build/rpm/dolibarr.desktop
@@ -13,7 +13,7 @@ Comment[it]=Programma gestionale open source e gratuito per piccole e medie impr
 Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones
 # Command to open an URL
 # For Fedora: xdg-open 
-# For Debian/Ubuntu: x-www-browser
+# For Debian/Ubuntu: xdg-open or x-www-browser
 # (exo-open for xfde, gnome-open for gnome, ...)
 Exec=xdg-open http://localhost/dolibarr
 Icon=dolibarr
diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec
index 11090951bdd..1754220c6c7 100644
--- a/build/rpm/dolibarr.spec
+++ b/build/rpm/dolibarr.spec
@@ -20,7 +20,7 @@ Vendor: Dolibarr dev team
 
 URL: http://www.%{name}.org
 Source: /usr/src/RPM/SOURCES/%{name}-%{version}.tgz
-#BuildArch: noarch
+BuildArch: noarch
 #BuildArchitectures: noarch
 BuildRoot: /tmp/%{name}-buildroot
 #Icon: dolibarr_logo1.gif
@@ -138,23 +138,61 @@ rm -rf $RPM_BUILD_ROOT
 #%config /var/www/dolibarr/htdocs/conf/conf.php
 
 
-#---- post (after install)
+#---- post (after unzip during install)
 %post
-%update_menus
+#%update_menus	# Does not exists on fedora nor mandriva
 
+
+# Define vars
 # Dolibarr files are stored into /var/www
 export targetdir='/var/www/dolibarr'
-# Dolibarr uploaded files and generated documents are stored into /usr/share/dolibarr/documents 
-export docdir='/usr/share/dolibarr/documents'
+# Dolibarr uploaded files and generated documents will be stored into docdir 
+#export docdir="/var/lib/dolibarr/documents"
+export docdir="/usr/share/dolibarr/documents"
+export installfileorig="$targetdir/build/rpm/install.forced.php.install"
+export installconfig="%{_sysconfdir}/dolibarr/install.forced.php"
+export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf"
+export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf"
+#config="/usr/share/dolibarr/htdocs/conf/conf.php"
+config="%{_sysconfdir}/dolibarr/conf.php"
+lockfile="/usr/share/dolibarr/install.lock"
+
+
+# Detect OS
+os='unknown';
+if [ -d %{_sysconfdir}/httpd/conf.d ]; then
+    export os='fedora-redhat';
+    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+    export apacheuser='apache';
+    export apachegroup='apache';
+fi
+if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then
+    export os='opensuse';
+    export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+    export apacheuser='wwwrun';
+    export apachegroup='www';
+fi
+if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then
+    export os='mageia-mandriva';
+    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+    export apacheuser='apache';
+    export apachegroup='apache';
+fi
+if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -ge 1 ]; then
+    export os='ubuntu-debian';
+    export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+    export apacheuser='www-data';
+    export apachegroup='www-data';
+fi
+echo OS detected: $os
 
 
 # Create empty directory for uploaded files and generated documents 
 echo Create document directory $docdir
 mkdir -p $docdir
+mkdir -p %{_sysconfdir}/dolibarr
 
 # Create install.forced.php into Dolibarr install directory
-fileorig="$targetdir/build/rpm/install.forced.php.install"
-config="$targetdir/htdocs/install/install.forced.php"
 superuserlogin=''
 superuserpassword=''
 if [ -f %{_sysconfdir}/mysql/debian.cnf ] ; then
@@ -164,72 +202,47 @@ if [ -f %{_sysconfdir}/mysql/debian.cnf ] ; then
 fi
 echo Mysql superuser found to use is $superuserlogin
 if [ -z "$superuserlogin" ] ; then
-    cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $config
+    cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig
 else
-    cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $config
+    cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig
+fi
+chown -R root:$apachegroup $installconfig
+chmod -R 660 $installconfig
+
+# Create an empty conf.php with permission to web server
+if [ ! -f $config ]
+then 
+	echo Create empty file $config		
+	touch $config
+	chown -R root:$apachegroup $config
+	chmod -R 660 $config
 fi
 
-# Create a config file %{_sysconfdir}/dolibarr/apache.conf
-if [ ! -f %{_sysconfdir}/dolibarr/apache.conf ]; then
-  	 echo Create dolibarr web server config file %{_sysconfdir}/dolibarr/apache.conf
-     mkdir -p %{_sysconfdir}/dolibarr
-     cp $targetdir/build/rpm/httpd-dolibarr.conf %{_sysconfdir}/dolibarr/apache.conf
-     chmod a-x %{_sysconfdir}/dolibarr/apache.conf
-     chmod go-w %{_sysconfdir}/dolibarr/apache.conf
+# Create a config file $apacheconfig
+if [ ! -f $apacheconfig ]; then
+  	 echo Create dolibarr web server config file $apacheconfig
+     cp $apachefileorig $apacheconfig
+     chmod a-x $apacheconfig
+     chmod go-w $apacheconfig
 fi
 
-
-# Detect OS
-os='unknown';
-if [ -d %{_sysconfdir}/httpd/conf.d ]; then
-    export os='fedora-redhat';
-    export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-    export apacheuser='apache';
-    export apachegroup='apache';
-fi
-if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then
-    export os='opensuse';
-    export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-    export apacheuser='wwwrun';
-    export apachegroup='www';
-fi
-if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then
-    export os='mageia-mandriva';
-    export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-    export apacheuser='apache';
-    export apachegroup='apache';
-fi
-if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -ge 1 ]; then
-    export os='ubuntu-debian';
-    export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-    export apacheuser='www-data';
-    export apachegroup='www-data';
-fi
-echo OS detected: $os
-
 # Create a config link dolibarr.conf for Fedora or Redhat
-if [ ! -f $conffile ]; then
-    echo Create dolibarr web server config link $conffile
-    ln -fs /etc/dolibarr/apache.conf $conffile
+if [ ! -f $apachelink ]; then
+    echo Create dolibarr web server config link $apachelink
+    ln -fs $apacheconfig $apachelink
 fi
 
 # Set permissions
 echo Set permission to $apacheuser:$apachegroup on $targetdir
 chown -R $apacheuser:$apachegroup $targetdir
 chmod -R a-w $targetdir
+chmod u+w $targetdir
 
 echo Set permission to $apacheuser:$apachegroup on $docdir
 chown -R $apacheuser:$apachegroup $docdir
 chmod -R o-w $docdir
 
-# Create empty conf.php file for web installer
-if [ ! -s $targetdir/htdocs/conf/conf.php ]; then
-    echo Create empty Dolibarr conf.php file
-    touch $targetdir/htdocs/conf/conf.php
-    chown $apacheuser:$apachegroup $targetdir/htdocs/conf/conf.php
-    chmod ug+rw $targetdir/htdocs/conf/conf.php
-fi
-
+# Set SE Linux on OS SE is enabled
 if [ "x$os" = "xfedora-redhat" -a -s /usr/bin/chcon ]; then
     echo Set SELinux permissions
     # Warning: chcon seems not cumulative 
@@ -237,6 +250,7 @@ if [ "x$os" = "xfedora-redhat" -a -s /usr/bin/chcon ]; then
     #chcon -R -h -t httpd_sys_content_t $docdir
     chcon -R -h -t httpd_sys_script_rw_t $targetdir
     chcon -R -h -t httpd_sys_script_rw_t $docdir
+    chcon -R -h -t httpd_sys_script_rw_t %{_sysconfdir}/dolibarr
     #chcon -R -h -t httpd_sys_script_exec_t $targetdir
 fi
 
@@ -253,57 +267,71 @@ fi
 echo
 echo "----- Dolibarr %version - (c) Dolibarr dev team -----"
 echo "Dolibarr files are now installed (into /var/www/dolibarr)."
-echo To finish installation and use Dolibarr, call the following
-echo page from your web browser:  
-echo http://localhost/dolibarr/
+echo "To finish installation and use Dolibarr, click on ne menu" 
+echo "entry Dolibarr ERP-CRM or call the following page from your"
+echo "web browser:"  
+echo "http://localhost/dolibarr/"
+echo "--------------------------------------------------"
 echo
 
 
-
 #---- postun (after uninstall)
 %postun
-%clean_menus
+#%clean_menus	# Does not exists on fedora nor mandriva
+
+
+# Define vars
+# Dolibarr files are stored into targetdir
+export targetdir='/var/www/dolibarr'
+# Dolibarr uploaded files and generated documents will be stored into docdir 
+#export docdir="/var/lib/dolibarr/documents"
+export docdir="/usr/share/dolibarr/documents"
+export installfileorig="$targetdir/build/rpm/install.forced.php.install"
+export installconfig="%{_sysconfdir}/dolibarr/install.forced.php"
+export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf"
+export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf"
+#config="/usr/share/dolibarr/htdocs/conf/conf.php"
+config="%{_sysconfdir}/dolibarr/conf.php"
+lockfile="$targetdir/install.lock"
+
 
 # Detect OS
 os='unknown';
 if [ -d %{_sysconfdir}/httpd/conf.d ]; then
     export os='fedora-redhat';
-    export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
     export apacheuser='apache';
     export apachegroup='apache';
 fi
 if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then
     export os='opensuse';
-    export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+    export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
     export apacheuser='wwwrun';
     export apachegroup='www';
 fi
 if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then
     export os='mageia-mandriva';
-    export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
     export apacheuser='apache';
     export apachegroup='apache';
 fi
 if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -ge 1 ]; then
     export os='ubuntu-debian';
-    export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+    export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
     export apacheuser='www-data';
     export apachegroup='www-data';
 fi
 echo OS detected: $os
 
-# Dolibarr files are stored into /var/www
-export targetdir='/var/www/dolibarr'
-# Dolibarr uploaded files and generated documents are stored into /usr/share/dolibarr/documents 
-export docdir='/usr/share/dolibarr/documents'
-
-if [ -f $conffile ] ;
+# Remove apache link
+if [ -f $apachelink ] ;
 then
-    echo Delete apache config file for Dolibarr
-    rm -f $conffile
+    echo Delete apache config link for Dolibarr
+    rm -f $apachelink
     status=purge
 fi
 
+# Restart web servers if required
 if [ "x$status" = "xpurge" ] ;
 then
     # Restart web server
@@ -317,11 +345,19 @@ then
 fi
 
 # Removed dirs after apache restart
-echo Removed remaining dirs
-rm -rf /etc/dolibarr
-rm -rf $targetdir/htdocs/conf
-rm -rf $targetdir/htdocs/install
+echo Removed remaining $apacheconfig
+rm -f $apacheconfig
+echo Removed remaining $config
+rm -f $config
+echo Removed remaining $installconfig
+rm -f $installconfig
+echo Removed remaining $lockfile
+rm -f $lockfile
+echo Removed remaining dir $targetdir/doc
 rmdir $targetdir/doc >/dev/null 2>&1
-rmdir $targetdir/htdocs >/dev/null 2>&1
+#echo Removed remaining dir $targetdir/htdocs
+#rmdir $targetdir/htdocs >/dev/null 2>&1	# Already removed by rpm
 
 %changelog
+* Wed Jul 31 2011 Laurent Destailleur 3.1.0
+- Initial upstream (#723326)
diff --git a/build/rpm/file_contexts.dolibarr b/build/rpm/file_contexts.dolibarr
new file mode 100755
index 00000000000..64376e5afb6
--- /dev/null
+++ b/build/rpm/file_contexts.dolibarr
@@ -0,0 +1,3 @@
+/etc/dolibarr/.*	system_u:object_r:httpd_sys_script_rw_t:s0
+/var/www/dolibarr/.*	system_u:object_r:httpd_sys_script_rw_t:s0
+/usr/share/dolibarr/.*	system_u:object_r:httpd_sys_script_rw_t:s0
\ No newline at end of file
diff --git a/build/rpm/httpd-dolibarr.conf b/build/rpm/httpd-dolibarr.conf
index 4a395f235a2..db77d540a89 100644
--- a/build/rpm/httpd-dolibarr.conf
+++ b/build/rpm/httpd-dolibarr.conf
@@ -65,6 +65,13 @@ Alias /dolibarr /var/www/dolibarr/htdocs
     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
diff --git a/build/rpm/install.forced.php.install b/build/rpm/install.forced.php.install
index d5480a2a848..f01e5303ce0 100755
--- a/build/rpm/install.forced.php.install
+++ b/build/rpm/install.forced.php.install
@@ -1,12 +1,13 @@
 <?php
-$force_install_noedit=1;
+$force_install_noedit=2;
 $force_install_message='KeepDefaultValuesDeb';
 $force_install_main_data_root='/usr/share/dolibarr/documents';
 $force_install_type='mysqli';
+$force_install_dbserver='localhost';
 $force_install_port='3306';
-$force_install_database='dolibarr';
+$force_install_database='dolibarrrpm';
 $force_install_createdatabase='1';
-$force_install_databaselogin='dolibarrmysql';
+$force_install_databaselogin='dolibarrrpm';
 $force_install_databasepass='';
 $force_install_createuser='1';
 $force_install_databaserootlogin='__SUPERUSERLOGIN__';
diff --git a/dev/initdata/generate-commande.php b/dev/initdata/generate-commande.php
index a0b65ca05b3..16b2ab2e6f4 100644
--- a/dev/initdata/generate-commande.php
+++ b/dev/initdata/generate-commande.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * ATTENTION DE PAS EXECUTER CE SCRIPT SUR UNE INSTALLATION DE PRODUCTION
  */
@@ -23,7 +22,7 @@
 /**
 	    \file       htdocs/dev/generate-commande.php
 		\brief      Script de generation de donnees aleatoires pour les commandes
-		\version    $Id: generate-commande.php,v 1.17 2011/07/09 14:11:40 eldy Exp $
+		\version    $Id: generate-commande.php,v 1.18 2011/07/31 22:21:57 eldy Exp $
 */
 
 // Test si mode batch
diff --git a/dev/initdata/generate-facture.php b/dev/initdata/generate-facture.php
index 7653d65ce41..f0730287556 100644
--- a/dev/initdata/generate-facture.php
+++ b/dev/initdata/generate-facture.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * ATTENTION DE PAS EXECUTER CE SCRIPT SUR UNE INSTALLATION DE PRODUCTION
  */
@@ -22,7 +21,7 @@
 /**
  *	    \file       htdocs/dev/generate-facture.php
  *		\brief      Script de generation de donnees aleatoires pour les factures
- *		\version    $Id: generate-facture.php,v 1.14 2011/07/09 14:11:40 eldy Exp $
+ *		\version    $Id: generate-facture.php,v 1.15 2011/07/31 22:21:57 eldy Exp $
  */
 
 // Test si mode batch
diff --git a/dev/initdata/generate-produit.php b/dev/initdata/generate-produit.php
index 6bbc92b812e..552fe8c8ea0 100644
--- a/dev/initdata/generate-produit.php
+++ b/dev/initdata/generate-produit.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * ATTENTION DE PAS EXECUTER CE SCRIPT SUR UNE INSTALLATION DE PRODUCTION
  */
@@ -23,7 +22,7 @@
 /**
  *      \file       htdocs/dev/generate-produit.php
  *		\brief      Script de generation de donnees aleatoires pour les produits
- *		\version    $Id: generate-produit.php,v 1.16 2011/07/09 14:11:40 eldy Exp $
+ *		\version    $Id: generate-produit.php,v 1.17 2011/07/31 22:21:57 eldy Exp $
  */
 
 // Test si mode batch
diff --git a/dev/initdata/generate-propale.php b/dev/initdata/generate-propale.php
index 56c6debdad2..e06b09100b7 100644
--- a/dev/initdata/generate-propale.php
+++ b/dev/initdata/generate-propale.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * ATTENTION DE PAS EXECUTER CE SCRIPT SUR UNE INSTALLATION DE PRODUCTION
  */
@@ -23,7 +22,7 @@
 /**
  *	    \file       htdocs/dev/generate-propale.php
  *		\brief      Script de generation de donnees aleatoires pour les propales
- *		\version    $Id: generate-propale.php,v 1.15 2011/07/09 14:11:40 eldy Exp $
+ *		\version    $Id: generate-propale.php,v 1.16 2011/07/31 22:21:57 eldy Exp $
  */
 
 // Test si mode batch
diff --git a/dev/initdata/generate-societe.php b/dev/initdata/generate-societe.php
index ed6cb9edce2..4bb4aaa4796 100644
--- a/dev/initdata/generate-societe.php
+++ b/dev/initdata/generate-societe.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * ATTENTION DE PAS EXECUTER CE SCRIPT SUR UNE INSTALLATION DE PRODUCTION
  */
@@ -23,7 +22,7 @@
 /**
  *      \file       htdocs/dev/generate-societe.php
  *		\brief      Script de generation de donnees aleatoires pour les societes
- *		\version    $Id: generate-societe.php,v 1.16 2011/07/09 14:11:40 eldy Exp $
+ *		\version    $Id: generate-societe.php,v 1.17 2011/07/31 22:21:57 eldy Exp $
  */
 
 // Test si mode batch
diff --git a/dev/samples/create_invoice.php b/dev/samples/create_invoice.php
index 47cd61cac1b..4a6fceb3211 100644
--- a/dev/samples/create_invoice.php
+++ b/dev/samples/create_invoice.php
@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       dev/samples/manage_order.php
  *      \brief      This file is an example for a command line script
- *      \version    $Id: create_invoice.php,v 1.5 2011/07/09 14:11:41 eldy Exp $
+ *      \version    $Id: create_invoice.php,v 1.6 2011/07/31 22:21:59 eldy Exp $
  *		\author		Put author name here
  *		\remarks	Put here some comments
  */
@@ -36,7 +35,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Global variables
-$version='$Revision: 1.5 $';
+$version='$Revision: 1.6 $';
 $error=0;
 
 
diff --git a/dev/samples/create_order.php b/dev/samples/create_order.php
index d955f35d0d4..22045b416e5 100644
--- a/dev/samples/create_order.php
+++ b/dev/samples/create_order.php
@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       dev/samples/manage_order.php
  *      \brief      This file is an example for a command line script
- *      \version    $Id: create_order.php,v 1.9 2011/07/09 14:11:41 eldy Exp $
+ *      \version    $Id: create_order.php,v 1.10 2011/07/31 22:21:59 eldy Exp $
  *		\author		Put author name here
  *		\remarks	Put here some comments
  */
@@ -36,7 +35,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Global variables
-$version='$Revision: 1.9 $';
+$version='$Revision: 1.10 $';
 $error=0;
 
 
diff --git a/dev/samples/create_product.php b/dev/samples/create_product.php
index fbf4c5ab835..16db9d62021 100644
--- a/dev/samples/create_product.php
+++ b/dev/samples/create_product.php
@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       dev/samples/create_product.php
  *      \brief      This file is an example for a command line script
- *      \version    $Id: create_product.php,v 1.8 2011/07/09 14:11:41 eldy Exp $
+ *      \version    $Id: create_product.php,v 1.9 2011/07/31 22:21:59 eldy Exp $
  *		\author		Put author name here
  *		\remarks	Put here some comments
  */
@@ -36,7 +35,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Global variables
-$version='$Revision: 1.8 $';
+$version='$Revision: 1.9 $';
 $error=0;
 
 
diff --git a/dev/skeletons/build_class_from_table.php b/dev/skeletons/build_class_from_table.php
index c50f3ac4ec4..d21c187e783 100644
--- a/dev/skeletons/build_class_from_table.php
+++ b/dev/skeletons/build_class_from_table.php
@@ -1,6 +1,6 @@
 #!/usr/bin/php
 <?php
-/* Copyright (C) 2008-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2008-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       dev/skeletons/build_class_from_table.php
  *  \ingroup    core
  *  \brief      Create a complete class file from a table in database
- *  \version    $Id: build_class_from_table.php,v 1.32 2011/07/09 14:11:40 eldy Exp $
+ *  \version    $Id: build_class_from_table.php,v 1.33 2011/07/31 22:21:58 eldy Exp $
  */
 
 $sapi_type = php_sapi_name();
@@ -39,7 +38,7 @@ require_once($path."../../htdocs/master.inc.php");
 // After this $db is a defined handler to database.
 
 // Main
-$version='$Revision: 1.32 $';
+$version='$Revision: 1.33 $';
 @set_time_limit(0);
 $error=0;
 
diff --git a/dev/skeletons/build_webservice_from_class.php b/dev/skeletons/build_webservice_from_class.php
index 03c1f254ab7..5e429ca150a 100644
--- a/dev/skeletons/build_webservice_from_class.php
+++ b/dev/skeletons/build_webservice_from_class.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       dev/skeletons/build_webservice_from_class.php
  *  \ingroup    core
  *  \brief      Create a complete webservice file from CRUD functions of a PHP class
- *  \version    $Id: build_webservice_from_class.php,v 1.6 2011/07/09 14:11:40 eldy Exp $
+ *  \version    $Id: build_webservice_from_class.php,v 1.7 2011/07/31 22:21:58 eldy Exp $
  */
 
 $sapi_type = php_sapi_name();
@@ -39,7 +38,7 @@ require_once($path."../../htdocs/master.inc.php");
 // After this $db is a defined handler to database.
 
 // Main
-$version='$Revision: 1.6 $';
+$version='$Revision: 1.7 $';
 @set_time_limit(0);
 $error=0;
 
diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php
index c10618f340f..3cc548e1c0a 100644
--- a/dev/skeletons/modMyModule.class.php
+++ b/dev/skeletons/modMyModule.class.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -28,7 +27,7 @@
  *      \file       htdocs/includes/modules/modMyModule.class.php
  *      \ingroup    mymodule
  *      \brief      Description and activation file for module MyModule
- *		\version	$Id$
+ *		\version	$Id: modMyModule.class.php,v 1.66 2011/07/31 22:21:58 eldy Exp $
  */
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
 
diff --git a/dev/skeletons/skeleton_class.class.php b/dev/skeletons/skeleton_class.class.php
index aa37ed93c06..5c259a95254 100644
--- a/dev/skeletons/skeleton_class.class.php
+++ b/dev/skeletons/skeleton_class.class.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       dev/skeletons/skeleton_class.class.php
  *      \ingroup    mymodule othermodule1 othermodule2
  *      \brief      This file is an example for a CRUD class file (Create/Read/Update/Delete)
- *		\version    $Id$
+ *		\version    $Id: skeleton_class.class.php,v 1.32 2011/07/31 22:21:58 eldy Exp $
  *		\author		Put author name here
  *		\remarks	Put here some comments
  */
diff --git a/dev/skeletons/skeleton_page.php b/dev/skeletons/skeleton_page.php
index b6ad3690452..fbeb11d18b1 100644
--- a/dev/skeletons/skeleton_page.php
+++ b/dev/skeletons/skeleton_page.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *   	\file       dev/skeletons/skeleton_page.php
  *		\ingroup    mymodule othermodule1 othermodule2
  *		\brief      This file is an example of a php page
- *		\version    $Id$
+ *		\version    $Id: skeleton_page.php,v 1.19 2011/07/31 22:21:57 eldy Exp $
  *		\author		Put author name here
  *		\remarks	Put here some comments
  */
@@ -114,5 +113,5 @@ $somethingshown=$myobject->showLinkedObjectBlock();
 
 // End of page
 $db->close();
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:21:57 $ - $Revision: 1.19 $');
 ?>
diff --git a/dev/skeletons/skeleton_script.php b/dev/skeletons/skeleton_script.php
index eaffb1e1357..79e9f54dd03 100644
--- a/dev/skeletons/skeleton_script.php
+++ b/dev/skeletons/skeleton_script.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       dev/skeletons/skeleton_script.php
  *		\ingroup    mymodule othermodule1 othermodule2
  *      \brief      This file is an example for a command line script
- *      \version    $Id: skeleton_script.php,v 1.27 2011/07/09 14:11:41 eldy Exp $
+ *      \version    $Id: skeleton_script.php,v 1.28 2011/07/31 22:21:58 eldy Exp $
  *		\author		Put author name here
  *		\remarks	Put here some comments
  */
@@ -38,7 +37,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Global variables
-$version='$Revision: 1.27 $';
+$version='$Revision: 1.28 $';
 $error=0;
 
 
diff --git a/dev/translation/autotranslator.php b/dev/translation/autotranslator.php
index 0b43ca0c34f..f65e597f3f8 100644
--- a/dev/translation/autotranslator.php
+++ b/dev/translation/autotranslator.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       dev/translation/autotranslator.php
  *		\ingroup    mymodule othermodule1 othermodule2
  *      \brief      This file is an example for a command line script
- *      \version    $Id: autotranslator.php,v 1.12 2011/07/09 14:11:41 eldy Exp $
+ *      \version    $Id: autotranslator.php,v 1.13 2011/07/31 22:21:59 eldy Exp $
  * 		\author		Put author name here
  *		\remarks	Put here some comments
  */
@@ -45,7 +44,7 @@ require_once($path.'../../htdocs/lib/files.lib.php');
 $langs->load("main");
 
 // Global variables
-$version='$Revision: 1.12 $';
+$version='$Revision: 1.13 $';
 $error=0;
 
 
diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php
index befd5ade5d5..1cc6e22bc88 100644
--- a/htdocs/adherents/card_subscriptions.php
+++ b/htdocs/adherents/card_subscriptions.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/adherents/card_subscriptions.php
  *       \ingroup    member
  *       \brief      Onglet d'ajout, edition, suppression des adhesions d'un adherent
- *       \version    $Id$
+ *       \version    $Id: card_subscriptions.php,v 1.79 2011/07/31 22:23:28 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -996,5 +995,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.79 $');
 ?>
diff --git a/htdocs/adherents/cartes/index.php b/htdocs/adherents/cartes/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/adherents/cartes/index.php
+++ b/htdocs/adherents/cartes/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/adherents/cotisations.php b/htdocs/adherents/cotisations.php
index 3c18c0edfcc..6283c494e4d 100644
--- a/htdocs/adherents/cotisations.php
+++ b/htdocs/adherents/cotisations.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/adherents/cotisations.php
  *      \ingroup    member
  *		\brief      Page de consultation et insertion d'une cotisation
- *		\version    $Id$
+ *		\version    $Id: cotisations.php,v 1.58 2011/07/31 22:23:28 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -229,5 +228,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.58 $');
 ?>
diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index 304afe52e41..e839c83ccdf 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \file       htdocs/adherents/document.php
  *  \brief      Tab for documents linked to third party
  *  \ingroup    societe
- *  \version    $Id: document.php,v 1.8 2011/07/06 20:56:50 eldy Exp $
+ *  \version    $Id: document.php,v 1.9 2011/07/31 22:23:28 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -231,6 +230,6 @@ else
 $db->close();
 
 
-llxFooter('$Date: 2011/07/06 20:56:50 $ - $Revision: 1.8 $');
+llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.9 $');
 
 ?>
diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index 2eeb80e952f..a3b9dc5e521 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/adherents/fiche.php
  *       \ingroup    member
  *       \brief      Page of member
- *       \version    $Id: fiche.php,v 1.237 2011/07/13 11:50:33 eldy Exp $
+ *       \version    $Id: fiche.php,v 1.238 2011/07/31 22:23:27 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -1505,5 +1504,5 @@ if ($rowid && $action != 'edit')
 
 $db->close();
 
-llxFooter('$Date: 2011/07/13 11:50:33 $ - $Revision: 1.237 $');
+llxFooter('$Date: 2011/07/31 22:23:27 $ - $Revision: 1.238 $');
 ?>
diff --git a/htdocs/adherents/fiche_subscription.php b/htdocs/adherents/fiche_subscription.php
index d98b01ed4e4..0e5b39c4539 100644
--- a/htdocs/adherents/fiche_subscription.php
+++ b/htdocs/adherents/fiche_subscription.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/adherents/fiche_subscription.php
  *       \ingroup    member
  *       \brief      Page d'ajout, edition, suppression d'une fiche adh�sion
- *       \version    $Id$
+ *       \version    $Id: fiche_subscription.php,v 1.30 2011/07/31 22:23:28 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -393,5 +392,5 @@ if ($rowid && $action != 'edit')
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.30 $');
 ?>
diff --git a/htdocs/adherents/htpasswd.php b/htdocs/adherents/htpasswd.php
index 936571fa265..a111efe470c 100644
--- a/htdocs/adherents/htpasswd.php
+++ b/htdocs/adherents/htpasswd.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -23,7 +22,7 @@
  *      \ingroup    member
  *      \brief      Page d'export htpasswd du fichier des adherents
  *      \author     Rodolphe Quiedeville
- *      \version    $Id$
+ *      \version    $Id: htpasswd.php,v 1.15 2011/07/31 22:23:28 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -82,5 +81,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.15 $');
 ?>
diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index a10051e0e66..09103968f91 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -345,5 +344,5 @@ print '</table>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.72 $');
 ?>
diff --git a/htdocs/adherents/info.php b/htdocs/adherents/info.php
index 6831ef8174a..e6d47484af6 100644
--- a/htdocs/adherents/info.php
+++ b/htdocs/adherents/info.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/adherents/info.php
  *      \ingroup    member
  *		\brief      Page des informations d'un adherent
- *		\version    $Id$
+ *		\version    $Id: info.php,v 1.15 2011/07/31 22:23:28 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -63,5 +62,5 @@ print '</div>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.15 $');
 ?>
diff --git a/htdocs/adherents/info_subscription.php b/htdocs/adherents/info_subscription.php
index aa261cad009..3169eb49ad9 100644
--- a/htdocs/adherents/info_subscription.php
+++ b/htdocs/adherents/info_subscription.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/adherents/info.php
  *      \ingroup    member
  *		\brief      Page des informations d'un adherent
- *		\version    $Id$
+ *		\version    $Id: info_subscription.php,v 1.12 2011/07/31 22:23:28 eldy Exp $
 */
 
 require("../main.inc.php");
@@ -81,5 +80,5 @@ print '</div>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.12 $');
 ?>
diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index 8ab961c8f50..29bd50ecbd6 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/adherents/ldap.php
  *       \ingroup    ldap member
  *       \brief      Page fiche LDAP adherent
- *       \version    $Id$
+ *       \version    $Id: ldap.php,v 1.32 2011/07/31 22:23:27 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -233,5 +232,5 @@ print '</table>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:27 $ - $Revision: 1.32 $');
 ?>
diff --git a/htdocs/adherents/liste.php b/htdocs/adherents/liste.php
index 7b1890aa228..68e161c3d4e 100644
--- a/htdocs/adherents/liste.php
+++ b/htdocs/adherents/liste.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/adherents/liste.php
  *      \ingroup    member
  *		\brief      Page to list all members of foundation
- *		\version    $Id$
+ *		\version    $Id: liste.php,v 1.84 2011/07/31 22:23:28 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -347,5 +346,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.84 $');
 ?>
diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php
index 8e75f25d164..f74606a85da 100644
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/adherents/note.php
  *      \ingroup    member
  *      \brief      Fiche de notes sur un adherent
- *		\version    $Id$
+ *		\version    $Id: note.php,v 1.29 2011/07/31 22:23:28 eldy Exp $
 */
 
 require("../main.inc.php");
@@ -179,5 +178,5 @@ if ($id)
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.29 $');
 ?>
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 325802c88cb..9eeefa6f421 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/adherents/type.php
  *      \ingroup    member
  *		\brief      Page de configuration des types d'adherents
- *		\version    $Id: type.php,v 1.69 2011/06/26 21:03:44 eldy Exp $
+ *		\version    $Id: type.php,v 1.70 2011/07/31 22:23:27 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -637,5 +636,5 @@ if ($rowid > 0)
 
 $db->close();
 
-llxFooter('$Date: 2011/06/26 21:03:44 $ - $Revision: 1.69 $');
+llxFooter('$Date: 2011/07/31 22:23:27 $ - $Revision: 1.70 $');
 ?>
diff --git a/htdocs/admin/accounting.php b/htdocs/admin/accounting.php
index 655befa2b45..277d8eff564 100644
--- a/htdocs/admin/accounting.php
+++ b/htdocs/admin/accounting.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/admin/accounting.php
  *      \ingroup    accounting
  *      \brief      Page de configuration du module comptabilite expert
- *		\version    $Id$
+ *		\version    $Id: accounting.php,v 1.3 2011/07/31 22:23:26 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -169,6 +168,6 @@ if ($result)
 $db->close();
 
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:26 $ - $Revision: 1.3 $');
 
 ?>
diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index 114b173fae3..459fc80612e 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/admin/agenda.php
  *      \ingroup    agenda
  *      \brief      Autocreate actions for agenda module setup page
- *      \version    $Id$
+ *      \version    $Id: agenda.php,v 1.23 2011/07/31 22:23:23 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -160,5 +159,5 @@ print "<br>";
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:23 $ - $Revision: 1.23 $');
 ?>
diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index 9fcb41b6746..b0715479fde 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/admin/agenda_extsites.php
  *      \ingroup    agenda
  *      \brief      Page to setup external calendars for agenda module
- *      \version    $Id$
+ *      \version    $Id: agenda_extsites.php,v 1.9 2011/07/31 22:23:21 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -193,5 +192,5 @@ dol_htmloutput_mesg($mesg);
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:21 $ - $Revision: 1.9 $');
 ?>
\ No newline at end of file
diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index 640f55ffcd3..66c12420396 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/admin/agenda_xcal.php
  *      \ingroup    agenda
  *      \brief      Page to setup miscellaneous options of agenda module
- *		\version    $Id$
+ *		\version    $Id: agenda_xcal.php,v 1.23 2011/07/31 22:23:25 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -150,5 +149,5 @@ print info_admin($message);
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:25 $ - $Revision: 1.23 $');
 ?>
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 87a735c6c45..718c842d046 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -14,14 +14,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *   \file       htdocs/admin/boxes.php
  *   \brief      Page to setup boxes
- *   \version    $Id$
+ *   \version    $Id: boxes.php,v 1.72 2011/07/31 22:23:22 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -471,5 +470,5 @@ print '</table>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.72 $');
 ?>
diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index 849eef86383..044de05e497 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *   \file       htdocs/admin/clicktodial.php
  *   \ingroup    clicktodial
  *   \brief      Page to setup module clicktodial
- *   \version    $Id$
+ *   \version    $Id: clicktodial.php,v 1.24 2011/07/31 22:23:24 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -96,5 +95,5 @@ print '</table></form>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.24 $');
 ?>
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 1ae657fd1c9..ff58534b947 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -18,15 +18,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/admin/commande.php
  *	\ingroup    commande
  *	\brief      Setup page of module Order
- *	\version    $Id$
+ *	\version    $Id: commande.php,v 1.75 2011/07/31 22:23:25 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -522,5 +521,5 @@ print '</table>';
 
 print '<br>';
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:25 $ - $Revision: 1.75 $');
 ?>
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 358902abc0a..f75c23aac70 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/admin/company.php
  *	\ingroup    company
  *	\brief      Setup page to configure company/foundation
- *	\version    $Id: company.php,v 1.93 2011/07/18 18:09:04 eldy Exp $
+ *	\version    $Id: company.php,v 1.94 2011/07/31 22:23:24 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -983,6 +982,6 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/18 18:09:04 $ - $Revision: 1.93 $');
+llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.94 $');
 
 ?>
\ No newline at end of file
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index b3fa65f9d2f..95262d062f0 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/admin/compta.php
  *	\ingroup    compta
  *	\brief      Page to setup accountancy module
- *	\version    $Id$
+ *	\version    $Id: compta.php,v 1.33 2011/07/31 22:23:22 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -187,5 +186,5 @@ if ($num)
 $db->close();
 
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.33 $');
 ?>
diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php
index 31bb2c2a2b6..8e20d4033fb 100644
--- a/htdocs/admin/confexped.php
+++ b/htdocs/admin/confexped.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/admin/confexped.php
  *		\ingroup    produit
  *		\brief      Page to setup sending module
- *		\version    $Id$
+ *		\version    $Id: confexped.php,v 1.22 2011/07/31 22:23:21 eldy Exp $
  */
 
 require("../main.inc.php");
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index 9cea6beda48..bf80fe1b12e 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/admin/const.php
  *	\ingroup    setup
  *	\brief      Admin page to define miscellaneous constants
- *	\version    $Id$
+ *	\version    $Id: const.php,v 1.70 2011/07/31 22:23:21 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -280,5 +279,5 @@ print "</form>\n";
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:21 $ - $Revision: 1.70 $');
 ?>
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index e3732563e71..d6a5b4ce280 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/admin/contract.php
  *	\ingroup    contract
  *	\brief      Setup page of module Contracts
- *	\version    $Id$
+ *	\version    $Id: contract.php,v 1.5 2011/07/31 22:23:25 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -174,5 +173,5 @@ if (is_resource($handle))
 print '</table><br>';
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:25 $ - $Revision: 1.5 $');
 ?>
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 1640f31ef7c..49b7ef73cf0 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -15,14 +15,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *   	\file       htdocs/admin/delais.php
  *		\brief      Page to setup late delays
- *		\version    $Id$
+ *		\version    $Id: delais.php,v 1.32 2011/07/31 22:23:21 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -372,5 +371,5 @@ print '</table>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:21 $ - $Revision: 1.32 $');
 ?>
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 888d2b5b259..961ceaf9af4 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -17,15 +17,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/admin/dict.php
  *		\ingroup    setup
  *		\brief      Page to administer data tables
- *		\version    $Id: dict.php,v 1.145 2011/06/25 09:50:56 eldy Exp $
+ *		\version    $Id: dict.php,v 1.146 2011/07/31 22:23:22 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -897,7 +896,7 @@ print '<br>';
 
 $db->close();
 
-llxFooter('$Date: 2011/06/25 09:50:56 $ - $Revision: 1.145 $');
+llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.146 $');
 
 
 /**
diff --git a/htdocs/admin/dons.php b/htdocs/admin/dons.php
index 88beb285bbb..a1cdc51b80b 100644
--- a/htdocs/admin/dons.php
+++ b/htdocs/admin/dons.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/admin/dons.php
  *		\ingroup    dons
  *		\brief      Page d'administration/configuration du module Dons
- *		\version    $Id$
+ *		\version    $Id: dons.php,v 1.26 2011/07/31 22:23:21 eldy Exp $
  */
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
@@ -276,5 +275,5 @@ print "<br>";
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:21 $ - $Revision: 1.26 $');
 ?>
diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index 13186d2988c..354f0d236b8 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/admin/events.php
  *      \ingroup    core
  *      \brief      Log event setup page
- *		\version    $Id: events.php,v 1.20 2011/07/18 23:30:56 eldy Exp $
+ *		\version    $Id: events.php,v 1.21 2011/07/31 22:23:24 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -124,5 +123,5 @@ dol_htmloutput_mesg($mesg);
 
 $db->close();
 
-llxFooter('$Date: 2011/07/18 23:30:56 $ - $Revision: 1.20 $');
+llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.21 $');
 ?>
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 6b5e6b7677b..f7aa052c51f 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -18,15 +18,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/admin/expedition.php
  *	\ingroup    expedition
  *	\brief      Page d'administration/configuration du module Expedition
- *	\version    $Id$
+ *	\version    $Id: expedition.php,v 1.70 2011/07/31 22:23:22 eldy Exp $
  */
 
 require("../main.inc.php");
diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index 6f69d08ef78..4177432bf2f 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -17,15 +17,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/admin/external_rss.php
  *      \ingroup    external_rss
  *      \brief      Page d'administration/configuration du module ExternalRss
- *      \version    $Id$
+ *      \version    $Id: external_rss.php,v 1.48 2011/07/31 22:23:21 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -317,5 +316,5 @@ print '</table>'."\n";
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:21 $ - $Revision: 1.48 $');
 ?>
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 9cc8ee4191e..a0a819549f2 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -16,15 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/admin/facture.php
  *		\ingroup    facture
  *		\brief      Page to setup invoice module
- *		\version    $Id$
+ *		\version    $Id: facture.php,v 1.150 2011/07/31 22:23:25 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -719,5 +718,5 @@ print "</table>\n";
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:25 $ - $Revision: 1.150 $');
 ?>
diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index 6fe4dd777e5..389aa530a91 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -13,17 +13,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: fckeditor.php,v 1.32 2011/07/31 22:23:24 eldy Exp $
  */
 
 /**
  *  \file       htdocs/admin/fckeditor.php
  *  \ingroup    fckeditor
  *  \brief      Page d'activation du module FCKeditor dans les autres modules
- *  \version    $Revision$
+ *  \version    $Revision: 1.32 $
  */
 
 require("../main.inc.php");
@@ -176,5 +175,5 @@ print $conf->global->FCKEDITOR_TEST;
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.32 $');
 ?>
\ No newline at end of file
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 06d41c5a071..1ac929326cc 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -17,15 +17,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/admin/fichinter.php
  *	\ingroup    fichinter
  *	\brief      Setup page of module Interventions
- *	\version    $Id$
+ *	\version    $Id: fichinter.php,v 1.62 2011/07/31 22:23:22 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -453,5 +452,5 @@ print '<br>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.62 $');
 ?>
diff --git a/htdocs/admin/fournisseur.php b/htdocs/admin/fournisseur.php
index 49efb405c11..3b6047e5330 100644
--- a/htdocs/admin/fournisseur.php
+++ b/htdocs/admin/fournisseur.php
@@ -18,15 +18,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \file       htdocs/admin/fournisseur.php
  *  \ingroup    fournisseur
  *  \brief      Page d'administration-configuration du module Fournisseur
- *  \version    $Id$
+ *  \version    $Id: fournisseur.php,v 1.63 2011/07/31 22:23:21 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -618,5 +617,5 @@ print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">'
 print "</td></tr>\n";
 print '</form>';
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:21 $ - $Revision: 1.63 $');
 ?>
diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php
index 1e372fea36a..34901f47a7e 100644
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/admin/geoipmaxmind.php
  *	\ingroup    geoipmaxmind
  *	\brief      Setup page for geoipmaxmind module
- *	\version    $Id$
+ *	\version    $Id: geoipmaxmind.php,v 1.3 2011/07/31 22:23:22 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -128,5 +127,5 @@ if ($geoip)
 	$geoip->close();
 }
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.3 $');
 ?>
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 8bd64e46680..c4e94a04ecd 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -14,14 +14,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/admin/ihm.php
  *       \brief      Page to setup GUI display options
- *       \version    $Id$
+ *       \version    $Id: ihm.php,v 1.130 2011/07/31 22:23:24 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -527,5 +526,5 @@ else	// Show
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.130 $');
 ?>
diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php
index 8a8b1bf26a0..212ade6c749 100644
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *   	\file       htdocs/admin/index.php
  *		\brief      Page d'accueil de l'espace administration/configuration
- *		\version    $Id$
+ *		\version    $Id: index.php,v 1.83 2011/07/31 22:23:25 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -85,5 +84,5 @@ print '</table>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:25 $ - $Revision: 1.83 $');
 ?>
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index 7eef08c1d4e..a98b21c05f1 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -16,15 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/admin/ldap.php
  *      \ingroup    ldap
  *      \brief      Page d'administration/configuration du module Ldap
- *      \version    $Id$
+ *      \version    $Id: ldap.php,v 1.84 2011/07/31 22:23:24 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -320,5 +319,5 @@ if (function_exists("ldap_connect"))
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.84 $');
 ?>
diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index 15ac4598669..6515a15010c 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -16,15 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  * 	\file       htdocs/admin/ldap_contacts.php
  *  \ingroup    ldap
  *  \brief      Page d'administration/configuration du module Ldap
- *  \version    $Id$
+ *  \version    $Id: ldap_contacts.php,v 1.38 2011/07/31 22:23:26 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -324,6 +323,6 @@ if (function_exists("ldap_connect"))
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:26 $ - $Revision: 1.38 $');
 
 ?>
diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index 45d5d58c8c1..0ec298c9849 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -16,15 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *     	\file       htdocs/admin/ldap_groups.php
  *     	\ingroup    ldap
  *		\brief      Page to setup LDAP synchronization for groups
- *     	\version    $Id$
+ *     	\version    $Id: ldap_groups.php,v 1.34 2011/07/31 22:23:22 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -249,5 +248,5 @@ if (function_exists("ldap_connect"))
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.34 $');
 ?>
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index 6f643354083..e7670a9239b 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -16,15 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *   	\file       htdocs/admin/ldap_members.php
  *		\ingroup    ldap member
  *		\brief      Page d'administration/configuration du module Ldap adherent
- *		\version    $Id$
+ *		\version    $Id: ldap_members.php,v 1.35 2011/07/31 22:23:22 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -432,5 +431,5 @@ if (function_exists("ldap_connect"))
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.35 $');
 ?>
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index 391d5087901..44e8ed3d842 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -16,15 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *   	\file       htdocs/admin/ldap_users.php
  *		\ingroup    ldap
  *		\brief      Page d'administration/configuration du module Ldap
- *		\version    $Id$
+ *		\version    $Id: ldap_users.php,v 1.37 2011/07/31 22:23:22 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -341,5 +340,5 @@ if (function_exists("ldap_connect"))
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.37 $');
 ?>
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index e80f2302200..28f7148889b 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -14,14 +14,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/admin/limits.php
  *       \brief      Page de configuration des limites
- *       \version    $Id$
+ *       \version    $Id: limits.php,v 1.22 2011/07/31 22:23:21 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -210,5 +209,5 @@ print " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$tmparr
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:21 $ - $Revision: 1.22 $');
 ?>
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index 8e8e48c9304..681ce076028 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -17,15 +17,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/admin/livraison.php
  *      \ingroup    livraison
  *      \brief      Page d'administration/configuration du module Livraison
- *      \version    $Id$
+ *      \version    $Id: livraison.php,v 1.57 2011/07/31 22:23:21 eldy Exp $
  */
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index 0156ca2e7d7..4ae91191620 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/admin/mailing.php
  *		\ingroup    mailing
  *		\brief      Page to setup emailing module
- *		\version    $Id$
+ *		\version    $Id: mailing.php,v 1.14 2011/07/31 22:23:25 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -96,6 +95,6 @@ print '</table></form>';
 $db->close();
 
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:25 $ - $Revision: 1.14 $');
 
 ?>
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index c0b1d6f2b30..1c6949fcc94 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/admin/mails.php
  *       \brief      Page to setup emails sending
- *       \version    $Id: mails.php,v 1.74 2011/07/20 13:01:04 eldy Exp $
+ *       \version    $Id: mails.php,v 1.75 2011/07/31 22:23:22 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -747,5 +746,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/20 13:01:04 $ - $Revision: 1.74 $');
+llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.75 $');
 ?>
diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index d23654fa14e..d6d13d2a5a4 100644
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/admin/menus.php
  *      \ingroup    core
  *      \brief      Page to setup menu manager to use
- *		\version	$Id$
+ *		\version	$Id: menus.php,v 1.51 2011/07/31 22:23:23 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -249,5 +248,5 @@ if (! isset($_GET["action"]) || $_GET["action"] != 'edit')
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:23 $ - $Revision: 1.51 $');
 ?>
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index 0773f3f3a48..91a69317366 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\file       htdocs/admin/menus/edit.php
  *		\ingroup    core
  *		\brief      Tool to edit menus
- *		\version	$Id$
+ *		\version	$Id: edit.php,v 1.42 2011/07/31 22:23:15 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -419,5 +418,5 @@ elseif (isset($_GET["action"]) && $_GET["action"] == 'edit')
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:15 $ - $Revision: 1.42 $');
 ?>
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index 256103ca13e..31edc8c2336 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \file       htdocs/admin/menus/index.php
  *  \ingroup    core
  *  \brief      Index page for menu editor
- *  \version    $Id$
+ *  \version    $Id: index.php,v 1.45 2011/07/31 22:23:15 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -343,4 +342,4 @@ $db->close();
 
 print '<br>';
 
-llxFooter('$Date$ - $Revision$');
\ No newline at end of file
+llxFooter('$Date: 2011/07/31 22:23:15 $ - $Revision: 1.45 $');
\ No newline at end of file
diff --git a/htdocs/admin/menus/menu.js.php b/htdocs/admin/menus/menu.js.php
index 135e36767d0..42bdc73e91f 100644
--- a/htdocs/admin/menus/menu.js.php
+++ b/htdocs/admin/menus/menu.js.php
@@ -12,14 +12,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\file       htdocs/admin/menus/menu.js.php
  *		\brief      File for js menu
- *		\version    $Id$
+ *		\version    $Id: menu.js.php,v 1.9 2011/07/31 22:23:15 eldy Exp $
  */
 
 
diff --git a/htdocs/admin/menus/other.php b/htdocs/admin/menus/other.php
index a43de052c95..a3f001f8191 100644
--- a/htdocs/admin/menus/other.php
+++ b/htdocs/admin/menus/other.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/admin/menus/other.php
  *      \ingroup    core
  *      \brief      Menus options setup
- *		\version    $Id$
+ *		\version    $Id: other.php,v 1.6 2011/07/31 22:23:15 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -143,5 +142,5 @@ print '</table>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:15 $ - $Revision: 1.6 $');
 ?>
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 462b86f8516..671bd69a0e4 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
  * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2010 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2011 Regis Houssin        <regis@dolibarr.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
@@ -16,14 +16,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \file       htdocs/admin/modules.php
  *  \brief      Page to activate/disable all modules
- *  \version    $Id$
+ *  \version    $Id: modules.php,v 1.157 2011/08/01 12:25:15 hregis Exp $
  */
 
 require("../main.inc.php");
@@ -80,12 +79,35 @@ $modules = array();
 $orders = array();
 $categ = array();
 $dirmod = array();
+$modulesdir = array();
 $i = 0;	// is a sequencer of modules found
 $j = 0;	// j is module number. Automatically affected if module number not defined.
-foreach ($conf->file->dol_document_root as $dirroot)
-{
-	$dir = $dirroot . "/includes/modules/";
 
+foreach ($conf->file->dol_document_root as $type => $dirroot)
+{
+	$modulesdir[] = $dirroot . "/includes/modules/";
+	
+	if ($type == 'alt')
+	{	
+		$althandle=@opendir($dirroot);
+		if (is_resource($althandle))
+		{
+			while (($file = readdir($althandle))!==false)
+			{
+			    if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
+			    {
+			    	if (is_dir($dirroot . '/' . $file . '/includes/modules/'))
+			    	{
+			    		$modulesdir[] = $dirroot . '/' . $file . '/includes/modules/';
+			    	}
+			    }
+			}
+		}
+	}
+}
+
+foreach ($modulesdir as $dir)
+{
 	// Load modules attributes in arrays (name, numero, orders) from dir directory
 	//print $dir."\n<br>";
 	dol_syslog("Scan directory ".$dir." for modules");
@@ -450,5 +472,5 @@ print '</div>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/08/01 12:25:15 $ - $Revision: 1.157 $');
 ?>
diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index bb15b450ad7..d61d2f01842 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/admin/notification.php
  *		\ingroup    notification
  *		\brief      Page to setup notification module
- *		\version    $Id$
+ *		\version    $Id: notification.php,v 1.13 2011/07/31 22:23:25 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -122,6 +121,6 @@ print '</table>';
 $db->close();
 
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:25 $ - $Revision: 1.13 $');
 
 ?>
diff --git a/htdocs/admin/osc-languages.php b/htdocs/admin/osc-languages.php
index 4e918746296..ed913b467fd 100644
--- a/htdocs/admin/osc-languages.php
+++ b/htdocs/admin/osc-languages.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  * \file 		htdocs/admin/osc-languages.php
  * \ingroup    	boutique
  * \brief      	Page d'administration/configuration du module Boutique
- * \version    	$Id$
+ * \version    	$Id: osc-languages.php,v 1.16 2011/07/31 22:23:22 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -90,5 +89,5 @@ print "</TABLE>";
 
 $db->close();
 
-llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
+llxFooter("<em>Derni&egrave;re modification $Date: 2011/07/31 22:23:22 $ r&eacute;vision $Revision: 1.16 $</em>");
 ?>
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index 71619df5e72..6af9b54e7f0 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *   	\file       htdocs/admin/perms.php
  *      \ingroup    core
  *		\brief      Page d'administration/configuration des permissions par defaut
- *		\version    $Id$
+ *		\version    $Id: perms.php,v 1.43 2011/08/01 12:53:37 hregis Exp $
  */
 
 require("../main.inc.php");
@@ -77,10 +76,34 @@ $db->begin();
 
 // Charge les modules soumis a permissions
 $modules = array();
-foreach ($conf->file->dol_document_root as $dirroot)
-{
-	$dir = $dirroot . "/includes/modules/";
+$modulesdir = array();
 
+foreach ($conf->file->dol_document_root as $type => $dirroot)
+{
+	$modulesdir[] = $dirroot . "/includes/modules/";
+	
+	if ($type == 'alt')
+	{	
+		$handle=@opendir($dirroot);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle))!==false)
+			{
+			    if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
+			    {
+			    	if (is_dir($dirroot . '/' . $file . '/includes/modules/'))
+			    	{
+			    		$modulesdir[] = $dirroot . '/' . $file . '/includes/modules/';
+			    	}
+			    }
+			}
+			closedir($handle);
+		}
+	}
+}
+
+foreach ($modulesdir as $dir)
+{
 	// Load modules attributes in arrays (name, numero, orders) from dir directory
 	//print $dir."\n<br>";
 	$handle=@opendir($dir);
@@ -195,5 +218,5 @@ print '</div>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/08/01 12:53:37 $ - $Revision: 1.43 $');
 ?>
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index 6f5e5abd37e..e020da505e3 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/admin/prelevement.php
  *	\ingroup    prelevement
  *	\brief      Page configuration des prelevements
- *	\version    $Id$
+ *	\version    $Id: prelevement.php,v 1.18 2011/07/31 22:23:25 eldy Exp $
  */
 
 require('../main.inc.php');
@@ -246,5 +245,5 @@ print '</form>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:25 $ - $Revision: 1.18 $');
 ?>
diff --git a/htdocs/admin/project.php b/htdocs/admin/project.php
index 74c1f84ec47..2551509914e 100644
--- a/htdocs/admin/project.php
+++ b/htdocs/admin/project.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \file       htdocs/admin/project.php
  *  \ingroup    project
  *  \brief      Page d'administration-configuration du module Projet
- *  \version    $Id$
+ *  \version    $Id: project.php,v 1.14 2011/07/31 22:23:25 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -380,5 +379,5 @@ if (is_resource($handle))
 
 print '</table><br/>';
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:25 $ - $Revision: 1.14 $');
 ?>
diff --git a/htdocs/admin/propale.php b/htdocs/admin/propale.php
index 8f2d3d251ca..60d5c4516ed 100644
--- a/htdocs/admin/propale.php
+++ b/htdocs/admin/propale.php
@@ -18,15 +18,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/admin/propale.php
  *		\ingroup    propale
  *		\brief      Page d'administration/configuration du module Propale
- *		\version    $Id$
+ *		\version    $Id: propale.php,v 1.108 2011/07/31 22:23:25 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -544,5 +543,5 @@ print "</table>\n<br>";
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:25 $ - $Revision: 1.108 $');
 ?>
diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php
index 5e294827400..f02e3d6203a 100755
--- a/htdocs/admin/proxy.php
+++ b/htdocs/admin/proxy.php
@@ -20,7 +20,7 @@
  *   	\file       htdocs/admin/proxy.php
  *      \ingroup    core
  *		\brief      Page  setup proxy to use for external web access
- *		\version    $Id$
+ *		\version    $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -201,9 +201,10 @@ print '</center>';
 print '</form><br>';
 
 
-if ($mesg) print $mesg.'<br>';
+dol_htmloutput_mesg($mesg);
+
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.6 $');
 ?>
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 62dcf2643a3..2cf7976a76b 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\file       htdocs/admin/security.php
  *      \ingroup    setup
  *      \brief      Page de configuration du module securite
- *		\version    $Id$
+ *		\version    $Id: security.php,v 1.56 2011/07/31 22:23:24 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -432,5 +431,5 @@ print '</div>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.56 $');
 ?>
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index f84a46a7a27..c0aaaa86213 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,7 +21,7 @@
  *	    \file       htdocs/admin/security_other.php
  *      \ingroup    core
  *      \brief      Security options setup
- *		\version    $Id$
+ *		\version    $Id: security_other.php,v 1.40 2011/07/29 21:04:27 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -79,19 +79,6 @@ if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
     }
 }
 
-if ($_GET["action"] == 'set_main_upload_doc')
-{
-	if (! dolibarr_set_const($db, 'MAIN_UPLOAD_DOC',$_POST["MAIN_UPLOAD_DOC"],'chaine',0,'',$conf->entity))
-	{
-		dol_print_error($db);
-	}
-	else
-	{
-		Header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
-	}
-}
-
 if ($_GET["action"] == 'activate_captcha')
 {
 	dolibarr_set_const($db, "MAIN_SECURITY_ENABLECAPTCHA", '1','chaine',0,'',$conf->entity);
@@ -120,30 +107,32 @@ else if ($_GET["action"] == 'disable_advancedperms')
 
 if ($_GET["action"] == 'MAIN_SESSION_TIMEOUT')
 {
-	dolibarr_set_const($db, "MAIN_SESSION_TIMEOUT", $_POST["MAIN_SESSION_TIMEOUT"],'chaine',0,'',$conf->entity);
-	Header("Location: security_other.php");
-	exit;
+	if (! dolibarr_set_const($db, "MAIN_SESSION_TIMEOUT", $_POST["MAIN_SESSION_TIMEOUT"],'chaine',0,'',$conf->entity)) dol_print_error($db);
+	else $mesg=$langs->trans("RecordModifiedSuccessfully");
+}
+
+if ($_GET["action"] == 'MAIN_UPLOAD_DOC')
+{
+	if (! dolibarr_set_const($db, 'MAIN_UPLOAD_DOC',$_POST["MAIN_UPLOAD_DOC"],'chaine',0,'',$conf->entity)) dol_print_error($db);
+	else $mesg=$langs->trans("RecordModifiedSuccessfully");
 }
 
 if ($_GET["action"] == 'MAIN_UMASK')
 {
-	dolibarr_set_const($db, "MAIN_UMASK", $_POST["MAIN_UMASK"],'chaine',0,'',$conf->entity);
-	Header("Location: security_other.php");
-	exit;
+	if (! dolibarr_set_const($db, "MAIN_UMASK", $_POST["MAIN_UMASK"],'chaine',0,'',$conf->entity)) dol_print_error($db);
+	else $mesg=$langs->trans("RecordModifiedSuccessfully");
 }
 
 if ($_GET["action"] == 'MAIN_ANTIVIRUS_COMMAND')
 {
-	dolibarr_set_const($db, "MAIN_ANTIVIRUS_COMMAND", $_POST["MAIN_ANTIVIRUS_COMMAND"],'chaine',0,'',$conf->entity);
-	Header("Location: security_other.php");
-	exit;
+	if (! dolibarr_set_const($db, "MAIN_ANTIVIRUS_COMMAND", $_POST["MAIN_ANTIVIRUS_COMMAND"],'chaine',0,'',$conf->entity)) dol_print_error($db);
+	else $mesg=$langs->trans("RecordModifiedSuccessfully");
 }
 
 if ($_GET["action"] == 'MAIN_ANTIVIRUS_PARAM')
 {
-	dolibarr_set_const($db, "MAIN_ANTIVIRUS_PARAM", $_POST["MAIN_ANTIVIRUS_PARAM"],'chaine',0,'',$conf->entity);
-	Header("Location: security_other.php");
-	exit;
+	if (! dolibarr_set_const($db, "MAIN_ANTIVIRUS_PARAM", $_POST["MAIN_ANTIVIRUS_PARAM"],'chaine',0,'',$conf->entity)) dol_print_error($db);
+	else $mesg=$langs->trans("RecordModifiedSuccessfully");
 }
 
 
@@ -266,7 +255,7 @@ print '<td>'.$langs->trans("Value").'</td>';
 print '<td width="100">&nbsp;</td>';
 print '</tr>';
 
-print '<form action="'.$_SERVER["PHP_SELF"].'?action=set_main_upload_doc" method="POST">';
+print '<form action="'.$_SERVER["PHP_SELF"].'?action=MAIN_UPLOAD_DOC" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<tr '.$bc[$var].'>';
 print '<td colspan="2">'.$langs->trans("MaxSizeForUploadedFiles").'.';
@@ -349,7 +338,7 @@ print '</div>';
 
 
 // Form to test upload
-if ($mesg) print $mesg;
+dol_htmloutput_mesg($mesg);
 
 // Affiche formulaire upload
 print '<br>';
@@ -359,5 +348,5 @@ $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs-
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $');
 ?>
diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index b55954eef2e..342289a6991 100755
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/admin/sms.php
  *       \brief      Page to setup emails sending
- *       \version    $Id: sms.php,v 1.8 2011/07/18 11:31:54 eldy Exp $
+ *       \version    $Id: sms.php,v 1.9 2011/07/31 22:23:22 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -347,5 +346,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/18 11:31:54 $ - $Revision: 1.8 $');
+llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.9 $');
 ?>
diff --git a/htdocs/admin/societe.php b/htdocs/admin/societe.php
index 37fe17f7311..46cc9b3c1c6 100644
--- a/htdocs/admin/societe.php
+++ b/htdocs/admin/societe.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/admin/societe.php
  *	\ingroup    company
  *	\brief      Third party module setup page
- *	\version    $Id: societe.php,v 1.60 2011/07/04 07:38:22 eldy Exp $
+ *	\version    $Id: societe.php,v 1.61 2011/07/31 22:23:23 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -499,5 +498,5 @@ dol_fiche_end();
 
 $db->close();
 
-llxFooter('$Date: 2011/07/04 07:38:22 $ - $Revision: 1.60 $');
+llxFooter('$Date: 2011/07/31 22:23:23 $ - $Revision: 1.61 $');
 ?>
diff --git a/htdocs/admin/societe_extrafields.php b/htdocs/admin/societe_extrafields.php
index 61c61669816..af78847e26a 100755
--- a/htdocs/admin/societe_extrafields.php
+++ b/htdocs/admin/societe_extrafields.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/admin/societe_extrafields.php
  *		\ingroup    societe
  *		\brief      Page to setup extra fields of third party
- *		\version    $Id: societe_extrafields.php,v 1.5 2011/07/05 20:43:25 eldy Exp $
+ *		\version    $Id: societe_extrafields.php,v 1.6 2011/07/31 22:23:21 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -312,5 +311,5 @@ if ($_GET["attrname"] && $action == 'edit')
 
 $db->close();
 
-llxFooter('$Date: 2011/07/05 20:43:25 $ - $Revision: 1.5 $');
+llxFooter('$Date: 2011/07/31 22:23:21 $ - $Revision: 1.6 $');
 ?>
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 2f4cac964e7..07384d67064 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/admin/stock.php
  *	\ingroup    stock
  *	\brief      Page d'administration/configuration du module gestion de stock
- *	\version    $Id$
+ *	\version    $Id: stock.php,v 1.24 2011/07/31 22:23:22 eldy Exp $
  */
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
@@ -239,5 +238,5 @@ if ($conf->fournisseur->enabled)
 print '</table>';
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.24 $');
 ?>
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 52c10117b4d..018460be9ff 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/admin/syslog.php
  *	\ingroup    syslog
  *	\brief      Setup page for syslog module
- *	\version    $Id$
+ *	\version    $Id: syslog.php,v 1.32 2011/07/31 22:23:26 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -165,5 +164,5 @@ print '</td></tr>';
 print '</table>';
 print "</form>\n";
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:26 $ - $Revision: 1.32 $');
 ?>
diff --git a/htdocs/admin/system/about.php b/htdocs/admin/system/about.php
index eae59cda4fe..e17315d5ec6 100644
--- a/htdocs/admin/system/about.php
+++ b/htdocs/admin/system/about.php
@@ -16,14 +16,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/admin/system/about.php
  *       \brief      About Dolibarr File page
- *       \version    $Id$
+ *       \version    $Id: about.php,v 1.5 2011/07/31 22:23:14 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -123,7 +122,7 @@ print '</form>';
 print '</ul>';
 
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.5 $');
 ?>
 
 
diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php
index a505843fcd8..a07b28bd2cf 100644
--- a/htdocs/admin/system/constall.php
+++ b/htdocs/admin/system/constall.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2009      Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,7 +21,7 @@
 /**
  *		\file 		htdocs/admin/system/constall.php
  *		\brief      Page to show all Dolibarr setup (config file and database constants)
- *		\version    $Id$
+ *		\version    $Id: constall.php,v 1.23 2011/07/30 10:23:26 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -44,7 +44,7 @@ llxHeader();
 print_fiche_titre($langs->trans("SummaryConst"),'','setup');
 
 
-print_titre($langs->trans("ConfigurationFile"));
+print_titre($langs->trans("ConfigurationFile").' ('.$conffiletoshowshort.')');
 // Parameters in conf.php file
 $configfileparameters=array(
 //							'separator',
@@ -112,7 +112,7 @@ $i=0;
 foreach($configfileparameters as $key)
 {
 	$ignore=0;
-	
+
 	if ($key == 'dolibarr_main_url_root_alt' && empty(${$key})) $ignore=1;
 	if ($key == 'dolibarr_main_document_root_alt' && empty(${$key})) $ignore=1;
 
diff --git a/htdocs/admin/system/database-tables-contraintes.php b/htdocs/admin/system/database-tables-contraintes.php
index 3aeaf52f0ce..40437472081 100644
--- a/htdocs/admin/system/database-tables-contraintes.php
+++ b/htdocs/admin/system/database-tables-contraintes.php
@@ -15,14 +15,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/admin/system/database-tables-contraintes.php
  *       \brief      Page d'info des contraintes de la base
- *       \version    $Id$
+ *       \version    $Id: database-tables-contraintes.php,v 1.17 2011/07/31 22:23:14 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -117,5 +116,5 @@ else
 	print '</table>';
 }
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.17 $');
 ?>
diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index 985b95a8481..6ed4096bad8 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -15,14 +15,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/admin/system/database-tables.php
  *	\brief      Page d'infos des tables de la base
- *	\version    $Id$
+ *	\version    $Id: database-tables.php,v 1.17 2011/07/31 22:23:14 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -170,5 +169,5 @@ else
 	}
 }
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.17 $');
 ?>
diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index bfde1208f9a..5caec904b89 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -15,14 +15,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *   \file       htdocs/admin/system/database.php
  *   \brief      Page with system information of database
- *   \version    $Id$
+ *   \version    $Id: database.php,v 1.28 2011/07/31 22:23:14 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -137,5 +136,5 @@ else
 	}
 }
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.28 $');
 ?>
diff --git a/htdocs/admin/system/dbtable.php b/htdocs/admin/system/dbtable.php
index 086b41639ab..27e85a6f7e4 100644
--- a/htdocs/admin/system/dbtable.php
+++ b/htdocs/admin/system/dbtable.php
@@ -15,14 +15,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \file           htdocs/admin/system/dbtable.php
  *  \brief          Page d'info des contraintes d'une table
- *  \version        $Id$
+ *  \version        $Id: dbtable.php,v 1.12 2011/07/31 22:23:14 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -133,5 +132,5 @@ else
 	}
 }
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.12 $');
 ?>
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 29544b85be1..bde6afda98b 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \file       htdocs/admin/system/dolibarr.php
  *  \brief      Page to show Dolibarr informations
- *  \version    $Id: dolibarr.php,v 1.58 2011/07/13 13:15:17 eldy Exp $
+ *  \version    $Id: dolibarr.php,v 1.59 2011/07/31 22:23:14 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -213,5 +212,5 @@ print '<tr '.$bc[$var].'><td width="300">=> '.$langs->trans("File encoding").'</
 print '</table>';
 print '<br>';
 
-llxFooter('$Date: 2011/07/13 13:15:17 $ - $Revision: 1.58 $');
+llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.59 $');
 ?>
diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php
index 3f03d441008..d2d54e4a8b2 100644
--- a/htdocs/admin/system/index.php
+++ b/htdocs/admin/system/index.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,8 +20,8 @@
 
 /**
  *  \file       htdocs/admin/system/index.php
- *  \brief      Page accueil infos systeme
- *  \version    $Id$
+ *  \brief      Home page of system information
+ *  \version    $Id: index.php,v 1.48 2011/07/27 23:50:52 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -36,6 +36,13 @@ if (!$user->admin)
   accessforbidden();
 
 
+/*
+ * Actions
+ */
+
+// None
+
+
 /*
  * View
  */
@@ -44,8 +51,6 @@ llxHeader();
 
 print_fiche_titre($langs->trans("SummarySystem"),'','setup');
 
-//print "<br>\n";
-print info_admin($langs->trans("SystemInfoDesc")).'<br>';
 
 print '<table class="noborder" width="100%">';
 print "<tr class=\"liste_titre\"><td colspan=\"2\">Dolibarr</td></tr>\n";
@@ -118,5 +123,9 @@ print '</table>';
 print '<br>';
 
 
-llxFooter('$Date$ - $Revision$');
+//print "<br>\n";
+print info_admin($langs->trans("SystemInfoDesc")).'<br>';
+
+
+llxFooter('$Date: 2011/07/27 23:50:52 $ - $Revision: 1.48 $');
 ?>
diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index 4a6993f1739..7aa01be169e 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -14,14 +14,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \file       htdocs/admin/system/modules.php
  *  \brief      File to list all Dolibarr modules
- *  \version    $Id$
+ *  \version    $Id: modules.php,v 1.15 2011/07/31 22:23:14 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -132,5 +131,5 @@ foreach($rights_ids as $right_id)
 	$old = $right_id;
 }
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.15 $');
 ?>
diff --git a/htdocs/admin/system/os.php b/htdocs/admin/system/os.php
index 5ce4e9ff156..66f07cfa14e 100644
--- a/htdocs/admin/system/os.php
+++ b/htdocs/admin/system/os.php
@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/admin/system/os.php
  *		\brief      Page des infos systeme de l'OS
- *		\version    $Id$
+ *		\version    $Id: os.php,v 1.14 2011/07/31 22:23:14 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -52,5 +51,5 @@ print "<tr $bc[1]><td width=\"240\">".$langs->trans("Version")."</td><td>".$osve
 print '</table>';
 
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.14 $');
 ?>
diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
index 5c7f2e27fc3..70366fd8c41 100644
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/admin/system/phpinfo.php
  *		\brief      Page des infos systeme de php
- *		\version    $Id$
+ *		\version    $Id: phpinfo.php,v 1.19 2011/07/31 22:23:14 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -122,5 +121,5 @@ if (isset($title))
 print "$chaine\n";	// Ne pas centrer la reponse php car certains tableau du bas tres large rendent ceux du haut completement a droite
 print "<br>\n";
 
-llxfooter('$Date$ - $Revision$');
+llxfooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.19 $');
 ?>
diff --git a/htdocs/admin/system/web.php b/htdocs/admin/system/web.php
index cb6ba911dda..95de5113c38 100644
--- a/htdocs/admin/system/web.php
+++ b/htdocs/admin/system/web.php
@@ -12,14 +12,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/admin/system/web.php
  *		\brief      Page des infos systeme du serveur Web
- *		\version    $Id$
+ *		\version    $Id: web.php,v 1.13 2011/07/31 22:23:14 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -48,5 +47,5 @@ print "<tr $bc[1]><td>".$langs->trans("DataRootServer")."</td><td>" . DOL_DATA_R
 print '</table>';
 
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.13 $');
 ?>
diff --git a/htdocs/admin/system/xcache.php b/htdocs/admin/system/xcache.php
index ebc56222511..78feb3b077f 100755
--- a/htdocs/admin/system/xcache.php
+++ b/htdocs/admin/system/xcache.php
@@ -12,14 +12,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *     \file       htdocs/admin/system/xcache.php
  *     \brief      Page administration XCache
- *     \version    $Id$
+ *     \version    $Id: xcache.php,v 1.2 2011/07/31 22:23:14 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -46,7 +45,7 @@ print "<br>\n";
 if (!function_exists('xcache_info'))
 {
     print 'XCache seems to be not installed. Function xcache_info not found.';
-	llxfooter('$Date$ - $Revision$');
+	llxfooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.2 $');
 	exit;
 }
 
@@ -70,5 +69,5 @@ if ($action == 'clear')
 }
 */
 
-llxfooter('$Date$ - $Revision$');
+llxfooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.2 $');
 ?>
diff --git a/htdocs/admin/system/xdebug.php b/htdocs/admin/system/xdebug.php
index 97829a57bd1..dc7561d2b70 100644
--- a/htdocs/admin/system/xdebug.php
+++ b/htdocs/admin/system/xdebug.php
@@ -12,14 +12,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *     \file       htdocs/admin/system/xdebug.php
  *     \brief      Page administration XDebug
- *     \version    $Id$
+ *     \version    $Id: xdebug.php,v 1.6 2011/07/31 22:23:14 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -44,7 +43,7 @@ print "<br>\n";
 if (!function_exists('xdebug_is_enabled'))
 {
     print 'XDebug seems to be not installed. Function xdebug_is_enabled not found.';
-	llxfooter('$Date$ - $Revision$');
+	llxfooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.6 $');
 	exit;
 }
 
@@ -101,5 +100,5 @@ else
 }
 
 
-llxfooter('$Date$ - $Revision$');
+llxfooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.6 $');
 ?>
diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index 6128d3754dc..2f47d43f5e3 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *     \file       htdocs/admin/taxes.php
  *     \ingroup    tax
  *     \brief      Page de configuration du module tax
- *     \version    $Id$
+ *     \version    $Id: taxes.php,v 1.10 2011/07/31 22:23:24 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -182,5 +181,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.10 $');
 ?>
diff --git a/htdocs/admin/triggers.php b/htdocs/admin/triggers.php
index 4510f487bfa..14ed4fbc723 100644
--- a/htdocs/admin/triggers.php
+++ b/htdocs/admin/triggers.php
@@ -12,14 +12,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/admin/triggers.php
  *       \brief      Page de configuration et activation des triggers
- *       \version    $Id$
+ *       \version    $Id: triggers.php,v 1.27 2011/07/31 22:23:21 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -56,5 +55,5 @@ $triggers = $interfaces->getTriggersList(0);
 
 include($template_dir.'triggers.tpl.php');
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:21 $ - $Revision: 1.27 $');
 ?>
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index 4dd1cf42144..24760eebd50 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -17,15 +17,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *   	\file       htdocs/admin/user.php
  *		\ingroup    core
  *		\brief      Page to setup user module
- *		\version    $Id$
+ *		\version    $Id: user.php,v 1.5 2011/07/31 22:23:21 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -123,5 +122,5 @@ $db->close();
 
 print '<br>';
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:21 $ - $Revision: 1.5 $');
 ?>
\ No newline at end of file
diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index 09a90516c57..aa2abd5146e 100755
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/admin/societe.php
  *	\ingroup    company
  *	\brief      Third party module setup page
- *	\version    $Id$
+ *	\version    $Id: workflow.php,v 1.5 2011/07/31 22:23:21 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -136,5 +135,5 @@ print '</table>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:21 $ - $Revision: 1.5 $');
 ?>
diff --git a/htdocs/asterisk/index.php b/htdocs/asterisk/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/asterisk/index.php
+++ b/htdocs/asterisk/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/bookmarks/index.php b/htdocs/bookmarks/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/bookmarks/index.php
+++ b/htdocs/bookmarks/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/boxes.php b/htdocs/boxes.php
index d6ebd67094b..2affdf654d3 100644
--- a/htdocs/boxes.php
+++ b/htdocs/boxes.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -23,7 +22,7 @@
  *	\brief      File of class to manage widget boxes
  *	\author     Rodolphe Qiedeville
  *	\author	    Laurent Destailleur
- *	\version    $Id: boxes.php,v 1.53 2011/07/08 17:59:55 eldy Exp $
+ *	\version    $Id: boxes.php,v 1.54 2011/07/31 23:19:04 eldy Exp $
  */
 
 
diff --git a/htdocs/cashdesk/affContenu.php b/htdocs/cashdesk/affContenu.php
index 1ade459055e..9692573c4f0 100644
--- a/htdocs/cashdesk/affContenu.php
+++ b/htdocs/cashdesk/affContenu.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/cashdesk/affContenu.php
  *	\ingroup    cashdesk
  *	\brief      Include to show main page for cashdesk module
- *	\version    $Id$
+ *	\version    $Id: affContenu.php,v 1.13 2011/07/31 22:23:26 eldy Exp $
  */
 require ('class/Facturation.class.php');
 
diff --git a/htdocs/cashdesk/affIndex.php b/htdocs/cashdesk/affIndex.php
index 2530a842df7..afccdb5d06f 100644
--- a/htdocs/cashdesk/affIndex.php
+++ b/htdocs/cashdesk/affIndex.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/cashdesk/affIndex.php
  *	\ingroup    cashdesk
  *	\brief      First page of point of sale module
- *	\version    $Id$
+ *	\version    $Id: affIndex.php,v 1.20 2011/07/31 22:23:27 eldy Exp $
  */
 require('../main.inc.php');
 require_once(DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php');
diff --git a/htdocs/cashdesk/affPied.php b/htdocs/cashdesk/affPied.php
index 5fb4bb828e7..3197831d05b 100644
--- a/htdocs/cashdesk/affPied.php
+++ b/htdocs/cashdesk/affPied.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2007-2008 J�r�mie Ollivier <jeremie.o@laposte.net>
+/* Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/cashdesk/affPied.php
  *	\ingroup    cashdesk
  *	\brief      Bottom of main page of point of sale module
- *	\version    $Id$
+ *	\version    $Id: affPied.php,v 1.4 2011/07/31 22:23:27 eldy Exp $
  */
 
 ?>
diff --git a/htdocs/cashdesk/class/index.php b/htdocs/cashdesk/class/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/cashdesk/class/index.php
+++ b/htdocs/cashdesk/class/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/cashdesk/deconnexion.php b/htdocs/cashdesk/deconnexion.php
index d3e87af63b8..e4bdb710310 100644
--- a/htdocs/cashdesk/deconnexion.php
+++ b/htdocs/cashdesk/deconnexion.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 //if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Uncomment creates pb to relogon after a disconnect
diff --git a/htdocs/cashdesk/facturation.php b/htdocs/cashdesk/facturation.php
index 3fbe38868e8..11e5f18b5ed 100644
--- a/htdocs/cashdesk/facturation.php
+++ b/htdocs/cashdesk/facturation.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/cashdesk/facturation.php
  *	\ingroup    cashdesk
  *	\brief      Include to show main page for cashdesk module
- *	\version    $Id$
+ *	\version    $Id: facturation.php,v 1.19 2011/07/31 22:23:27 eldy Exp $
  */
 
 // Get list of articles (in warehouse '$conf_fkentrepot' if defined and stock module enabled)
diff --git a/htdocs/cashdesk/facturation_dhtml.php b/htdocs/cashdesk/facturation_dhtml.php
index ac519330746..0642bdf9f20 100644
--- a/htdocs/cashdesk/facturation_dhtml.php
+++ b/htdocs/cashdesk/facturation_dhtml.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/cashdesk/facturation_verif.php b/htdocs/cashdesk/facturation_verif.php
index 5078f1674e7..4530b2031b6 100644
--- a/htdocs/cashdesk/facturation_verif.php
+++ b/htdocs/cashdesk/facturation_verif.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 require('../main.inc.php');
diff --git a/htdocs/cashdesk/img/index.php b/htdocs/cashdesk/img/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/cashdesk/img/index.php
+++ b/htdocs/cashdesk/img/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/cashdesk/include/index.php b/htdocs/cashdesk/include/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/cashdesk/include/index.php
+++ b/htdocs/cashdesk/include/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/cashdesk/index.php b/htdocs/cashdesk/index.php
index cd5eb312ed5..a27d91d98fd 100644
--- a/htdocs/cashdesk/index.php
+++ b/htdocs/cashdesk/index.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/cashdesk/index.php
  * 	\ingroup	cashdesk
  *  \brief      File to login to point of sales
- *  \version    $Id$
+ *  \version    $Id: index.php,v 1.34 2011/07/31 22:23:26 eldy Exp $
  */
 
 // Set and init common variables
diff --git a/htdocs/cashdesk/index_verif.php b/htdocs/cashdesk/index_verif.php
index a69f770d42f..60734ef7b48 100644
--- a/htdocs/cashdesk/index_verif.php
+++ b/htdocs/cashdesk/index_verif.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * This page is called after submission of login page.
  * We set here login choices into session.
diff --git a/htdocs/cashdesk/javascript/index.php b/htdocs/cashdesk/javascript/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/cashdesk/javascript/index.php
+++ b/htdocs/cashdesk/javascript/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/cashdesk/liste_articles.php b/htdocs/cashdesk/liste_articles.php
index 1c718c512e5..446c2d4c9b0 100644
--- a/htdocs/cashdesk/liste_articles.php
+++ b/htdocs/cashdesk/liste_articles.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 require ('tpl/liste_articles.tpl.php');
diff --git a/htdocs/cashdesk/sql/index.php b/htdocs/cashdesk/sql/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/cashdesk/sql/index.php
+++ b/htdocs/cashdesk/sql/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/cashdesk/tpl/index.php b/htdocs/cashdesk/tpl/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/cashdesk/tpl/index.php
+++ b/htdocs/cashdesk/tpl/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php
index 7d13d066c6b..83dac68a99e 100644
--- a/htdocs/cashdesk/tpl/menu.tpl.php
+++ b/htdocs/cashdesk/tpl/menu.tpl.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2007-2008 Jeremie Ollivier      <jeremie.o@laposte.net>
  * Copyright (C) 2008-2010 Laurent Destailleur   <eldy@uers.sourceforge.net>
  * Copyright (C) 2009      Regis Houssin         <regis@dolibarr.fr>
+ * Copyright (C) 2011      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
@@ -64,13 +65,13 @@ print '<div class="menu_bloc">';
 print '<ul class="menu">';
 print '<li class="menu_choix1"><a href="affIndex.php?menu=facturation&id=NOUV"><span>'.$langs->trans("NewSell").'</span></a></li>';
 
-print '<li class="menu_choix2"><a href=".."><span>'.$langs->trans("BackOffice").'</span></a></li>';
+print '<li class="menu_choix2"><a href="deconnexion.php"><span>'.$langs->trans("BackOffice").'</span></a></li>';
 
 print '<li class="menu_choix0">'.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom'].' <a href="deconnexion.php">'.$logout.'</a><br>';
 print $langs->trans("CashDeskThirdParty").': '.$companyLink.'<br>';
-print $langs->trans("CashDeskBankCash").': '.$bankcashLink.'<br>';
+/*print $langs->trans("CashDeskBankCash").': '.$bankcashLink.'<br>';
 print $langs->trans("CashDeskBankCB").': '.$bankcbLink.'<br>';
-print $langs->trans("CashDeskBankCheque").': '.$bankchequeLink.'<br>';
+print $langs->trans("CashDeskBankCheque").': '.$bankchequeLink.'<br>';*/
 if (!empty($_SESSION["CASHDESK_ID_WAREHOUSE"]) && $conf->stock->enabled)
 {
 	print $langs->trans("CashDeskWarehouse").': '.$warehouseLink;
diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php
index 166fe09d85b..f3a440b4929 100644
--- a/htdocs/cashdesk/tpl/validation1.tpl.php
+++ b/htdocs/cashdesk/tpl/validation1.tpl.php
@@ -2,6 +2,7 @@
 $langs->load("main");
 ?>
 <!--Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.net>
+	Copyright (C) 2011 		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
@@ -38,10 +39,42 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 			}
 		?>
 		<tr><td class="resume_label"><?php echo $langs->trans("TotalTTC"); ?> </td><td><?php echo price2num($obj_facturation->prix_total_ttc(),'MT').' '.$conf->monnaie; ?></td></tr>
-		<tr><td class="resume_label"><?php echo $langs->trans("PaymentMode"); ?> </td><td><?php echo $obj_facturation->mode_reglement(); ?></td></tr>
-
-		<?php
-
+		<tr><td class="resume_label"><?php echo $langs->trans("PaymentMode"); ?> </td><td>
+		<?php 
+		switch ($obj_facturation->mode_reglement())
+		{	
+			case 'ESP':
+				echo $langs->trans("Cash");
+				$filtre='courant=2';
+				if (!empty($conf->global->CASHDESK_ID_BANKACCOUNT_CASH))
+					$selected = $conf->global->CASHDESK_ID_BANKACCOUNT_CASH;
+				break;
+			case 'CB':
+				echo $langs->trans("CreditCard");
+				$filtre='courant=1';
+				if (!empty($conf->global->CASHDESK_ID_BANKACCOUNT_CB))
+					$selected = $conf->global->CASHDESK_ID_BANKACCOUNT_CB;		
+				break;
+			case 'CHQ':
+				echo $langs->trans("Cheque");
+				$filtre='courant=1';
+				if (!empty($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE))
+					$selected = $conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE;
+				break;
+			case 'DIF':
+				echo $langs->trans("Reported");
+				$filtre='courant=1 OR courant=2';
+				$selected='';
+				break;	
+			default:
+				$filtre='courant=1 OR courant=2';
+				$selected='';
+		}
+			
+		?>
+		</td></tr>
+		
+		<?php 	
 			// Affichage des infos en fonction du mode de paiement
 			if ( $obj_facturation->mode_reglement() == 'DIF' ) {
 
@@ -66,7 +99,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 	<form id="frmValidation" class="formulaire2" method="post" action="validation_verif.php?action=valide_facture">
 		<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
-
+		<p class="note_label">
+			<?php	
+				echo $langs->trans("BankToPay"). "<br>";
+				$html = new Form($db);
+				$html->select_comptes($selected,'cashdeskbank',0,$filtre);		
+			?>
+		</p>
 		<p class="note_label"><?php echo $langs->trans("Notes"); ?><br><textarea class="textarea_note" name="txtaNotes"></textarea></p>
 
 		<span><input class="bouton_validation" type="submit" name="btnValider" value="<?php echo $langs->trans("ValidateInvoice"); ?>" /></span>
diff --git a/htdocs/cashdesk/validation.php b/htdocs/cashdesk/validation.php
index 5b4d0269c7e..09e74571eee 100644
--- a/htdocs/cashdesk/validation.php
+++ b/htdocs/cashdesk/validation.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 	// Affichage des templates
diff --git a/htdocs/cashdesk/validation_ok.php b/htdocs/cashdesk/validation_ok.php
index 1c6fa4343a6..f5f0b28934c 100644
--- a/htdocs/cashdesk/validation_ok.php
+++ b/htdocs/cashdesk/validation_ok.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 	// Affichage des templates
diff --git a/htdocs/cashdesk/validation_ticket.php b/htdocs/cashdesk/validation_ticket.php
index 8502642f5db..4197e49ba13 100644
--- a/htdocs/cashdesk/validation_ticket.php
+++ b/htdocs/cashdesk/validation_ticket.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 require('../main.inc.php');
diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php
index d554f672d1d..0d679c15b84 100644
--- a/htdocs/cashdesk/validation_verif.php
+++ b/htdocs/cashdesk/validation_verif.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2007-2008 Jeremie Ollivier    <jeremie.o@laposte.net>
  * Copyright (C) 2008-2009 Laurent Destailleur <eldy@uers.sourceforge.net>
+ * Copyright (C) 2011	   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
@@ -27,7 +28,10 @@ require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php');
 $obj_facturation = unserialize($_SESSION['serObjFacturation']);
 unset ($_SESSION['serObjFacturation']);
 
-switch ( $_GET['action'] )
+$action =GETPOST('action');
+$bankaccountid=GETPOST('cashdeskbank');
+
+switch ($action)
 {
 
 	default:
@@ -246,8 +250,8 @@ switch ( $_GET['action'] )
 				$paiement_id = $payment->create($user);
 				if ($paiement_id > 0)
 				{
-                    $bankaccountid=0;
-                    if ( $obj_facturation->mode_reglement() == 'ESP' )
+                  
+                    /*if ( $obj_facturation->mode_reglement() == 'ESP' )
                     {
                         $bankaccountid=$conf_fkaccount_cash;
                     }
@@ -258,7 +262,7 @@ switch ( $_GET['action'] )
                     if ( $obj_facturation->mode_reglement() == 'CB' )
                     {
                         $bankaccountid=$conf_fkaccount_cb;
-                    }
+                    }*/
 
                     if (! $error)
                     {
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index d0dc9bdc989..7083a46937a 100755
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -16,15 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/comm/action/document.php
  *       \ingroup    agenda
  *       \brief      Page des documents joints sur les actions
- *       \version    $Id: document.php,v 1.57 2011/07/06 20:56:49 eldy Exp $
+ *       \version    $Id: document.php,v 1.58 2011/07/31 22:23:21 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -240,5 +239,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/06 20:56:49 $ - $Revision: 1.57 $');
+llxFooter('$Date: 2011/07/31 22:23:21 $ - $Revision: 1.58 $');
 ?>
diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index b1562f12c7b..a0c713ae308 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -16,15 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/comm/action/fiche.php
  *       \ingroup    agenda
  *       \brief      Page for event card
- *       \version    $Id: fiche.php,v 1.227 2011/07/18 08:59:42 hregis Exp $
+ *       \version    $Id: fiche.php,v 1.228 2011/07/31 22:23:20 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -1023,7 +1022,7 @@ if ($id)
 
 $db->close();
 
-llxFooter('$Date: 2011/07/18 08:59:42 $ - $Revision: 1.227 $');
+llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.228 $');
 
 
 /**
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 08e7d071cab..05e52bded62 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -24,7 +24,7 @@
  *  \file       htdocs/comm/action/index.php
  *  \ingroup    agenda
  *  \brief      Home page of calendar events
- *  \version    $Id$
+ *  \version    $Id: index.php,v 1.183 2011/07/22 06:51:31 simnandez Exp $
  */
 
 require("../../main.inc.php");
@@ -487,24 +487,23 @@ if ($showbirthday)
 
 //Exernal Calendars
 $listofextcals=array();
-if ($conf->global->MAIN_FEATURES_LEVEL>=2)
+
+if (empty($conf->global->AGENDA_DISABLE_EXT) && $conf->global->AGENDA_EXT_NB > 0)
 {
-    if (empty($conf->global->AGENDA_DISABLE_EXT) && $conf->global->AGENDA_EXT_NB > 0)
-    {
-        $i=0;
-        while($i < $conf->global->AGENDA_EXT_NB)
-        {
-            $i++;
-            $paramkey='AGENDA_EXT_SRC'.$i;
-            $url=$conf->global->$paramkey;
-            $paramkey='AGENDA_EXT_NAME'.$i;
-            $namecal = $conf->global->$paramkey;
-            $paramkey='AGENDA_EXT_COLOR'.$i;
-            $colorcal = $conf->global->$paramkey;
-            if ($url && $namecal) $listofextcals[]=array('src'=>$url,'name'=>$namecal,'color'=>$colorcal);
-        }
-    }
+	$i=0;
+	while($i < $conf->global->AGENDA_EXT_NB)
+	{
+		$i++;
+		$paramkey='AGENDA_EXT_SRC'.$i;
+		$url=$conf->global->$paramkey;
+		$paramkey='AGENDA_EXT_NAME'.$i;
+		$namecal = $conf->global->$paramkey;
+		$paramkey='AGENDA_EXT_COLOR'.$i;
+		$colorcal = $conf->global->$paramkey;
+		if ($url && $namecal) $listofextcals[]=array('src'=>$url,'name'=>$namecal,'color'=>$colorcal);
+	}
 }
+
 if (sizeof($listofextcals))
 {
     require_once(DOL_DOCUMENT_ROOT."/comm/action/class/ical.class.php");
@@ -787,7 +786,7 @@ $("#actionagenda_vcal_link").attr("href","/public/agenda/agendaexport.php?format
 ';
 */
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/22 06:51:31 $ - $Revision: 1.183 $');
 
 
 /**
diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php
index 3bd9a6b2095..614b42aa437 100644
--- a/htdocs/comm/action/info.php
+++ b/htdocs/comm/action/info.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/comm/action/info.php
  *      \ingroup    agenda
  *		\brief      Page des informations d'une action
- *		\version    $Id$
+ *		\version    $Id: info.php,v 1.20 2011/07/31 22:23:21 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -65,5 +64,5 @@ print '</div>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:21 $ - $Revision: 1.20 $');
 ?>
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 5b1799411f9..637ead7ba4c 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/comm/action/listactions.php
  *      \ingroup    agenda
  *		\brief      Page to list actions
- *		\version    $Id: listactions.php,v 1.55 2011/07/20 19:03:34 eldy Exp $
+ *		\version    $Id: listactions.php,v 1.56 2011/07/31 22:23:20 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -348,5 +347,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/20 19:03:34 $ - $Revision: 1.55 $');
+llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.56 $');
 ?>
diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php
index 963f8101b43..f1d41976b1d 100644
--- a/htdocs/commande/apercu.php
+++ b/htdocs/commande/apercu.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\file		htdocs/commande/apercu.php
  *		\ingroup	commande
  *		\brief		Page de l'onglet apercu d'une commande
- *		\version	$Id$
+ *		\version	$Id: apercu.php,v 1.52 2011/07/31 22:08:25 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -227,5 +226,5 @@ print '</div>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:08:25 $ - $Revision: 1.52 $');
 ?>
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index e5edf12a296..c37f9d71f0a 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -17,15 +17,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \file       htdocs/commande/class/commande.class.php
  *  \ingroup    commande
  *  \brief      Fichier des classes de commandes
- *  \version    $Id: commande.class.php,v 1.119 2011/07/12 07:17:11 eldy Exp $
+ *  \version    $Id: commande.class.php,v 1.120 2011/07/31 22:23:14 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
 require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
diff --git a/htdocs/commande/class/commandestats.class.php b/htdocs/commande/class/commandestats.class.php
index 9523d879cd9..8c4f2622f88 100644
--- a/htdocs/commande/class/commandestats.class.php
+++ b/htdocs/commande/class/commandestats.class.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/commande/class/commandestats.class.php
  *       \ingroup    commandes
  *       \brief      Fichier de la classe de gestion des stats des commandes
- *       \version    $Id: commandestats.class.php,v 1.5 2011/07/04 10:30:01 eldy Exp $
+ *       \version    $Id: commandestats.class.php,v 1.6 2011/07/31 22:23:15 eldy Exp $
  */
 include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php";
 include_once DOL_DOCUMENT_ROOT . "/commande/class/commande.class.php";
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index 5455b22a395..e2724e1c14a 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *     \file       htdocs/commande/contact.php
  *     \ingroup    commande
  *     \brief      Onglet de gestion des contacts de commande
- *     \version    $Id$
+ *     \version    $Id: contact.php,v 1.43 2011/07/31 22:23:15 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -401,5 +400,5 @@ if ($id > 0 || ! empty($ref))
 
 $db->close();
 
-llxFooter('$Date$');
+llxFooter('$Date: 2011/07/31 22:23:15 $');
 ?>
\ No newline at end of file
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index e026511a0c0..60ad84bf9cf 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/commande/document.php
  *	\ingroup    order
  *	\brief      Page de gestion des documents attachees a une commande
- *	\version    $Id: document.php,v 1.35 2011/07/14 05:21:53 hregis Exp $
+ *	\version    $Id: document.php,v 1.36 2011/07/31 22:23:15 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -193,5 +192,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/14 05:21:53 $ - $Revision: 1.35 $');
+llxFooter('$Date: 2011/07/31 22:23:15 $ - $Revision: 1.36 $');
 ?>
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 3ea431a6c9f..95c3d77f4db 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -18,15 +18,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/commande/fiche.php
  *	\ingroup    commande
  *	\brief      Page to show customer order
- *	\version    $Id: fiche.php,v 1.526 2011/07/20 21:26:11 eldy Exp $
+ *	\version    $Id: fiche.php,v 1.527 2011/07/31 22:23:15 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -2123,5 +2122,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/20 21:26:11 $ - $Revision: 1.526 $');
+llxFooter('$Date: 2011/07/31 22:23:15 $ - $Revision: 1.527 $');
 ?>
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index f345caec515..a56e89cb03e 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/commande/index.php
  *	\ingroup    commande
  *	\brief      Home page of customer order module
- *	\version    $Id$
+ *	\version    $Id: index.php,v 1.84 2011/07/31 22:23:16 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -426,6 +425,6 @@ print '</td></tr></table>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.84 $');
 
 ?>
diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php
index cc77ee2fed1..4c6374a87cb 100644
--- a/htdocs/commande/info.php
+++ b/htdocs/commande/info.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/commande/info.php
  *      \ingroup    commande
  *		\brief      Page des informations d'une commande
- *		\version    $Id$
+ *		\version    $Id: info.php,v 1.22 2011/07/31 22:23:15 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -67,5 +66,5 @@ print '</div>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:15 $ - $Revision: 1.22 $');
 ?>
diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php
index 871fe80c498..ea341338a19 100644
--- a/htdocs/commande/liste.php
+++ b/htdocs/commande/liste.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/commande/liste.php
  *	\ingroup    commande
  *	\brief      Page to list orders
- *	\version    $Id: liste.php,v 1.77 2011/07/04 10:30:02 eldy Exp $
+ *	\version    $Id: liste.php,v 1.78 2011/07/31 22:23:15 eldy Exp $
  */
 
 
@@ -278,5 +277,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/04 10:30:02 $ - $Revision: 1.77 $');
+llxFooter('$Date: 2011/07/31 22:23:15 $ - $Revision: 1.78 $');
 ?>
diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index 1c16d1e337c..761560f0c23 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  \file       htdocs/commande/note.php
  \ingroup    commande
  \brief      Fiche de notes sur une commande
- \version    $Id$
+ \version    $Id: note.php,v 1.24 2011/07/31 22:23:15 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -175,5 +174,5 @@ if ($id > 0 || ! empty($ref))
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:15 $ - $Revision: 1.24 $');
 ?>
diff --git a/htdocs/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php
index 9b23a1bd67a..259dc4dbce5 100644
--- a/htdocs/compta/ajaxpayment.php
+++ b/htdocs/compta/ajaxpayment.php
@@ -35,49 +35,74 @@ if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't nee
 
 require('../main.inc.php');
 
-//print_r($_POST);
+$langs->Load('compta');
+
+//init var
+$amountPayment = $_POST['amountPayment'];
+$amounts = $_POST['amounts'];				// from text inputs : invoice amount payment (check required)
+$remains = $_POST['remains'];				// from dolibarr's object (no need to check)
+$currentInvId = $_POST['imgClicked'];		// from DOM elements : imgId (equals invoice id)
+
 
 // Getting the posted keys=>values, sanitize the ones who are from text inputs
 // from text inputs : total amount
-$amountPayment = price2num($_POST['amountPayment']);
-$amountPayment = is_numeric($amountPayment)? $amountPayment : 0;					// is a value
-// from text inputs : invoice amount payment
-$amounts = $_POST['amounts'];														// is an array (need a foreach)
+$amountPayment = $amountPayment!='' ? 	( is_numeric(price2num($amountPayment))	? price2num($amountPayment)
+																				: ''
+										) 
+									: '';			// keep void if not a valid entry
+// Checkamounts
 foreach ($amounts as $key => $value)
 {
 	$value = price2num($value);
 	if (!is_numeric($value)) unset($amounts[$key]);
 }
-// from dolibarr's object (no need to check)
-$remains = $_POST['remains'];
-// from DOM elements : imgId (equals invoice id)
-$currentInvId = $_POST['imgClicked'];
-
 
 // Treatment
-$result = $amountPayment - array_sum($amounts);										// Remaining amountPayment
+$result = $amountPayment != '' ? $amountPayment - array_sum($amounts) : $amountPayment + array_sum($amounts);										// Remaining amountPayment
 $toJsonArray = 	array();
+$totalRemaining = price2num(array_sum($remains));
+$toJsonArray['label'] = $amountPayment == '' ? $langs->transnoentities('AmountToBeCharged') : $langs->transnoentities('RemainingAmountPayment');
 if($currentInvId)																	// Here to breakdown
 {
 	// Get the current amount (from form) and the corresponding remainToPay (from invoice)
 	$currentAmount = $amounts['amount_'.$currentInvId];
 	$currentRemain = $remains['remain_'.$currentInvId];
-
-	// Reset the substraction for this amount
-	$result += price2num($currentAmount);
-	$currentAmount = 0;
-	if($result >= 0)			// then we need to calculate the amount to breakdown
+	
+	// If amountPayment isn't filled, breakdown invoice amount, else breakdown from amountPayment
+	if($amountPayment == '')
 	{
-		$amountToBreakdown = ($result - $currentRemain >= 0 ?
-									$currentRemain : 								// Remain can be fully paid
-									$currentRemain + ($result - $currentRemain));	// Remain can only partially be paid
-		$currentAmount = $amountToBreakdown;						// In both cases, amount will take breakdown value
-		$result -= $amountToBreakdown;								// And canceled substraction has been replaced by breakdown
-	}	// else there's no need to calc anything, just reset the field (result is still < 0)
+		// Check if current amount exists in amounts
+		$amountExists = array_key_exists('amount_'.$currentInvId,$amounts);
+		if($amountExists)
+		{
+			$remainAmount = $currentRemain - $currentAmount;	// To keep value between curRemain and curAmount
+			$result += $remainAmount;							// result must be deduced by
+			$currentAmount += $remainAmount;					// curAmount put to curRemain
+		}else 
+		{
+			$currentAmount = $currentRemain;
+			$result += $currentRemain;
+		}		
+	}else 
+	{
+		// Reset the substraction for this amount
+		$result += price2num($currentAmount);
+		$currentAmount = 0;
+		
+		if($result >= 0)			// then we need to calculate the amount to breakdown
+		{
+			$amountToBreakdown = ($result - $currentRemain >= 0 ?
+										$currentRemain : 								// Remain can be fully paid
+										$currentRemain + ($result - $currentRemain));	// Remain can only partially be paid
+			$currentAmount = $amountToBreakdown;						// In both cases, amount will take breakdown value
+			$result -= $amountToBreakdown;								// And canceled substraction has been replaced by breakdown
+		}	// else there's no need to calc anything, just reset the field (result is still < 0)
+	}
 	$toJsonArray['amount_'.$currentInvId] = price2num($currentAmount)."";			// Param will exist only if an img has been clicked
 }
 // Encode to JSON to return
-$toJsonArray['result'] = price2num($result)."";
-echo json_encode($toJsonArray);										// Printing the call's result
+$toJsonArray['makeRed'] = $totalRemaining < price2num($result) || price2num($result) < 0 ? true : false;
+$toJsonArray['result'] = price2num($result);
+echo json_encode($toJsonArray);	// Printing the call's result
 
 ?>
\ No newline at end of file
diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index fe77917adbc..fa65b87d64b 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -17,15 +17,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/compta/bank/account.php
  *		\ingroup    banque
  *		\brief      List of details of bank transactions for an account
- *		\version    $Id: account.php,v 1.154 2011/07/04 11:33:22 eldy Exp $
+ *		\version    $Id: account.php,v 1.155 2011/07/31 22:23:16 eldy Exp $
  */
 
 require("./pre.inc.php");	// We use pre.inc.php to have a dynamic menu
@@ -786,5 +785,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/04 11:33:22 $ - $Revision: 1.154 $');
+llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.155 $');
 ?>
diff --git a/htdocs/compta/bank/admin/bank.php b/htdocs/compta/bank/admin/bank.php
index af87362489c..f536a72679f 100644
--- a/htdocs/compta/bank/admin/bank.php
+++ b/htdocs/compta/bank/admin/bank.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 
@@ -22,7 +21,7 @@
  *      \file       htdocs/compta/bank/admin/bank.php
  *		\ingroup    bank
  *		\brief      Page to setup the bank module
- *		\version    $Id$
+ *		\version    $Id: bank.php,v 1.8 2011/07/31 22:23:31 eldy Exp $
  */
 
 require("../../../main.inc.php");
@@ -172,5 +171,5 @@ print "</table>\n";
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:31 $ - $Revision: 1.8 $');
 ?>
diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index c9fa33a5203..714386234f1 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\file        htdocs/compta/bank/annuel.php
  *		\ingroup     banque
  *		\brief       Page reporting mensuel Entrees/Sorties d'un compte bancaire
- *		\version     $Id$
+ *		\version     $Id: annuel.php,v 1.29 2011/07/31 22:23:19 eldy Exp $
  */
 
 require("./pre.inc.php");
@@ -275,6 +274,6 @@ print "\n</div>\n";
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:19 $ - $Revision: 1.29 $');
 
 ?>
diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php
index 92957004b61..5ba2ef8997e 100644
--- a/htdocs/compta/bank/bankid_fr.php
+++ b/htdocs/compta/bank/bankid_fr.php
@@ -23,7 +23,7 @@
  *  \file       htdocs/compta/bank/bankid_fr.php
  *  \ingroup    banque
  *  \brief      Fiche creation compte bancaire
- *  \version    $Id$
+ *  \version    $Id: bankid_fr.php,v 1.27 2011/07/29 20:47:35 eldy Exp $
  */
 
 require("./pre.inc.php");
@@ -75,7 +75,7 @@ if ($_POST["action"] == 'update' && ! $_POST["cancel"])
 		}
 		else
 		{
-			$message='<div class="error">'.$account->error().'</div>';
+			$message='<div class="error">'.$account->error.'</div>';
 			$_GET["action"]='edit';     // Force chargement page edition
 		}
 	}
@@ -386,5 +386,5 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.27 $');
 ?>
diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php
index cfbd6ec876f..87aef7f12ab 100644
--- a/htdocs/compta/bank/bilan.php
+++ b/htdocs/compta/bank/bilan.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/compta/bank/bilan.php
  *      \ingroup    banque
  *		\brief      Page de bilan
- *		\version    $Id$
+ *		\version    $Id: bilan.php,v 1.16 2011/07/31 22:23:20 eldy Exp $
  */
 
 require("./pre.inc.php");
@@ -83,5 +82,5 @@ print "</table>";
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.16 $');
 ?>
diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php
index 89fe9a44278..d4e7457bd8b 100644
--- a/htdocs/compta/bank/budget.php
+++ b/htdocs/compta/bank/budget.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/compta/bank/budget.php
  *      \ingroup    banque
  *		\brief      Page de budget
- *		\version    $Id$
+ *		\version    $Id: budget.php,v 1.33 2011/07/31 22:23:16 eldy Exp $
  */
 
 require("./pre.inc.php");
@@ -98,5 +97,5 @@ print "</table>";
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.33 $');
 ?>
diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php
index 804b4deb094..8f06d734457 100644
--- a/htdocs/compta/bank/categ.php
+++ b/htdocs/compta/bank/categ.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
         \file       htdocs/compta/bank/categ.php
         \ingroup    compta
         \brief      Page ajout de cat�gories bancaires
-        \version    $Id$
+        \version    $Id: categ.php,v 1.31 2011/07/31 22:23:20 eldy Exp $
 */
 
 require("./pre.inc.php");
@@ -135,5 +134,5 @@ print "</table></form>";
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.31 $');
 ?>
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index d25fc241d5b..57bd8c9f8e3 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -16,15 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/compta/bank/class/account.class.php
  *	\ingroup    banque
  *	\brief      File of class to manage bank accounts
- *	\version    $Id: account.class.php,v 1.32 2011/07/04 10:44:36 eldy Exp $
+ *	\version    $Id: account.class.php,v 1.33 2011/07/31 22:23:30 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php
index 9d304b1073a..9a18f77eb98 100644
--- a/htdocs/compta/bank/class/bankcateg.class.php
+++ b/htdocs/compta/bank/class/bankcateg.class.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       compta/bank/class/bankcateg.class.php
  *      \ingroup    banque
  *      \brief      This file is CRUD class file (Create/Read/Update/Delete) for bank categories
- *		\version    $Id$
+ *		\version    $Id: bankcateg.class.php,v 1.9 2011/07/31 22:23:30 eldy Exp $
  *		\author		Laurent Destailleur
  *		\remarks	Initialy built by build_class_from_table on 2009-01-02 15:26
  */
diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php
index 26ca15da2d3..9ee1f551048 100644
--- a/htdocs/compta/bank/fiche.php
+++ b/htdocs/compta/bank/fiche.php
@@ -23,7 +23,7 @@
  *	    \file       htdocs/compta/bank/fiche.php
  *      \ingroup    banque
  *		\brief      Page to create/view a bank account
- *		\version    $Id$
+ *		\version    $Id: fiche.php,v 1.77 2011/07/29 20:47:35 eldy Exp $
  */
 
 require("./pre.inc.php");
@@ -99,7 +99,7 @@ if ($_POST["action"] == 'add')
             $_GET["id"]=$id;            // Force chargement page en mode visu
         }
         else {
-            $message='<div class="error">'.$account->error().'</div>';
+            $message='<div class="error">'.$account->error.'</div>';
             $action='create';   // Force chargement page en mode creation
         }
     }
@@ -167,7 +167,7 @@ if ($_POST["action"] == 'update' && ! $_POST["cancel"])
         }
         else
         {
-            $message='<div class="error">'.$account->error().'</div>';
+            $message='<div class="error">'.$account->error.'</div>';
             $action='edit';     // Force chargement page edition
         }
     }
@@ -608,5 +608,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.77 $');
 ?>
diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index 20e5aa0b1f3..e037c0af571 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/compta/bank/graph.php
  *	\ingroup    banque
  *	\brief      Page graph des transactions bancaires
- *	\version    $Id$
+ *	\version    $Id: graph.php,v 1.51 2011/07/31 22:23:16 eldy Exp $
  */
 
 require("./pre.inc.php");
@@ -857,5 +856,5 @@ print "\n</div>\n";
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.51 $');
 ?>
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index 3c68da86c6b..10bacacbe76 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/compta/bank/index.php
  *       \ingroup    banque
  *       \brief      Page accueil banque
- *       \version    $Id: index.php,v 1.54 2011/07/20 19:03:31 eldy Exp $
+ *       \version    $Id: index.php,v 1.55 2011/07/31 22:23:16 eldy Exp $
  */
 
 require("./pre.inc.php");
@@ -245,5 +244,5 @@ print "</div>";
 
 $db->close();
 
-llxFooter('$Date: 2011/07/20 19:03:31 $ - $Revision: 1.54 $');
+llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.55 $');
 ?>
diff --git a/htdocs/compta/bank/info.php b/htdocs/compta/bank/info.php
index 06a0ad243ab..94b98aa93e8 100644
--- a/htdocs/compta/bank/info.php
+++ b/htdocs/compta/bank/info.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
     	\file       htdocs/compta/bank/info.php
 		\ingroup    banque
 		\brief      Onglet info d'une ecriture bancaire
-		\version    $Id$
+		\version    $Id: info.php,v 1.10 2011/07/31 22:23:16 eldy Exp $
 */
 
 require("./pre.inc.php");
@@ -65,5 +64,5 @@ print '</div>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.10 $');
 ?>
diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php
index a3f656eff39..82c07ae2b62 100644
--- a/htdocs/compta/bank/ligne.php
+++ b/htdocs/compta/bank/ligne.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/compta/bank/ligne.php
  *	\ingroup    compta
  *	\brief      Page to edit a bank transaction record
- *	\version    $Id$
+ *	\version    $Id: ligne.php,v 1.91 2011/07/31 22:23:20 eldy Exp $
  */
 
 require("./pre.inc.php");
@@ -601,5 +600,5 @@ print "</table>";
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.91 $');
 ?>
diff --git a/htdocs/compta/bank/pre.inc.php b/htdocs/compta/bank/pre.inc.php
index 622913e139f..4a8c1eacb97 100644
--- a/htdocs/compta/bank/pre.inc.php
+++ b/htdocs/compta/bank/pre.inc.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\file   	htdocs/compta/bank/pre.inc.php
  *		\ingroup    compta
  *		\brief  	Fichier gestionnaire du menu compta banque
- *		\version	$Id: pre.inc.php,v 1.51 2011/07/04 11:33:22 eldy Exp $
+ *		\version	$Id: pre.inc.php,v 1.52 2011/07/31 22:23:16 eldy Exp $
  */
 
 require_once("../../main.inc.php");
diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php
index 81af311188e..cfe6b3e7cdc 100644
--- a/htdocs/compta/bank/rappro.php
+++ b/htdocs/compta/bank/rappro.php
@@ -22,7 +22,7 @@
  *       \file       htdocs/compta/bank/rappro.php
  *       \ingroup    banque
  *       \brief      Page to reconciliate bank transactions
- *       \version    $Id: rappro.php,v 1.66 2011/07/20 19:03:31 eldy Exp $
+ *       \version    $Id: rappro.php,v 1.67 2011/07/26 23:16:47 eldy Exp $
  */
 
 require("./pre.inc.php");
@@ -162,7 +162,7 @@ if ($resql)
         $numr=$db->num_rows($resqlr);
         $i=0;
         while (($i < $numr) && ($i < $nbmax))
-        {print $sql;
+        {
             $objr = $db->fetch_object($resqlr);
             $last_releve = $objr->num_releve;
             $i++;
@@ -403,5 +403,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/20 19:03:31 $ - $Revision: 1.66 $');
+llxFooter('$Date: 2011/07/26 23:16:47 $ - $Revision: 1.67 $');
 ?>
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index e7e58ff1e9a..e4798e0d2bf 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/compta/bank/releve.php
  *      \ingroup    banque
  *		\brief      Page d'affichage d'un releve
- *		\version    $Id$
+ *		\version    $Id: releve.php,v 1.51 2011/07/31 22:23:16 eldy Exp $
  */
 
 require("./pre.inc.php");
@@ -443,5 +442,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.51 $');
 ?>
diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php
index 3fe12a604bb..09b63ce9e21 100644
--- a/htdocs/compta/bank/search.php
+++ b/htdocs/compta/bank/search.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/compta/bank/search.php
  *	\ingroup    banque
  *	\brief      List of bank transactions
- *	\version    $Id$
+ *	\version    $Id: search.php,v 1.54 2011/07/31 22:23:16 eldy Exp $
  */
 
 require("./pre.inc.php");
@@ -285,5 +284,5 @@ if ($_POST["action"] == "search" && ! $num)
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.54 $');
 ?>
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index ef08c96bfe3..82bbca47548 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/compta/bank/treso.php
  *	\ingroup    banque
  *	\brief      Page de detail du budget de tresorerie
- *	\version    $Id$
+ *	\version    $Id: treso.php,v 1.36 2011/07/31 22:23:20 eldy Exp $
  */
 
 require("./pre.inc.php");
@@ -345,5 +344,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.36 $');
 ?>
diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php
index bbc9516dc16..1def4898c02 100644
--- a/htdocs/compta/bank/virement.php
+++ b/htdocs/compta/bank/virement.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\file       htdocs/compta/bank/virement.php
  *		\ingroup    banque
  *		\brief      Page de saisie d'un virement
- *		\version    $Id: virement.php,v 1.48 2011/07/04 10:34:56 eldy Exp $
+ *		\version    $Id: virement.php,v 1.49 2011/07/31 22:23:17 eldy Exp $
  */
 
 require("./pre.inc.php");
@@ -176,5 +175,5 @@ print "</form>";
 
 $db->close();
 
-llxFooter('$Date: 2011/07/04 10:34:56 $ - $Revision: 1.48 $');
+llxFooter('$Date: 2011/07/31 22:23:17 $ - $Revision: 1.49 $');
 ?>
diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index 7161e07e5cf..9b06919a017 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/compta/deplacement/class/deplacement.class.php
  *      \ingroup    deplacement
  *      \brief      File of class to manage trips
- *      \version    $Id: deplacement.class.php,v 1.9 2011/06/29 17:55:34 eldy Exp $
+ *      \version    $Id: deplacement.class.php,v 1.10 2011/07/31 22:23:20 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
diff --git a/htdocs/compta/deplacement/class/deplacementstats.class.php b/htdocs/compta/deplacement/class/deplacementstats.class.php
index 375d2901b1f..fe20cb0c0fd 100644
--- a/htdocs/compta/deplacement/class/deplacementstats.class.php
+++ b/htdocs/compta/deplacement/class/deplacementstats.class.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/compta/deplacement/class/deplacementstats.class.php
  *       \ingroup    factures
  *       \brief      Fichier de la classe de gestion des stats des deplacement et notes de frais
- *       \version    $Id: deplacementstats.class.php,v 1.5 2011/07/04 10:30:02 eldy Exp $
+ *       \version    $Id: deplacementstats.class.php,v 1.6 2011/07/31 22:23:20 eldy Exp $
  */
 include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php";
 include_once DOL_DOCUMENT_ROOT . "/compta/deplacement/class/deplacement.class.php";
diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php
index f1a9bc1db79..8904071627f 100644
--- a/htdocs/compta/facture/apercu.php
+++ b/htdocs/compta/facture/apercu.php
@@ -15,17 +15,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: apercu.php,v 1.73 2011/07/31 22:23:13 eldy Exp $
  */
 
 /**
  * 	    \file       htdocs/compta/facture/apercu.php
  * 		\ingroup    facture
  * 		\brief      Page de l'onglet apercu d'une facture
- * 		\version    $Revision$
+ * 		\version    $Revision: 1.73 $
  */
 
 require("../../main.inc.php");
@@ -410,5 +409,5 @@ elseif (file_exists($fileimagebis))
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:13 $ - $Revision: 1.73 $');
 ?>
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index 0b43f011446..cd74b030899 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/compta/facture/contact.php
  *       \ingroup    facture
  *       \brief      Onglet de gestion des contacts des factures
- *       \version    $Id$
+ *       \version    $Id: contact.php,v 1.48 2011/07/31 22:23:13 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -396,5 +395,5 @@ if ($id > 0 || ! empty($ref))
 
 $db->close();
 
-llxFooter('$Date$');
+llxFooter('$Date: 2011/07/31 22:23:13 $');
 ?>
\ No newline at end of file
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index b042421346d..4863f9af6a6 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/compta/facture/document.php
  *	\ingroup    facture
  *	\brief      Page for attached files on invoices
- *	\version    $Id: document.php,v 1.45 2011/07/14 05:21:53 hregis Exp $
+ *	\version    $Id: document.php,v 1.46 2011/07/31 22:23:13 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -213,5 +212,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/14 05:21:53 $ - $Revision: 1.45 $');
+llxFooter('$Date: 2011/07/31 22:23:13 $ - $Revision: 1.46 $');
 ?>
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 9fe60087f10..0e188af4810 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/compta/facture/fiche-rec.php
  *	\ingroup    facture
  *	\brief      Page to show predefined invoice
- *	\version    $Id: fiche-rec.php,v 1.74 2011/06/30 13:27:21 hregis Exp $
+ *	\version    $Id: fiche-rec.php,v 1.75 2011/07/31 22:23:13 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -576,5 +575,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/06/30 13:27:21 $ - $Revision: 1.74 $');
+llxFooter('$Date: 2011/07/31 22:23:13 $ - $Revision: 1.75 $');
 ?>
diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php
index 9a36e5a2e8a..0b9203df4da 100644
--- a/htdocs/compta/facture/impayees.php
+++ b/htdocs/compta/facture/impayees.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\file       htdocs/compta/facture/impayees.php
  *		\ingroup    facture
  *		\brief      Page to list and build liste of unpaid invoices
- *		\version    $Revision: 1.83 $
+ *		\version    $Revision: 1.84 $
  */
 
 require("../../main.inc.php");
@@ -425,5 +424,5 @@ if ($result)
 
 $db->close();
 
-llxFooter('$Date: 2011/07/13 14:41:02 $ - $Revision: 1.83 $');
+llxFooter('$Date: 2011/07/31 22:23:13 $ - $Revision: 1.84 $');
 ?>
diff --git a/htdocs/compta/facture/index.php b/htdocs/compta/facture/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/compta/facture/index.php
+++ b/htdocs/compta/facture/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php
index 282fdcf50ff..9b6b8fdafcb 100644
--- a/htdocs/compta/facture/info.php
+++ b/htdocs/compta/facture/info.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/compta/facture/info.php
  *      \ingroup    facture
  *		\brief      Page des informations d'une facture
- *		\version    $Id$
+ *		\version    $Id: info.php,v 1.31 2011/07/31 22:23:13 eldy Exp $
 */
 
 require("../../main.inc.php");
@@ -58,5 +57,5 @@ print '</div>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:13 $ - $Revision: 1.31 $');
 ?>
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index 4a85f78703d..05608db0c93 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/compta/facture/note.php
  *      \ingroup    facture
  *      \brief      Fiche de notes sur une facture
- *		\version    $Id$
+ *		\version    $Id: note.php,v 1.58 2011/07/31 22:23:13 eldy Exp $
 */
 
 require("../../main.inc.php");
@@ -192,5 +191,5 @@ if ($id > 0 || ! empty($ref))
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:13 $ - $Revision: 1.58 $');
 ?>
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index f3ec34fdd2a..c4131338f22 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/compta/facture/prelevement.php
  *	\ingroup    facture
  *	\brief      Gestion des prelevement d'une facture
- *	\version    $Id$
+ *	\version    $Id: prelevement.php,v 1.39 2011/07/31 22:23:13 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -560,5 +559,5 @@ if ($_REQUEST["facid"] > 0 || $_REQUEST["ref"])
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:13 $ - $Revision: 1.39 $');
 ?>
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 78c3e2b9dd5..cd930985733 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \file       htdocs/compta/facture/stats/index.php
  *  \ingroup    facture
  *  \brief      Page des stats factures
- *  \version    $Id$
+ *  \version    $Id: index.php,v 1.41 2011/07/31 22:23:31 eldy Exp $
  */
 
 require("../../../main.inc.php");
@@ -221,5 +220,5 @@ print '</td></tr></table>';
 
 print '</td></tr></table>';
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:31 $ - $Revision: 1.41 $');
 ?>
diff --git a/htdocs/compta/facture/stats/month.php b/htdocs/compta/facture/stats/month.php
index b6eb0f32635..096bee6dc86 100644
--- a/htdocs/compta/facture/stats/month.php
+++ b/htdocs/compta/facture/stats/month.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/compta/facture/stats/month.php
  *      \ingroup    facture
  *		\brief      Page des stats factures par mois
- *		\version    $Id$
+ *		\version    $Id: month.php,v 1.33 2011/07/31 22:23:31 eldy Exp $
  */
 
 require("../../../main.inc.php");
@@ -169,5 +168,5 @@ print '</td></tr></table>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:31 $ - $Revision: 1.33 $');
 ?>
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index c6a7474c9b8..e05eaa66ecf 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -22,7 +22,7 @@
  *	\file       htdocs/compta/index.php
  *	\ingroup    compta
  *	\brief      Main page of accountancy area
- *	\version    $Id: index.php,v 1.182 2011/06/30 21:53:02 eldy Exp $
+ *	\version    $Id: index.php,v 1.183 2011/07/26 23:11:52 eldy Exp $
  */
 
 require('../main.inc.php');
@@ -100,12 +100,7 @@ print_fiche_titre($langs->trans("AccountancyTreasuryArea"));
 print '<table border="0" width="100%" class="notopnoleftnoright">';
 
 print '<tr>';
-
-if (($conf->facture->enabled && $user->rights->facture->lire) ||
-    ($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire))
-{
-	print '<td valign="top" width="30%" class="notopnoleft">';
-}
+print '<td valign="top" width="30%" class="notopnoleft">';
 
 $max=3;
 
@@ -321,16 +316,8 @@ if ($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire)
 	}
 }
 
-if (($conf->facture->enabled && $user->rights->facture->lire) ||
-    ($conf->fournisseur->enabled && $user->rights->fournisseur->lire))
-{
-	print '</td>';
-	print '<td valign="top" width="70%" class="notopnoleftnoright">';
-}
-else
-{
-	print '<td valign="top" width="100%" class="notopnoleftnoright">';
-}
+print '</td>';
+print '<td valign="top" width="70%" class="notopnoleftnoright">';
 
 // Last modified customer invoices
 if ($conf->facture->enabled && $user->rights->facture->lire)
@@ -1045,5 +1032,5 @@ print '</table>';
 $db->close();
 
 
-llxFooter('$Date: 2011/06/30 21:53:02 $ - $Revision: 1.182 $');
+llxFooter('$Date: 2011/07/26 23:11:52 $ - $Revision: 1.183 $');
 ?>
diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php
index e5ecde1a6be..ee18392f767 100755
--- a/htdocs/compta/journal/sellsjournal.php
+++ b/htdocs/compta/journal/sellsjournal.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 require("../../main.inc.php");
@@ -57,8 +56,8 @@ $html=new Form($db);
 
 $year_current = strftime("%Y",dol_now());
 $pastmonth = strftime("%m",dol_now()) - 1;
-$pastmonthyear = $year_current; 
-if ($pastmonth == 0) 
+$pastmonthyear = $year_current;
+if ($pastmonth == 0)
 {
 	$pastmonth = 12;
 	$pastmonthyear--;
@@ -159,7 +158,7 @@ foreach ($tabfac as $key => $val)
 	$invoicestatic->id=$key;
 	$invoicestatic->ref=$val["ref"];
 	$invoicestatic->type=$val["type"];
-	
+
 	print "<tr ".$bc[$var].">";
 	// third party
 	//print "<td>".$conf->global->COMPTA_JOURNAL_SELL."</td>";
@@ -204,5 +203,5 @@ print "</table>";
 
 // End of page
 $db->close();
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:08:25 $ - $Revision: 1.10 $');
 ?>
\ No newline at end of file
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 68419253c60..d2f2a7aae7e 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -24,7 +24,7 @@
  *	\file       htdocs/compta/paiement.php
  *	\ingroup    compta
  *	\brief      Page to create a payment
- *	\version    $Id: paiement.php,v 1.111 2011/07/13 08:57:21 eldy Exp $
+ *	\version    $Id: paiement.php,v 1.112 2011/07/27 08:00:45 cdelambert Exp $
  */
 
 require('../main.inc.php');
@@ -290,6 +290,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 		            	json["amountPayment"] = jQuery("#amountpayment").attr("value");
 		            	json["amounts"] = elemToJson(form.find("input[name*=\"amount_\"]"));
 		            	json["remains"] = elemToJson(form.find("input[name*=\"remain_\"]"));
+		            	
 		            	if(imgId != null)json["imgClicked"] = imgId;
 
             			jQuery.post("ajaxpayment.php", json, function(data)
@@ -300,13 +301,14 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
             				for(var key in json)
             				{
-            					if(key == "result")	{
-            						jQuery("#"+key).text(json[key]);
-            						if(json[key] < 0) {
+            					if(key == "result")	{      						
+            						if(json["makeRed"]) {            							
             							jQuery("#"+key).css("color", "red");
             						} else {
             							jQuery("#"+key).removeAttr("style");
             						}
+            						json[key]=json["label"]+" "+json[key];            						
+            						jQuery("#"+key).text(json[key]);
             					} else {
             						form.find("input[name*=\""+key+"\"]").each(function() {
             							jQuery(this).attr("value", json[key]);
@@ -671,5 +673,5 @@ if (! GETPOST('action'))
 
 $db->close();
 
-llxFooter('$Date: 2011/07/13 08:57:21 $ - $Revision: 1.111 $');
+llxFooter('$Date: 2011/07/27 08:00:45 $ - $Revision: 1.112 $');
 ?>
diff --git a/htdocs/compta/param/comptes/fiche.php b/htdocs/compta/param/comptes/fiche.php
index 43a9c8aa46f..3cdcea00a4b 100644
--- a/htdocs/compta/param/comptes/fiche.php
+++ b/htdocs/compta/param/comptes/fiche.php
@@ -13,10 +13,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: fiche.php,v 1.14 2011/07/31 22:23:31 eldy Exp $
  */
 
 
@@ -24,7 +23,7 @@
         \file       htdocs/compta/param/comptes/fiche.php
         \ingroup    compta
         \brief      Page de la fiche des comptes comptables
-        \version    $Revision$
+        \version    $Revision: 1.14 $
 */
 
 require("../../../main.inc.php");
@@ -102,5 +101,5 @@ if ($_GET["action"] == 'create' && $user->rights->compta->ventilation->parametre
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:31 $ - $Revision: 1.14 $');
 ?>
diff --git a/htdocs/compta/param/comptes/index.php b/htdocs/compta/param/comptes/index.php
index 864df6824b6..4b86e67efa7 100644
--- a/htdocs/compta/param/comptes/index.php
+++ b/htdocs/compta/param/comptes/index.php
@@ -13,17 +13,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: index.php,v 1.11 2011/07/31 22:23:31 eldy Exp $
  */
 
 /**
         \file       htdocs/compta/param/comptes/index.php
         \ingroup    compta
 		\brief      Page acceuil zone parametrages
-		\version    $Revision$
+		\version    $Revision: 1.11 $
 */
 
 require("../../../main.inc.php");
@@ -77,5 +76,5 @@ print '</table>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:31 $ - $Revision: 1.11 $');
 ?>
diff --git a/htdocs/compta/param/comptes/liste.php b/htdocs/compta/param/comptes/liste.php
index ff3d646e241..3b60ff8c202 100644
--- a/htdocs/compta/param/comptes/liste.php
+++ b/htdocs/compta/param/comptes/liste.php
@@ -13,17 +13,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: liste.php,v 1.12 2011/07/31 22:23:31 eldy Exp $
  */
 
 /**
         \file       htdocs/compta/param/comptes/liste.php
         \ingroup    compta
         \brief      Onglet de gestion de parametrages des ventilations
-        \version    $Revision$
+        \version    $Revision: 1.12 $
 */
 
 require("../../../main.inc.php");
@@ -125,5 +124,5 @@ else
 
 $db->close();
 
-llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
+llxFooter("<em>Derni&egrave;re modification $Date: 2011/07/31 22:23:31 $ r&eacute;vision $Revision: 1.12 $</em>");
 ?>
diff --git a/htdocs/compta/prelevement/bon.php b/htdocs/compta/prelevement/bon.php
index 380650150de..80165dc0fbd 100644
--- a/htdocs/compta/prelevement/bon.php
+++ b/htdocs/compta/prelevement/bon.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/compta/prelevement/bon.php
  *      \ingroup    prelevement
  *      \brief      Fiche apercu du bon de prelevement
- *      \version    $Id$
+ *      \version    $Id: bon.php,v 1.15 2011/07/31 22:23:29 eldy Exp $
  */
 
 require("../bank/pre.inc.php");
@@ -99,5 +98,5 @@ if ($id > 0 || ! empty($ref))
 
 print "</div>";
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.15 $');
 ?>
diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index 4fda6cdddef..85a56de2dcf 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
         \file       htdocs/compta/prelevement/bons.php
         \ingroup    prelevement
         \brief      Page liste des bons de prelevements
-        \version    $Id$
+        \version    $Id: bons.php,v 1.26 2011/07/31 22:23:29 eldy Exp $
 */
 
 require("../bank/pre.inc.php");
@@ -123,6 +122,6 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.26 $');
 
 ?>
diff --git a/htdocs/compta/prelevement/class/bon-prelevement.class.php b/htdocs/compta/prelevement/class/bon-prelevement.class.php
index 5b93052ec98..8c6fa9ae9bf 100644
--- a/htdocs/compta/prelevement/class/bon-prelevement.class.php
+++ b/htdocs/compta/prelevement/class/bon-prelevement.class.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/compta/prelevement/class/bon-prelevement.class.php
  *      \ingroup    prelevement
  *      \brief      Fichier de la classe des bons de prelevements
- *      \version    $Id$
+ *      \version    $Id: bon-prelevement.class.php,v 1.31 2011/07/31 22:23:31 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
diff --git a/htdocs/compta/prelevement/class/ligne-prelevement.class.php b/htdocs/compta/prelevement/class/ligne-prelevement.class.php
index 5fdd8a37cc2..66a626046ae 100644
--- a/htdocs/compta/prelevement/class/ligne-prelevement.class.php
+++ b/htdocs/compta/prelevement/class/ligne-prelevement.class.php
@@ -14,17 +14,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: ligne-prelevement.class.php,v 1.6 2011/07/31 22:23:31 eldy Exp $
  */
 
 /*
  \file       htdocs/compta/prelevement/ligne-prelevement.class.php
  \ingroup    prelevement
  \brief      Fichier de la classe des lignes de prelevements
- \version    $Revision$
+ \version    $Revision: 1.6 $
  */
 
 
diff --git a/htdocs/compta/prelevement/class/rejet-prelevement.class.php b/htdocs/compta/prelevement/class/rejet-prelevement.class.php
index 366d3d05bd3..1795b9b8408 100644
--- a/htdocs/compta/prelevement/class/rejet-prelevement.class.php
+++ b/htdocs/compta/prelevement/class/rejet-prelevement.class.php
@@ -14,17 +14,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: rejet-prelevement.class.php,v 1.16 2011/07/31 22:23:31 eldy Exp $
  */
 
 /**
  \file       htdocs/compta/prelevement/class/rejet-prelevement.class.php
  \ingroup    prelevement
  \brief      File of class to manage standing orders rejects
- \version    $Revision$
+ \version    $Revision: 1.16 $
  */
 
 
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index a2a2bef6b64..689e2639773 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -22,7 +22,7 @@
 /**
  *	\file       htdocs/compta/prelevement/create.php
  *	\brief      Prelevement
- *	\version    $Id: create.php,v 1.33 2011/07/18 18:07:36 eldy Exp $
+ *	\version    $Id: create.php,v 1.34 2011/07/29 21:15:39 eldy Exp $
  */
 
 require("../bank/pre.inc.php");
@@ -43,6 +43,7 @@ $result = restrictedArea($user, 'prelevement', '', '', 'bons');
 // Get supervariables
 $action = GETPOST("action");
 
+
 /*
  * Actions
  */
@@ -171,17 +172,18 @@ if ($resql)
     $num = $db->num_rows($resql);
     $i = 0;
 
-    print_fiche_titre($langs->trans("InvoiceWaitingWithdraw").' ('.$num.')','','');
+    print_fiche_titre($langs->trans("InvoiceWaitingWithdraw").($num > 0?' ('.$num.')':''),'','');
+
+    print '<table class="noborder" width="100%">';
+    print '<tr class="liste_titre">';
+    print '<td>'.$langs->trans("Invoice").'</td>';
+    print '<td>'.$langs->trans("ThirdParty").'</td>';
+    print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
+    print '<td align="right">'.$langs->trans("DateRequest").'</td>';
+    print '</tr>';
 
     if ($num)
     {
-        print '<table class="noborder" width="100%">';
-        print '<tr class="liste_titre">';
-        print '<td>'.$langs->trans("Invoice").'</td>';
-        print '<td>'.$langs->trans("ThirdParty").'</td>';
-        print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
-        print '<td align="right">'.$langs->trans("DateRequest").'</td>';
-        print '</tr>';
         $var = True;
         while ($i < $num && $i < 20)
         {
@@ -207,10 +209,10 @@ if ($resql)
             print '</tr>';
             $i++;
         }
-
-        print "</table><br>";
-
     }
+    else print '<tr><td colspan="4">'.$langs->trans("None").'</td></tr>';
+    print "</table>";
+    print "<br>\n";
 }
 else
 {
@@ -274,5 +276,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/18 18:07:36 $ - $Revision: 1.33 $');
+llxFooter('$Date: 2011/07/29 21:15:39 $ - $Revision: 1.34 $');
 ?>
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index 4169ab63294..a9542083f69 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -15,14 +15,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \file       htdocs/compta/prelevement/demandes.php
  *  \brief      Page to list withdraw requests
- *  \version    $Id$
+ *  \version    $Id: demandes.php,v 1.40 2011/07/31 22:23:29 eldy Exp $
  */
 require("../bank/pre.inc.php");
 require_once DOL_DOCUMENT_ROOT."/includes/modules/modPrelevement.class.php";
@@ -156,5 +155,5 @@ else
 }
 
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.40 $');
 ?>
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 6d2bdf2a689..2aa4c18a2e0 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *     \file       htdocs/compta/prelevement/factures.php
  *     \ingroup    prelevement
  *     \brief      Page liste des factures prelevees
- *     \version    $Id$
+ *     \version    $Id: factures.php,v 1.25 2011/07/31 22:23:29 eldy Exp $
  */
 
 require("../bank/pre.inc.php");
@@ -210,5 +209,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.25 $');
 ?>
diff --git a/htdocs/compta/prelevement/facturesrejets.php b/htdocs/compta/prelevement/facturesrejets.php
index 624fade033b..b5ebff0fc3d 100644
--- a/htdocs/compta/prelevement/facturesrejets.php
+++ b/htdocs/compta/prelevement/facturesrejets.php
@@ -13,10 +13,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: facturesrejets.php,v 1.13 2011/07/31 22:23:29 eldy Exp $
  *
  */
 
@@ -156,5 +155,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.13 $');
 ?>
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index b85f503e611..b1b4c72ae66 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -15,14 +15,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  * 		\file       htdocs/compta/prelevement/fiche-rejet.php
  *		\brief      Prelevement
- * 		\version	$Id$
+ * 		\version	$Id: fiche-rejet.php,v 1.24 2011/07/31 22:23:29 eldy Exp $
  */
 
 require("../bank/pre.inc.php");
@@ -176,5 +175,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.24 $');
 ?>
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index 0c87d5cdb29..9a205f74bf7 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -14,14 +14,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/compta/prelevement/fiche-stat.php
  *	\brief      Prelevement
- *	\version    $Id$
+ *	\version    $Id: fiche-stat.php,v 1.19 2011/07/31 22:23:29 eldy Exp $
  */
 
 require("../bank/pre.inc.php");
@@ -157,5 +156,5 @@ if ($prev_id)
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.19 $');
 ?>
diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/fiche.php
index c5f3c23e28f..8c631f9f966 100644
--- a/htdocs/compta/prelevement/fiche.php
+++ b/htdocs/compta/prelevement/fiche.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/compta/prelevement/fiche.php
  *	\ingroup    prelevement
  *	\brief      Fiche prelevement
- *	\version    $Id$
+ *	\version    $Id: fiche.php,v 1.59 2011/07/31 22:23:29 eldy Exp $
  */
 
 require("../bank/pre.inc.php");
@@ -237,5 +236,5 @@ print "</div>";
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.59 $');
 ?>
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index a124e5832c9..d8390b8fa67 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -15,14 +15,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/compta/prelevement/index.php
  *	\brief      Prelevement
- *	\version    $Id$
+ *	\version    $Id: index.php,v 1.47 2011/07/31 22:23:30 eldy Exp $
  */
 
 require("../bank/pre.inc.php");
@@ -218,5 +217,5 @@ else
 
 print '</td></tr></table>';
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:30 $ - $Revision: 1.47 $');
 ?>
diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php
index 366f3ec5be2..8dcb987464b 100644
--- a/htdocs/compta/prelevement/ligne.php
+++ b/htdocs/compta/prelevement/ligne.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/compta/prelevement/ligne.php
  *	\ingroup    prelevement
  *	\brief      card of withdraw line
- *	\version    $Id$
+ *	\version    $Id: ligne.php,v 1.40 2011/07/31 22:23:30 eldy Exp $
  */
 
 require("../bank/pre.inc.php");
@@ -308,5 +307,5 @@ if ($id)
 	$db->close();
 }
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:30 $ - $Revision: 1.40 $');
 ?>
diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php
index c49b811e554..b26019d1626 100644
--- a/htdocs/compta/prelevement/lignes.php
+++ b/htdocs/compta/prelevement/lignes.php
@@ -15,14 +15,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/compta/prelevement/lignes.php
  *	\brief      Prelevement
- *	\version    $Id$
+ *	\version    $Id: lignes.php,v 1.23 2011/07/31 22:23:30 eldy Exp $
  */
 
 require("../bank/pre.inc.php");
@@ -212,5 +211,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:30 $ - $Revision: 1.23 $');
 ?>
diff --git a/htdocs/compta/prelevement/liste.php b/htdocs/compta/prelevement/liste.php
index f190be77e30..62899259b93 100644
--- a/htdocs/compta/prelevement/liste.php
+++ b/htdocs/compta/prelevement/liste.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/compta/prelevement/liste.php
  *      \ingroup    prelevement
  *      \brief      Page liste des prelevements
- *      \version    $Id$
+ *      \version    $Id: liste.php,v 1.35 2011/07/31 22:23:29 eldy Exp $
  */
 require("../bank/pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php");
@@ -186,5 +185,5 @@ else
 $db->close();
 
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.35 $');
 ?>
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index efe163a9226..0eb659d7747 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -14,12 +14,11 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
- * 	\version	$Id$
+ * 	\version	$Id: rejets.php,v 1.21 2011/07/31 22:23:29 eldy Exp $
  */
 
 require("../bank/pre.inc.php");
@@ -119,5 +118,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.21 $');
 ?>
diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php
index 7fffba4386b..86f5e7b3782 100644
--- a/htdocs/compta/prelevement/stats.php
+++ b/htdocs/compta/prelevement/stats.php
@@ -15,14 +15,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/compta/prelevement/stats.php
  *       \brief      Page de stats des prelevements
- *       \version    $Id$
+ *       \version    $Id: stats.php,v 1.23 2011/07/31 22:23:29 eldy Exp $
  */
 
 require("../bank/pre.inc.php");
@@ -237,5 +236,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.23 $');
 ?>
diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php
index 3b259927c6e..41be40078f9 100644
--- a/htdocs/compta/sociales/charges.php
+++ b/htdocs/compta/sociales/charges.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/compta/sociales/charges.php
  *		\ingroup    tax
  *		\brief      Social contribution car page
- *		\version    $Id$
+ *		\version    $Id: charges.php,v 1.65 2011/07/31 22:23:20 eldy Exp $
  */
 
 require('../../main.inc.php');
@@ -463,5 +462,5 @@ if ($chid > 0)
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.65 $');
 ?>
diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php
index 2aa820b029c..1141885538d 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *   	\file       htdocs/compta/sociales/index.php
  *		\ingroup    tax
  *		\brief      Page to list all social contributions
- *		\version    $Id: index.php,v 1.65 2011/07/04 10:30:01 eldy Exp $
+ *		\version    $Id: index.php,v 1.66 2011/07/31 22:23:20 eldy Exp $
  */
 
 require('../../main.inc.php');
@@ -229,5 +228,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/04 10:30:01 $ - $Revision: 1.65 $');
+llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.66 $');
 ?>
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index 1800c65575b..072f6341ba6 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -14,14 +14,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file        htdocs/compta/stats/cabyuser.php
  *      \brief       Page reporting Salesover by user
- *      \version     $Id$
+ *      \version     $Id: cabyuser.php,v 1.41 2011/07/31 22:23:13 eldy Exp $
  */
 
 require('../../main.inc.php');
@@ -303,5 +302,5 @@ print "</table>";
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:13 $ - $Revision: 1.41 $');
 ?>
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index 4084f84b63b..b4d5d19ba47 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -15,14 +15,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file        htdocs/compta/stats/casoc.php
  *       \brief       Page reporting CA par societe
- *       \version     $Id$
+ *       \version     $Id: casoc.php,v 1.49 2011/07/31 22:23:14 eldy Exp $
  */
 
 require('../../main.inc.php');
@@ -311,5 +310,5 @@ print '<br>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.49 $');
 ?>
\ No newline at end of file
diff --git a/htdocs/compta/stats/comp.php b/htdocs/compta/stats/comp.php
index e431ec86b78..92c0c0a9113 100644
--- a/htdocs/compta/stats/comp.php
+++ b/htdocs/compta/stats/comp.php
@@ -14,14 +14,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/compta/stats/comp.php
  *      \ingroup    commercial
- *  	\version	$Id: comp.php,v 1.44 2011/07/04 10:30:01 eldy Exp $
+ *  	\version	$Id: comp.php,v 1.45 2011/07/31 22:23:14 eldy Exp $
  * 		TODO	Remove or add page in menus
  */
 
@@ -351,5 +350,5 @@ if ($details == 1)
 $db->close();
 
 
-llxFooter('$Date: 2011/07/04 10:30:01 $ - $Revision: 1.44 $');
+llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.45 $');
 ?>
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index f101a14a147..69743dba019 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -14,14 +14,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file        htdocs/compta/stats/index.php
  *	\brief       Page reporting CA
- *	\version     $Id: index.php,v 1.50 2011/07/20 19:03:32 eldy Exp $
+ *	\version     $Id: index.php,v 1.51 2011/07/31 22:23:13 eldy Exp $
  */
 
 require('../../main.inc.php');
@@ -498,6 +497,6 @@ print "</table>";
 
 $db->close();
 
-llxFooter('$Date: 2011/07/20 19:03:32 $ - $Revision: 1.50 $');
+llxFooter('$Date: 2011/07/31 22:23:13 $ - $Revision: 1.51 $');
 
 ?>
diff --git a/htdocs/compta/stats/prev.php b/htdocs/compta/stats/prev.php
index 482d76261fe..558f624c027 100644
--- a/htdocs/compta/stats/prev.php
+++ b/htdocs/compta/stats/prev.php
@@ -14,10 +14,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: prev.php,v 1.21 2011/07/31 22:23:13 eldy Exp $
  */
 
 require('../../main.inc.php');
@@ -130,5 +129,5 @@ print "</td></tr></table>";
 $db->close();
 
 
-llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
+llxFooter("<em>Derni&egrave;re modification $Date: 2011/07/31 22:23:13 $ r&eacute;vision $Revision: 1.21 $</em>");
 ?>
diff --git a/htdocs/compta/ventilation/fournisseur/fiche.php b/htdocs/compta/ventilation/fournisseur/fiche.php
index c2cd075dea6..a4477e5ee4f 100644
--- a/htdocs/compta/ventilation/fournisseur/fiche.php
+++ b/htdocs/compta/ventilation/fournisseur/fiche.php
@@ -13,17 +13,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: fiche.php,v 1.8 2011/07/31 22:23:30 eldy Exp $
  */
 
 /**
         \file       htdocs/compta/ventilation/fournisseur/fiche.php
         \ingroup    compta
 		\brief      Page fiche ventilation
-		\version    $Revision$
+		\version    $Revision: 1.8 $
 */
 
 require('../../../main.inc.php');
@@ -149,5 +148,5 @@ else
 
 $db->close();
 
-llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
+llxFooter("<em>Derni&egrave;re modification $Date: 2011/07/31 22:23:30 $ r&eacute;vision $Revision: 1.8 $</em>");
 ?>
diff --git a/htdocs/compta/ventilation/fournisseur/index.php b/htdocs/compta/ventilation/fournisseur/index.php
index f7a7ced2b35..3d71fe8a5a1 100644
--- a/htdocs/compta/ventilation/fournisseur/index.php
+++ b/htdocs/compta/ventilation/fournisseur/index.php
@@ -14,17 +14,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: index.php,v 1.3 2011/07/31 22:23:30 eldy Exp $
  */
 
 /**
         \file       htdocs/compta/ventilation/fournisseur/index.php
         \ingroup    compta
 		\brief      Page accueil ventilation
-		\version    $Revision$
+		\version    $Revision: 1.3 $
 */
 
 require('../../../main.inc.php');
@@ -126,6 +125,6 @@ print "</table>\n";
 
 print '</td></tr></table>';
 
-llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
+llxFooter("<em>Derni&egrave;re modification $Date: 2011/07/31 22:23:30 $ r&eacute;vision $Revision: 1.3 $</em>");
 
 ?>
diff --git a/htdocs/compta/ventilation/fournisseur/lignes.php b/htdocs/compta/ventilation/fournisseur/lignes.php
index e0bb4a69db5..c706a02125f 100644
--- a/htdocs/compta/ventilation/fournisseur/lignes.php
+++ b/htdocs/compta/ventilation/fournisseur/lignes.php
@@ -12,17 +12,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: lignes.php,v 1.6 2011/07/31 22:23:30 eldy Exp $
  */
 
 /**
    \file       htdocs/compta/ventilation/fournisseur/lignes.php
    \ingroup    facture
    \brief      Page de detail des lignes de ventilation d'une facture
-   \version    $Revision$
+   \version    $Revision: 1.6 $
 */
 
 require('../../../main.inc.php');
@@ -114,5 +113,5 @@ print "</table></form>";
 
 $db->close();
 
-llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
+llxFooter("<em>Derni&egrave;re modification $Date: 2011/07/31 22:23:30 $ r&eacute;vision $Revision: 1.6 $</em>");
 ?>
diff --git a/htdocs/compta/ventilation/fournisseur/liste.php b/htdocs/compta/ventilation/fournisseur/liste.php
index 9a11c78906d..cbaef0d7a6e 100644
--- a/htdocs/compta/ventilation/fournisseur/liste.php
+++ b/htdocs/compta/ventilation/fournisseur/liste.php
@@ -14,10 +14,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: liste.php,v 1.4 2011/07/31 22:23:30 eldy Exp $
  */
 
 
@@ -25,7 +24,7 @@
   \file       htdocs/compta/ventilation/liste.php
   \ingroup    compta
   \brief      Page de ventilation des lignes de facture
-  \version    $Revision$
+  \version    $Revision: 1.4 $
 */
 
 require('../../../main.inc.php');
@@ -105,5 +104,5 @@ else
 }
 $db->close();
 
-llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
+llxFooter("<em>Derni&egrave;re modification $Date: 2011/07/31 22:23:30 $ r&eacute;vision $Revision: 1.4 $</em>");
 ?>
diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example
index 61c440483e2..4a5f74f5e95 100644
--- a/htdocs/conf/conf.php.example
+++ b/htdocs/conf/conf.php.example
@@ -5,7 +5,7 @@
 # This file is used by Dolibarr setup process to create true Dolibarr
 # config file called "conf.php".
 #
-# $Id$
+# $Id: conf.php.example,v 1.49 2011/07/30 11:12:52 eldy Exp $
 
 
 ###################
@@ -249,13 +249,4 @@ $dolibarr_main_prod='0';
 # Examples:
 # $dolibarr_mailing_limit_sendbyweb='0';
 
-# This is an development feature to allow external components to overwrite
-# some Dolibarr kernel files to be overwritten by versions provided by
-# third parties modules.
-# !! This feature is not working yet and breaks Dolibarr stability !!
-# Default value: 0
-# Possible values: 0 or 1
-# Examples:
-# $dolibarr_allow_overwritekernel='0';
-
 ?>
diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php
index 00adaf510d2..319bd94a135 100644
--- a/htdocs/contact/canvas/actions_contactcard_common.class.php
+++ b/htdocs/contact/canvas/actions_contactcard_common.class.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/contact/canvas/actions_contactcard_common.class.php
  *	\ingroup    thirdparty
  *	\brief      Fichier de la classe Thirdparty contact card controller (common)
- *	\version    $Id$
+ *	\version    $Id: actions_contactcard_common.class.php,v 1.25 2011/07/31 23:54:12 eldy Exp $
  */
 
 /**
diff --git a/htdocs/contact/canvas/default/actions_contactcard_default.class.php b/htdocs/contact/canvas/default/actions_contactcard_default.class.php
index fe04de69c82..dc2e05d4ce1 100644
--- a/htdocs/contact/canvas/default/actions_contactcard_default.class.php
+++ b/htdocs/contact/canvas/default/actions_contactcard_default.class.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/contact/canvas/default/actions_contactcard_default.class.php
  *	\ingroup    thirdparty
  *	\brief      Fichier de la classe Thirdparty contact card controller (default canvas)
- *	\version    $Id: actions_contactcard_default.class.php,v 1.9 2011/07/08 13:07:45 eldy Exp $
+ *	\version    $Id: actions_contactcard_default.class.php,v 1.10 2011/07/31 23:54:11 eldy Exp $
  */
 include_once(DOL_DOCUMENT_ROOT.'/contact/canvas/actions_contactcard_common.class.php');
 
diff --git a/htdocs/contact/canvas/default/dao_contact_default.class.php b/htdocs/contact/canvas/default/dao_contact_default.class.php
index 9ec0d7db3cd..85d0d6f6324 100644
--- a/htdocs/contact/canvas/default/dao_contact_default.class.php
+++ b/htdocs/contact/canvas/default/dao_contact_default.class.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/contact/canvas/default/dao_contact_default.class.php
  *	\ingroup    thirdparty
  *	\brief      Fichier de la classe des contacts par defaut
- *	\version    $Id$
+ *	\version    $Id: dao_contact_default.class.php,v 1.4 2011/07/31 23:54:11 eldy Exp $
  */
 
 /**
diff --git a/htdocs/contact/canvas/default/index.php b/htdocs/contact/canvas/default/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/contact/canvas/default/index.php
+++ b/htdocs/contact/canvas/default/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
index 0e5dbfadd72..14777e9b14a 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: contactcard_create.tpl.php,v 1.7 2011/07/31 23:54:12 eldy Exp $
  */
 ?>
 
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
index 7f8aeccbd94..70eb2819319 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: contactcard_edit.tpl.php,v 1.7 2011/07/31 23:54:11 eldy Exp $
  */
 
 $contact = $GLOBALS['objcanvas']->control->object;
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
index 552de474fdc..a462144b0a9 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id: contactcard_view.tpl.php,v 1.9 2011/07/08 13:07:45 eldy Exp $
+ * $Id: contactcard_view.tpl.php,v 1.10 2011/07/31 23:54:12 eldy Exp $
  */
 
 $contact = $GLOBALS['objcanvas']->control->object;
diff --git a/htdocs/contact/canvas/default/tpl/index.php b/htdocs/contact/canvas/default/tpl/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/contact/canvas/default/tpl/index.php
+++ b/htdocs/contact/canvas/default/tpl/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/contact/canvas/index.php b/htdocs/contact/canvas/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/contact/canvas/index.php
+++ b/htdocs/contact/canvas/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index aa588cdb286..3789c41f7a2 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -17,15 +17,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/contact/class/contact.class.php
  *	\ingroup    societe
  *	\brief      File of contacts class
- *	\version    $Id: contact.class.php,v 1.31 2011/07/10 16:50:40 eldy Exp $
+ *	\version    $Id: contact.class.php,v 1.32 2011/07/31 23:54:12 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
 
diff --git a/htdocs/contact/exportimport.php b/htdocs/contact/exportimport.php
index 1a6b254eed5..8b4d1f66070 100644
--- a/htdocs/contact/exportimport.php
+++ b/htdocs/contact/exportimport.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/contact/exportimport.php
  *	\ingroup    societe
  *	\brief      Onglet exports-imports d'un contact
- *	\version    $Id$
+ *	\version    $Id: exportimport.php,v 1.29 2011/07/31 23:54:12 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -107,5 +106,5 @@ print '</a>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:54:12 $ - $Revision: 1.29 $');
 ?>
diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
index 3e40da58a72..82e537ddbe7 100644
--- a/htdocs/contact/fiche.php
+++ b/htdocs/contact/fiche.php
@@ -16,15 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/contact/fiche.php
  *       \ingroup    societe
  *       \brief      Card of a contact
- *       \version    $Id: fiche.php,v 1.221 2011/07/04 08:00:52 eldy Exp $
+ *       \version    $Id: fiche.php,v 1.222 2011/07/31 23:54:12 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -974,5 +973,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/04 08:00:52 $ - $Revision: 1.221 $');
+llxFooter('$Date: 2011/07/31 23:54:12 $ - $Revision: 1.222 $');
 ?>
diff --git a/htdocs/contact/index.php b/htdocs/contact/index.php
index ec96ee8299b..5f1cbebd752 100644
--- a/htdocs/contact/index.php
+++ b/htdocs/contact/index.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/contact/index.php
  *      \ingroup    societe
  *		\brief      Page to list all contacts
- *		\version    $Id$
+ *		\version    $Id: index.php,v 1.106 2011/07/31 23:54:12 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -421,5 +420,5 @@ print '<br>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:54:12 $ - $Revision: 1.106 $');
 ?>
diff --git a/htdocs/contact/info.php b/htdocs/contact/info.php
index 977b471cc85..f9baf35268f 100644
--- a/htdocs/contact/info.php
+++ b/htdocs/contact/info.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/contact/info.php
  *      \ingroup    societe
  *		\brief      Onglet info d'un contact
- *		\version    $Id$
+ *		\version    $Id: info.php,v 1.34 2011/07/31 23:54:12 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -64,5 +63,5 @@ print "</div>";
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:54:12 $ - $Revision: 1.34 $');
 ?>
diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php
index d010904a76d..736780b4d91 100644
--- a/htdocs/contact/ldap.php
+++ b/htdocs/contact/ldap.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/contact/ldap.php
  *       \ingroup    ldap
  *       \brief      Page fiche LDAP contact
- *       \version    $Id$
+ *       \version    $Id: ldap.php,v 1.33 2011/07/31 23:54:12 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -210,5 +209,5 @@ print '</table>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:54:12 $ - $Revision: 1.33 $');
 ?>
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index 4e89239ea68..2c82589a19f 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/contact/perso.php
  *       \ingroup    societe
  *       \brief      Onglet informations personnelles d'un contact
- *       \version    $Id$
+ *       \version    $Id: perso.php,v 1.65 2011/07/31 23:54:12 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -233,5 +232,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:54:12 $ - $Revision: 1.65 $');
 ?>
diff --git a/htdocs/contact/vcard.php b/htdocs/contact/vcard.php
index 67953c48359..5ebda97b4e2 100644
--- a/htdocs/contact/vcard.php
+++ b/htdocs/contact/vcard.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/contact/vcard.php
  *      \ingroup    societe
  *		\brief      Onglet vcard d'un contact
- *		\version    $Id$
+ *		\version    $Id: vcard.php,v 1.27 2011/07/31 23:54:12 eldy Exp $
  */
 
 require("../main.inc.php");
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index c95f972c4ac..2c127cb9efc 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -17,15 +17,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/contrat/class/contrat.class.php
  *	\ingroup    contrat
  *	\brief      Fichier de la classe des contrats
- *	\version    $Id$
+ *	\version    $Id: contrat.class.php,v 1.23 2011/07/31 23:50:01 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index 62709273bb4..0ed92ef65cc 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
         \file       htdocs/contrat/contact.php
         \ingroup    contrat
         \brief      Onglet de gestion des contacts des contrats
-        \version    $Id$
+        \version    $Id: contact.php,v 1.46 2011/07/31 23:46:55 eldy Exp $
 */
 
 require ("../main.inc.php");
@@ -401,5 +400,5 @@ if ($id > 0)
 
 $db->close();
 
-llxFooter('$Date$');
+llxFooter('$Date: 2011/07/31 23:46:55 $');
 ?>
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index df48a79cabf..75a31e3f705 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -16,15 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/contrat/document.php
  *       \ingroup    contrat
  *       \brief      Page des documents joints sur les contrats
- *       \version    $Id: document.php,v 1.24 2011/07/06 20:56:50 eldy Exp $
+ *       \version    $Id: document.php,v 1.25 2011/07/31 23:46:55 eldy Exp $
  */
 
 require ("../main.inc.php");
@@ -173,5 +172,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/06 20:56:50 $ - $Revision: 1.24 $');
+llxFooter('$Date: 2011/07/31 23:46:55 $ - $Revision: 1.25 $');
 ?>
diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
index 7a25b945269..0cf91d64abc 100644
--- a/htdocs/contrat/fiche.php
+++ b/htdocs/contrat/fiche.php
@@ -16,15 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/contrat/fiche.php
  *       \ingroup    contrat
  *       \brief      Page of a contract
- *       \version    $Id$
+ *       \version    $Id: fiche.php,v 1.197 2011/07/31 23:46:54 eldy Exp $
  */
 
 require ("../main.inc.php");
@@ -1287,5 +1286,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:46:54 $ - $Revision: 1.197 $');
 ?>
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 61bcea427f3..49fbaddc963 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/contrat/index.php
  *      \ingroup    contrat
  *		\brief      Page liste des contrats
- *		\version    $Revision$
+ *		\version    $Revision: 1.84 $
  */
 
 require ("../main.inc.php");
@@ -493,5 +492,5 @@ print '<br>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:46:55 $ - $Revision: 1.84 $');
 ?>
\ No newline at end of file
diff --git a/htdocs/contrat/info.php b/htdocs/contrat/info.php
index 03fe7f38844..a1f4ce047d8 100644
--- a/htdocs/contrat/info.php
+++ b/htdocs/contrat/info.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
         \file       htdocs/contrat/info.php
         \ingroup    contrat
 		\brief      Page des informations d'un contrat
-		\version    $Id$
+		\version    $Id: info.php,v 1.25 2011/07/31 23:46:54 eldy Exp $
 */
 
 require ("../main.inc.php");
@@ -59,5 +58,5 @@ print '</div>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:46:54 $ - $Revision: 1.25 $');
 ?>
diff --git a/htdocs/contrat/liste.php b/htdocs/contrat/liste.php
index e23d4b9206b..86105569116 100644
--- a/htdocs/contrat/liste.php
+++ b/htdocs/contrat/liste.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/contrat/liste.php
  *       \ingroup    contrat
  *       \brief      Page liste des contrats
- *       \version    $Id$
+ *       \version    $Id: liste.php,v 1.46 2011/07/31 23:46:55 eldy Exp $
  */
 
 require ("../main.inc.php");
@@ -163,5 +162,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:46:55 $ - $Revision: 1.46 $');
 ?>
diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index 51ffab2dbaf..3e7d062ef4c 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
         \file       htdocs/contrat/note.php
         \ingroup    contrat
         \brief      Fiche de notes sur un contrat
-		\version    $Id$
+		\version    $Id: note.php,v 1.28 2011/07/31 23:46:55 eldy Exp $
 */
 
 require ("../main.inc.php");
@@ -186,5 +185,5 @@ if ($_GET["id"])
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:46:55 $ - $Revision: 1.28 $');
 ?>
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index 8f3ba67991e..de125e85f65 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/contrat/services.php
  *      \ingroup    contrat
  *		\brief      Page to list services in contracts
- *		\version    $Id$
+ *		\version    $Id: services.php,v 1.57 2011/07/31 23:46:55 eldy Exp $
  */
 
 require ("../main.inc.php");
@@ -267,5 +266,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:46:55 $ - $Revision: 1.57 $');
 ?>
diff --git a/htdocs/contrat/tpl/linkedobjectblock.tpl.php b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
index 065fdbe377d..0de5644be77 100644
--- a/htdocs/contrat/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: linkedobjectblock.tpl.php,v 1.12 2011/07/31 23:50:01 eldy Exp $
  */
 ?>
 
diff --git a/htdocs/core/ajaxbox.php b/htdocs/core/ajaxbox.php
index d2eb6e84df5..97c6c7abf85 100644
--- a/htdocs/core/ajaxbox.php
+++ b/htdocs/core/ajaxbox.php
@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/core/ajaxbox.php
  *       \brief      File to return Ajax response on Box move
- *       \version    $Id$
+ *       \version    $Id: ajaxbox.php,v 1.3 2011/07/31 23:45:15 eldy Exp $
  */
 
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
diff --git a/htdocs/core/ajaxconstantonoff.php b/htdocs/core/ajaxconstantonoff.php
index cf41368a940..bb77112f910 100644
--- a/htdocs/core/ajaxconstantonoff.php
+++ b/htdocs/core/ajaxconstantonoff.php
@@ -12,14 +12,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/core/ajaxconstantonoff.php
  *       \brief      File to set or del an on/off constant
- *       \version    $Id$
+ *       \version    $Id: ajaxconstantonoff.php,v 1.3 2011/07/31 23:45:15 eldy Exp $
  */
 
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
diff --git a/htdocs/core/ajaxfileupload.php b/htdocs/core/ajaxfileupload.php
index 70babaa6ca3..a727fbf9d5f 100644
--- a/htdocs/core/ajaxfileupload.php
+++ b/htdocs/core/ajaxfileupload.php
@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/core/ajaxfileupload.php
  *       \brief      File to return Ajax response on file upload
- *       \version    $Id: ajaxfileupload.php,v 1.10 2011/07/06 10:34:30 hregis Exp $
+ *       \version    $Id: ajaxfileupload.php,v 1.11 2011/07/31 23:45:15 eldy Exp $
  */
 
 //if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
diff --git a/htdocs/core/ajaxrow.php b/htdocs/core/ajaxrow.php
index e421e2ee7de..77c77fff2fd 100644
--- a/htdocs/core/ajaxrow.php
+++ b/htdocs/core/ajaxrow.php
@@ -12,14 +12,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/core/ajaxrow.php
  *       \brief      File to return Ajax response on Row move
- *       \version    $Id$
+ *       \version    $Id: ajaxrow.php,v 1.4 2011/07/31 23:45:15 eldy Exp $
  */
 
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
diff --git a/htdocs/core/ajaxsecurity.php b/htdocs/core/ajaxsecurity.php
index 896e04bddc4..01ed21144e1 100644
--- a/htdocs/core/ajaxsecurity.php
+++ b/htdocs/core/ajaxsecurity.php
@@ -12,14 +12,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/core/ajaxsecurity.php
  *       \brief      File for return security data
- *       \version    $Id: ajaxsecurity.php,v 1.1 2011/07/09 08:05:08 hregis Exp $
+ *       \version    $Id: ajaxsecurity.php,v 1.2 2011/07/31 23:45:15 eldy Exp $
  */
 
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
diff --git a/htdocs/core/ajaxziptown.php b/htdocs/core/ajaxziptown.php
index 5c585292ab7..b742ec3cfa9 100644
--- a/htdocs/core/ajaxziptown.php
+++ b/htdocs/core/ajaxziptown.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file      htdocs/core/ajaxziptown.php
  *       \ingroup	core
  *       \brief     File to return Ajax response on zipcode or town request
- *       \version   $Id$
+ *       \version   $Id: ajaxziptown.php,v 1.12 2011/07/31 23:45:15 eldy Exp $
  */
 
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
diff --git a/htdocs/core/class/canvas.class.php b/htdocs/core/class/canvas.class.php
index c2aa4c83e84..7113904fd2c 100644
--- a/htdocs/core/class/canvas.class.php
+++ b/htdocs/core/class/canvas.class.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *   \file			htdocs/core/class/canvas.class.php
  *   \ingroup		core
  *   \brief			File of class to manage canvas
- *   \version		$Id: canvas.class.php,v 1.44 2011/07/02 14:51:26 eldy Exp $
+ *   \version		$Id: canvas.class.php,v 1.45 2011/07/31 23:45:13 eldy Exp $
  */
 
 
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 3ee0aa6fc50..9a1dddd2899 100755
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -24,7 +23,7 @@
  *	    \file       htdocs/core/class/commondocgenerator.class.php
  *		\ingroup    core
  *		\brief      File of parent class for documents generators
- *		\version    $Id: commondocgenerator.class.php,v 1.6 2011/07/03 21:59:53 eldy Exp $
+ *		\version    $Id: commondocgenerator.class.php,v 1.7 2011/07/31 23:45:13 eldy Exp $
  */
 
 
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 2a513091288..5923ef66815 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/core/class/commonobject.class.php
  *	\ingroup    core
  *	\brief      File of parent class of all other business classes (invoices, contracts, proposals, orders, ...)
- *	\version    $Id: commonobject.class.php,v 1.147 2011/07/17 18:33:31 eldy Exp $
+ *	\version    $Id: commonobject.class.php,v 1.148 2011/07/31 23:45:14 eldy Exp $
  */
 
 
diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php
index 43d83f3a4bc..e61160aac38 100644
--- a/htdocs/core/class/commonobjectline.class.php
+++ b/htdocs/core/class/commonobjectline.class.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/core/class/commonobjectline.class.php
  *       \ingroup    core
  *       \brief      File of the superclass of classes of lines of business objects (invoice, contract, PROPAL, commands, etc. ...)
- *       \version    $Id$
+ *       \version    $Id: commonobjectline.class.php,v 1.5 2011/07/31 23:45:14 eldy Exp $
  */
 
 
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index bd15e21b0ab..e6559c2ae2e 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -23,9 +23,9 @@
 /**
  *	\file       	htdocs/core/class/conf.class.php
  *	\ingroup		core
- *  \brief      	Fichier de la classe de stockage de la config courante
- *  \remarks		La config est stockee dans le fichier conf/conf.php
- *  \version    	$Id: conf.class.php,v 1.61 2011/07/13 18:04:25 eldy Exp $
+ *  \brief      	File of class to manage storage of current setup
+ *  				Config is stored into file conf.php
+ *  \version    	$Id: conf.class.php,v 1.62 2011/07/30 10:23:26 eldy Exp $
  */
 
 
diff --git a/htdocs/core/class/cookie.class.php b/htdocs/core/class/cookie.class.php
index 86e96912762..07fed567b48 100644
--- a/htdocs/core/class/cookie.class.php
+++ b/htdocs/core/class/cookie.class.php
@@ -19,7 +19,7 @@
 /**
  *	\file       htdocs/core/class/cookie.class.php
  *	\ingroup    core
- *	\version	$Id$
+ *	\version	$Id: cookie.class.php,v 1.6 2011/07/30 08:56:26 eldy Exp $
  *	\brief      File of class to manage cookies
  */
 
@@ -131,86 +131,6 @@ class DolCookie
 		return $decryptValue;
 	}
 
-	/**
-	 *  \brief   	Add cookie cryptkey in config file
-	 *	\return		int		<0 if KO, >0 if OK
-	 */
-	function add_cookiecryptkeyconf()
-	{
-		dol_syslog("cookie.class::add_cookiecryptkeyconf", LOG_DEBUG);
-		$config = '';
-		$added=0;
-
-		if ($fp = fopen(DOL_DOCUMENT_ROOT.'/conf/conf.php','r'))
-		{
-			while(!feof($fp))
-			{
-				$buffer = fgets($fp,4096);
-
-				if (strstr($buffer,"\$dolibarr_main_cookie_cryptkey"))
-				{
-					$config .= "\$dolibarr_main_cookie_cryptkey=\"$this->myKey\";\n";
-					$added++;
-				}
-				else
-				{
-					$config .= $buffer;
-				}
-			}
-			fclose($fp);
-
-			if (!$added)
-			{
-				$config = '';
-
-				if ($fp = fopen(DOL_DOCUMENT_ROOT.'/conf/conf.php','r'))
-				{
-					while(!feof($fp))
-					{
-						$buffer = fgets($fp,4096);
-
-						if (strstr($buffer,"\$dolibarr_main_authentication"))
-						{
-							$config .= $buffer;
-							$config .= "\$dolibarr_main_cookie_cryptkey=\"$this->myKey\";\n";
-						}
-						else
-						{
-							$config .= $buffer;
-						}
-					}
-					fclose($fp);
-				}
-				else
-				{
-					dol_syslog("cookie.class::add_cookiecryptkeyconf Failed to read conf.php", LOG_ERR);
-					return -2;
-				}
-			}
-
-			$file=DOL_DOCUMENT_ROOT.'/conf/conf.php';
-			if ($fp = @fopen($file,'w'))
-			{
-				fputs($fp, $config, dol_strlen($config));
-				fclose($fp);
-				// It's config file, so we set permission for creator only
-				// @chmod($file, octdec('0600'));
-
-				return 1;
-			}
-			else
-			{
-				dol_syslog("cookie.class::add_cookiecryptkeyconf Failed to open conf.php file for writing", LOG_WARNING);
-				return -1;
-			}
-		}
-		else
-		{
-			dol_syslog("cookie.class::add_cookiecryptkeyconf Failed to read conf.php", LOG_ERR);
-			return -2;
-		}
-	}
-
 }
 
 ?>
\ No newline at end of file
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index a5ae7413b7f..f6c46e9ed46 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\file       htdocs/core/class/discount.class.php
  * 		\ingroup    core propal facture commande
  *		\brief      File of class to manage absolute discounts
- *		\version    $Id$
+ *		\version    $Id: discount.class.php,v 1.7 2011/07/31 23:45:14 eldy Exp $
  */
 
 
diff --git a/htdocs/core/class/dolexception.class.php b/htdocs/core/class/dolexception.class.php
index 69f89a73d5b..97d27b1b1a8 100644
--- a/htdocs/core/class/dolexception.class.php
+++ b/htdocs/core/class/dolexception.class.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *   \file			htdocs/core/class/dolexception.class.php
  *   \ingroup		core
  *   \brief			File of class for exceptions
- *   \version		$Id$
+ *   \version		$Id: dolexception.class.php,v 1.3 2011/07/31 23:45:14 eldy Exp $
  */
 
 
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 429edfeb09e..ea9165804c6 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/core/class/dolgraph.class.php
  *  \ingroup    core
  *	\brief      Fichier de la classe mere de gestion des graph
- *	\version    $Id$
+ *	\version    $Id: dolgraph.class.php,v 1.7 2011/07/31 23:45:15 eldy Exp $
  *
  *	Usage:
  *	$graph_data = array(array('labelA',yA),array('labelB',yB));
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index 918b93de6ad..b201c7665c7 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/core/class/events.class.php
  *      \ingroup    core
  *		\brief      File of class to manage security events.
- *		\version    $Id: events.class.php,v 1.7 2011/07/18 23:32:00 eldy Exp $
+ *		\version    $Id: events.class.php,v 1.8 2011/07/31 23:45:14 eldy Exp $
  *		\author		Laurent Destailleur
  */
 
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 76d7bd63f7c..5486b57d3d4 100755
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -17,15 +17,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  * 	\file 		htdocs/core/class/extrafields.class.php
  *	\ingroup    core
  *	\brief      File of class to manage extra fields
- *	\version    $Id$
+ *	\version    $Id: extrafields.class.php,v 1.6 2011/07/31 23:45:14 eldy Exp $
  */
 
 /**
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 0b45de0569c..cb4a0f7a5cf 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -31,7 +31,7 @@
  *	\file       htdocs/core/class/html.form.class.php
  *  \ingroup    core
  *	\brief      File of class with all html predefined components
- *	\version	$Id: html.form.class.php,v 1.190 2011/07/17 19:01:26 eldy Exp $
+ *	\version	$Id: html.form.class.php,v 1.192 2011/07/27 23:37:01 eldy Exp $
  */
 
 
@@ -137,17 +137,18 @@ class Form
     /**
      *	Show a text and picto with tooltip on text or picto
      *	@param  text				Text to show
-     *	@param  htmltext	    	Content html of tooltip, coded into HTML/UTF8
+     *	@param  htmltext	    	Content html of tooltip. Must be HTML/UTF8 encoded.
      *	@param	tooltipon			1=tooltip sur texte, 2=tooltip sur picto, 3=tooltip sur les 2
      *	@param	direction			-1=Le picto est avant, 0=pas de picto, 1=le picto est apres
      *	@param	img					Code img du picto (use img_xxx() function to get it)
      *  @param  extracss            Add a CSS style to td tags
      *  @param  notabs              Do not include table and tr tags
      *  @param  incbefore			Include code before the text
+     *  @param  noencodehtmltext    Do not encode into html entity the htmltext
      *	@return	string				Code html du tooltip (texte+picto)
      * 	@see	Use function textwithpicto if you can.
      */
-    function textwithtooltip($text,$htmltext,$tooltipon=1,$direction=0,$img='',$extracss='',$notabs=0,$incbefore='')
+    function textwithtooltip($text,$htmltext,$tooltipon=1,$direction=0,$img='',$extracss='',$notabs=0,$incbefore='',$noencodehtmltext=0)
     {
         global $conf;
 
@@ -160,7 +161,7 @@ class Form
         $htmltext=str_replace("\n","",$htmltext);
 
        	$htmltext=str_replace('"',"&quot;",$htmltext);
-       	$paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.dol_escape_htmltag($htmltext,1).'"'; // Attribut to put on td img tag to store tooltip
+       	$paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip
        	$paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag
 
        	$s="";
@@ -197,9 +198,10 @@ class Form
      *	@param		direction			1=Icon is after text, -1=Icon is before text
      * 	@param		type				Type of picto (info, help, warning, superadmin...)
      *  @param  	extracss            Add a CSS style to td tags
+     *  @param      noencodehtmltext    Do not encode into html entity the htmltext
      * 	@return		string				HTML code of text, picto, tooltip
      */
-    function textwithpicto($text,$htmltext,$direction=1,$type='help',$extracss='')
+    function textwithpicto($text,$htmltext,$direction=1,$type='help',$extracss='',$noencodehtmltext=0)
     {
         global $conf;
 
@@ -225,7 +227,7 @@ class Form
         // Warnings
         if ($type == 'warning') 			$img=img_warning($alt);
 
-        return $this->textwithtooltip($text,$htmltext,2,$direction,$img,$extracss);
+        return $this->textwithtooltip($text,$htmltext,2,$direction,$img,$extracss,0,'',$noencodehtmltext);
     }
 
     /**
@@ -675,7 +677,7 @@ class Form
         $sql = "SELECT s.rowid, s.name, s.firstname, s.poste FROM";
         $sql.= " ".MAIN_DB_PREFIX ."socpeople as s";
         $sql.= " WHERE entity = ".$conf->entity;
-        if ($socid) $sql.= " AND fk_soc=".$socid;
+        if ($socid > 0) $sql.= " AND fk_soc=".$socid;
         $sql.= " ORDER BY s.name ASC";
 
         dol_syslog("Form::select_contacts sql=".$sql);
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 3a52c4484c5..1a984d1226e 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/core/class/html.formactions.class.php
  *      \ingroup    core
  *      \brief      Fichier de la classe des fonctions predefinie de composants html actions
- *		\version	$Id: html.formactions.class.php,v 1.20 2011/07/07 21:56:20 eldy Exp $
+ *		\version	$Id: html.formactions.class.php,v 1.21 2011/07/31 23:45:14 eldy Exp $
  */
 
 
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index a3181284491..23baf771908 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/core/class/html.formadmin.class.php
  *      \ingroup    core
  *      \brief      File of class for html functions for admin pages
- *		\version	$Id$
+ *		\version	$Id: html.formadmin.class.php,v 1.23 2011/07/31 23:45:14 eldy Exp $
  */
 
 
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index e21904e4242..2b5ba7e282d 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/core/class/html.formcompany.class.php
  *  \ingroup    core
  *	\brief      File of class to build HTML component for third parties management
- *	\version	$Id: html.formcompany.class.php,v 1.33 2011/06/26 21:51:56 eldy Exp $
+ *	\version	$Id: html.formcompany.class.php,v 1.34 2011/07/31 23:45:14 eldy Exp $
  */
 
 
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 135dec1594f..fc5dbe8206a 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/core/class/html.formfile.class.php
  *  \ingroup    core
  *	\brief      File of class to offer components to list and upload files
- *	\version	$Id: html.formfile.class.php,v 1.50 2011/07/20 19:03:32 eldy Exp $
+ *	\version	$Id: html.formfile.class.php,v 1.51 2011/07/31 23:45:14 eldy Exp $
  */
 
 
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 4b32e65ea54..5f6b6db8fcb 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/core/class/html.formmail.class.php
  *       \ingroup    core
  *       \brief      Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire
- *       \version    $Id: html.formmail.class.php,v 1.33 2011/07/13 22:18:12 eldy Exp $
+ *       \version    $Id: html.formmail.class.php,v 1.34 2011/07/31 23:45:13 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT ."/core/class/html.form.class.php");
 
diff --git a/htdocs/core/class/html.formorder.class.php b/htdocs/core/class/html.formorder.class.php
index beebea47366..cfa1dd094ef 100644
--- a/htdocs/core/class/html.formorder.class.php
+++ b/htdocs/core/class/html.formorder.class.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/core/class/html.formorder.class.php
  *  \ingroup    core
  *	\brief      File of predefined functions for HTML forms for order module
- *	\version	$Id$
+ *	\version	$Id: html.formorder.class.php,v 1.11 2011/07/31 23:45:14 eldy Exp $
  */
 
 
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index cbf91f7ef94..561a6918415 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -21,15 +21,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/core/class/html.formother.class.php
  *  \ingroup    core
  *	\brief      Fichier de la classe des fonctions predefinie de composants html autre
- *	\version	$Id: html.formother.class.php,v 1.17 2011/07/04 08:53:01 eldy Exp $
+ *	\version	$Id: html.formother.class.php,v 1.18 2011/07/31 23:45:14 eldy Exp $
  */
 
 
diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php
index babc910436e..68dedb7b884 100755
--- a/htdocs/core/class/html.formsms.class.php
+++ b/htdocs/core/class/html.formsms.class.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/core/class/html.formmail.class.php
  *       \ingroup    core
  *       \brief      Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire
- *       \version    $Id: html.formsms.class.php,v 1.12 2011/07/07 21:38:19 eldy Exp $
+ *       \version    $Id: html.formsms.class.php,v 1.13 2011/07/31 23:45:14 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT ."/core/class/html.form.class.php");
 
diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index 64690d276f6..8deeda0fb57 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -22,7 +22,7 @@
  *   \file		    htdocs/core/class/interfaces.class.php
  *   \ingroup		core
  *   \brief			Fichier de la classe de gestion des triggers
- *   \version		$Id: interfaces.class.php,v 1.7 2011/06/27 10:41:31 hregis Exp $
+ *   \version		$Id: interfaces.class.php,v 1.8 2011/07/28 10:36:43 eldy Exp $
  */
 
 
@@ -122,7 +122,7 @@ class Interfaces
     					if ($objMod)
     					{
     						// Bypass if workflow module is enabled and if the trigger asked to be disable in such case
-    						if ($conf->workflow->enabled && ! empty($objMod->disabled_if_workflow))
+    						if (! empty($conf->workflow->enabled) && ! empty($objMod->disabled_if_workflow))
     						{
     							dol_syslog("Interfaces::run_triggers action=".$action." Bypass triggers for file '".$file."'",LOG_INFO);
     							continue;
diff --git a/htdocs/core/class/menu.class.php b/htdocs/core/class/menu.class.php
index 7c90970d411..9637494c982 100644
--- a/htdocs/core/class/menu.class.php
+++ b/htdocs/core/class/menu.class.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \file       htdocs/core/class/menu.class.php
  *  \ingroup    core
  *  \brief      Fichier de la classe de gestion du menu gauche
- *  \version    $Id: menu.class.php,v 1.4 2011/07/04 11:33:22 eldy Exp $
+ *  \version    $Id: menu.class.php,v 1.5 2011/07/31 23:45:13 eldy Exp $
  */
 
 
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 8650dcd616e..7d5dfdf9a1e 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \file       htdocs/core/class/menubase.class.php
  *  \ingroup    core
- *  \version	$Id: menubase.class.php,v 1.27 2011/07/18 20:19:48 eldy Exp $
+ *  \version	$Id: menubase.class.php,v 1.28 2011/07/31 23:45:14 eldy Exp $
  *  \brief      File of class to manage dynamic menu entries
  *  \remarks	Initialy built by build_class_from_table on 2008-01-12 14:19
  */
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index b6f087a422b..6ff624b66ab 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/core/class/notify.class.php
  *      \ingroup    notification
  *      \brief      File of class to manage notifications
- *      \version    $Id$
+ *      \version    $Id: notify.class.php,v 1.13 2011/07/31 23:45:14 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT ."/lib/CMailFile.class.php");
 
diff --git a/htdocs/core/class/stats.class.php b/htdocs/core/class/stats.class.php
index c42adaf7c17..ef860fea100 100644
--- a/htdocs/core/class/stats.class.php
+++ b/htdocs/core/class/stats.class.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/core/class/stats.class.php
  *       \ingroup    core
  *       \brief      Common class to manage statistics reports
- *       \version    $Id$
+ *       \version    $Id: stats.class.php,v 1.6 2011/07/31 23:45:14 eldy Exp $
  */
 
 /**
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 7b279be1980..bf30794f153 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -24,7 +23,7 @@
  *		\brief      File for Tanslate class
  *		\author	    Eric Seigne
  *		\author	    Laurent Destailleur
- *		\version    $Id$
+ *		\version    $Id: translate.class.php,v 1.48 2011/07/31 23:45:14 eldy Exp $
  */
 
 
diff --git a/htdocs/core/index.php b/htdocs/core/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/core/index.php
+++ b/htdocs/core/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index fdafeafbca2..acce82ee3d7 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 //if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
@@ -201,5 +200,5 @@ print '</fieldset>';
 }
 
 
-llxFooter('$Date: 2011/07/02 01:26:30 $ - $Revision: 1.13 $');
+llxFooter('$Date: 2011/07/31 23:45:15 $ - $Revision: 1.14 $');
 ?>
\ No newline at end of file
diff --git a/htdocs/core/tools.php b/htdocs/core/tools.php
index 83a8904408a..0acf3e834a4 100755
--- a/htdocs/core/tools.php
+++ b/htdocs/core/tools.php
@@ -14,14 +14,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/core/tools.php
  *       \brief      Home page for top menu tools
- *       \version    $Id$
+ *       \version    $Id: tools.php,v 1.3 2011/07/31 23:45:15 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -55,5 +54,5 @@ print $langs->trans("ToolsDesc").'<br><br>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:45:15 $ - $Revision: 1.3 $');
 ?>
diff --git a/htdocs/core/tpl/ajaxfileupload.tpl.php b/htdocs/core/tpl/ajaxfileupload.tpl.php
index 42ece24a3b8..3c2b5af92e1 100644
--- a/htdocs/core/tpl/ajaxfileupload.tpl.php
+++ b/htdocs/core/tpl/ajaxfileupload.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id: ajaxfileupload.tpl.php,v 1.10 2011/07/10 13:39:34 eldy Exp $
+ * $Id: ajaxfileupload.tpl.php,v 1.11 2011/07/31 23:45:11 eldy Exp $
  */
 ?>
 
diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php
index 511538d20ff..5efe99013e7 100644
--- a/htdocs/core/tpl/ajaxrow.tpl.php
+++ b/htdocs/core/tpl/ajaxrow.tpl.php
@@ -13,10 +13,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: ajaxrow.tpl.php,v 1.15 2011/07/31 23:45:12 eldy Exp $
  */
 ?>
 
diff --git a/htdocs/core/tpl/error.tpl.php b/htdocs/core/tpl/error.tpl.php
index 4d16ac87d6f..f86080a0ec2 100644
--- a/htdocs/core/tpl/error.tpl.php
+++ b/htdocs/core/tpl/error.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: error.tpl.php,v 1.2 2011/07/31 23:45:12 eldy Exp $
  */
 ?>
  
diff --git a/htdocs/core/tpl/footer.tpl.php b/htdocs/core/tpl/footer.tpl.php
index 4d16ac87d6f..235e2d46599 100644
--- a/htdocs/core/tpl/footer.tpl.php
+++ b/htdocs/core/tpl/footer.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: footer.tpl.php,v 1.2 2011/07/31 23:45:12 eldy Exp $
  */
 ?>
  
diff --git a/htdocs/core/tpl/freeproductline_create.tpl.php b/htdocs/core/tpl/freeproductline_create.tpl.php
index 44635256716..2347cf47f92 100644
--- a/htdocs/core/tpl/freeproductline_create.tpl.php
+++ b/htdocs/core/tpl/freeproductline_create.tpl.php
@@ -13,10 +13,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id: freeproductline_create.tpl.php,v 1.14 2011/06/30 13:27:20 hregis Exp $
+ * $Id: freeproductline_create.tpl.php,v 1.15 2011/07/31 23:45:13 eldy Exp $
  *
  * Need to have following variables defined:
  * $conf
diff --git a/htdocs/core/tpl/freeproductline_edit.tpl.php b/htdocs/core/tpl/freeproductline_edit.tpl.php
index 01b53f44bc7..4eb6b873070 100644
--- a/htdocs/core/tpl/freeproductline_edit.tpl.php
+++ b/htdocs/core/tpl/freeproductline_edit.tpl.php
@@ -13,10 +13,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id: freeproductline_edit.tpl.php,v 1.14 2011/06/30 13:27:20 hregis Exp $
+ * $Id: freeproductline_edit.tpl.php,v 1.15 2011/07/31 23:45:11 eldy Exp $
  *
  * Need to have following variables defined:
  * $conf
diff --git a/htdocs/core/tpl/freeproductline_view.tpl.php b/htdocs/core/tpl/freeproductline_view.tpl.php
index 7beb197f139..a97210bdc1d 100644
--- a/htdocs/core/tpl/freeproductline_view.tpl.php
+++ b/htdocs/core/tpl/freeproductline_view.tpl.php
@@ -13,10 +13,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: freeproductline_view.tpl.php,v 1.13 2011/07/31 23:45:12 eldy Exp $
  */
 ?>
 
diff --git a/htdocs/core/tpl/header.tpl.php b/htdocs/core/tpl/header.tpl.php
index ba542d46424..ad56d01f715 100644
--- a/htdocs/core/tpl/header.tpl.php
+++ b/htdocs/core/tpl/header.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: header.tpl.php,v 1.2 2011/07/31 23:45:11 eldy Exp $
  */
 ?>
  
diff --git a/htdocs/core/tpl/index.php b/htdocs/core/tpl/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/core/tpl/index.php
+++ b/htdocs/core/tpl/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index eb7ae306a1b..1e9f5424224 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: login.tpl.php,v 1.19 2011/07/31 23:45:11 eldy Exp $
  */
 
 header('Cache-Control: Public, must-revalidate');
diff --git a/htdocs/core/tpl/originproductline.tpl.php b/htdocs/core/tpl/originproductline.tpl.php
index 38279389197..478d052aede 100644
--- a/htdocs/core/tpl/originproductline.tpl.php
+++ b/htdocs/core/tpl/originproductline.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: originproductline.tpl.php,v 1.5 2011/07/31 23:45:11 eldy Exp $
  */
 ?>
 
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index 9fc34c51571..29df4670907 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: passwordforgotten.tpl.php,v 1.4 2011/07/31 23:45:12 eldy Exp $
  */
 header('Cache-Control: Public, must-revalidate');
 header("Content-type: text/html; charset=".$conf->file->character_set_client);
diff --git a/htdocs/core/tpl/predefinedproductline_create.tpl.php b/htdocs/core/tpl/predefinedproductline_create.tpl.php
index 6c0de741b24..86244251479 100644
--- a/htdocs/core/tpl/predefinedproductline_create.tpl.php
+++ b/htdocs/core/tpl/predefinedproductline_create.tpl.php
@@ -13,10 +13,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id: predefinedproductline_create.tpl.php,v 1.13 2011/06/30 13:27:20 hregis Exp $
+ * $Id: predefinedproductline_create.tpl.php,v 1.14 2011/07/31 23:45:12 eldy Exp $
  *
  * Need to have following variables defined:
  * $conf
diff --git a/htdocs/core/tpl/predefinedproductline_edit.tpl.php b/htdocs/core/tpl/predefinedproductline_edit.tpl.php
index 7531b7d6cd8..16f9813339c 100644
--- a/htdocs/core/tpl/predefinedproductline_edit.tpl.php
+++ b/htdocs/core/tpl/predefinedproductline_edit.tpl.php
@@ -13,10 +13,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id: predefinedproductline_edit.tpl.php,v 1.13 2011/06/30 13:27:20 hregis Exp $
+ * $Id: predefinedproductline_edit.tpl.php,v 1.14 2011/07/31 23:45:11 eldy Exp $
  *
  * Need to have following variables defined:
  * $conf
diff --git a/htdocs/core/tpl/predefinedproductline_view.tpl.php b/htdocs/core/tpl/predefinedproductline_view.tpl.php
index 7f327864a0a..ac33bfcba54 100644
--- a/htdocs/core/tpl/predefinedproductline_view.tpl.php
+++ b/htdocs/core/tpl/predefinedproductline_view.tpl.php
@@ -13,10 +13,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: predefinedproductline_view.tpl.php,v 1.12 2011/07/31 23:45:12 eldy Exp $
  */
 ?>
 
diff --git a/htdocs/core/tpl/predefinedproductlinediv_view.tpl.php b/htdocs/core/tpl/predefinedproductlinediv_view.tpl.php
index 8a96f84e7ae..c5b53a1d72f 100644
--- a/htdocs/core/tpl/predefinedproductlinediv_view.tpl.php
+++ b/htdocs/core/tpl/predefinedproductlinediv_view.tpl.php
@@ -13,10 +13,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: predefinedproductlinediv_view.tpl.php,v 1.2 2011/07/31 23:45:11 eldy Exp $
  */
 ?>
 
diff --git a/htdocs/core/tpl/triggers.tpl.php b/htdocs/core/tpl/triggers.tpl.php
index 58d91487976..d2d3cbf45b8 100644
--- a/htdocs/core/tpl/triggers.tpl.php
+++ b/htdocs/core/tpl/triggers.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: triggers.tpl.php,v 1.2 2011/07/31 23:45:11 eldy Exp $
  */
 ?>
 
diff --git a/htdocs/cron/functions_cron.lib.php b/htdocs/cron/functions_cron.lib.php
index 924c29ceee7..451b029018e 100644
--- a/htdocs/cron/functions_cron.lib.php
+++ b/htdocs/cron/functions_cron.lib.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       	cron/functions_cron.lib.php
  *      \ingroup    	core
  *      \brief      	Functions for miscellaneous cron tasks
- *		\version		$Id$
+ *		\version		$Id: functions_cron.lib.php,v 1.7 2011/07/31 23:50:56 eldy Exp $
  */
 
 
diff --git a/htdocs/cron/index.php b/htdocs/cron/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/cron/index.php
+++ b/htdocs/cron/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/document.php b/htdocs/document.php
index 8f4b32486b2..394f5326ce3 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -17,15 +17,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
 /**
  *	\file       htdocs/document.php
  *  \brief      Wrapper to download data files
- *  \version    $Id: document.php,v 1.122 2011/07/09 00:15:16 eldy Exp $
+ *  \version    $Id: document.php,v 1.123 2011/07/31 23:19:04 eldy Exp $
  *  \remarks    Call of this wrapper is made with URL:
  * 				document.php?modulepart=repfichierconcerne&file=pathrelatifdufichier
  */
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index 4195d378c3d..8c50ef2a108 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \file       htdocs/ecm/class/ecmdirectory.class.php
  *  \ingroup    ecm
  *  \brief      This file is an example for a class file
- *  \version    $Id$
+ *  \version    $Id: ecmdirectory.class.php,v 1.13 2011/07/31 23:50:54 eldy Exp $
  *  \author		Laurent Destailleur
  *  \remarks	Initialy built by build_class_from_table on 2008-02-24 19:24
  */
diff --git a/htdocs/ecm/class/htmlecm.form.class.php b/htdocs/ecm/class/htmlecm.form.class.php
index 736d204e231..9f1fcd83a03 100644
--- a/htdocs/ecm/class/htmlecm.form.class.php
+++ b/htdocs/ecm/class/htmlecm.form.class.php
@@ -12,14 +12,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  * 	\file       	htdocs/ecm/class/htmlecm.form.class.php
  * 	\brief      	Fichier de la classe des fonctions predefinie de composants html
- * 	\version		$Id$
+ * 	\version		$Id: htmlecm.form.class.php,v 1.4 2011/07/31 23:50:55 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php");
 
diff --git a/htdocs/ecm/docdir.php b/htdocs/ecm/docdir.php
index de2511b4cac..97eabe7333c 100644
--- a/htdocs/ecm/docdir.php
+++ b/htdocs/ecm/docdir.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file      	htdocs/ecm/docdir.php
  *	\ingroup   	ecm
  *	\brief     	Main page for ECM section area
- *	\version   	$Id$
+ *	\version   	$Id: docdir.php,v 1.23 2011/07/31 23:50:55 eldy Exp $
  *	\author		Laurent Destailleur
  */
 
@@ -231,5 +230,5 @@ if (! $_GET["action"] || $_GET["action"] == 'delete_section')
 // End of page
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:50:55 $ - $Revision: 1.23 $');
 ?>
diff --git a/htdocs/ecm/docfile.php b/htdocs/ecm/docfile.php
index 7f80ebeb1f1..786090a9fba 100644
--- a/htdocs/ecm/docfile.php
+++ b/htdocs/ecm/docfile.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file      	htdocs/ecm/docfile.php
  *	\ingroup   	ecm
  *	\brief     	Card of a file for ECM module
- *	\version   	$Id$
+ *	\version   	$Id: docfile.php,v 1.19 2011/07/31 23:50:55 eldy Exp $
  *	\author		Laurent Destailleur
  */
 
@@ -285,5 +284,5 @@ if ($_GET["action"] != 'edit')
 // End of page
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:50:55 $ - $Revision: 1.19 $');
 ?>
diff --git a/htdocs/ecm/docmine.php b/htdocs/ecm/docmine.php
index 7160973422d..295c8d2ec0f 100644
--- a/htdocs/ecm/docmine.php
+++ b/htdocs/ecm/docmine.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 
@@ -21,7 +20,7 @@
  *  \file       htdocs/ecm/docmine.php
  *	\ingroup    ecm
  *	\brief     	Card of a directory for ECM module
- *	\version    $Id: docmine.php,v 1.46 2011/07/06 20:56:50 eldy Exp $
+ *	\version    $Id: docmine.php,v 1.47 2011/07/31 23:50:56 eldy Exp $
  *	\author		Laurent Destailleur
  */
 
@@ -379,5 +378,5 @@ if ($user->rights->ecm->read)
 // End of page
 $db->close();
 
-llxFooter('$Date: 2011/07/06 20:56:50 $ - $Revision: 1.46 $');
+llxFooter('$Date: 2011/07/31 23:50:56 $ - $Revision: 1.47 $');
 ?>
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 25a5c6a0d9f..13b1dad5fe0 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/ecm/index.php
  *	\ingroup    ecm
  *	\brief      Main page for ECM section area
- *	\version    $Id: index.php,v 1.102 2011/07/18 01:44:15 eldy Exp $
+ *	\version    $Id: index.php,v 1.103 2011/07/31 23:50:55 eldy Exp $
  *	\author		Laurent Destailleur
  */
 
@@ -889,5 +888,5 @@ else
 // End of page
 $db->close();
 
-llxFooter('$Date: 2011/07/18 01:44:15 $ - $Revision: 1.102 $');
+llxFooter('$Date: 2011/07/31 23:50:55 $ - $Revision: 1.103 $');
 ?>
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index 432b9ad7325..7f28533a77a 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/ecm/index.php
  *	\ingroup    ecm
  *	\brief      Main page for ECM section area
- *	\version    $Id: search.php,v 1.18 2011/07/06 20:56:50 eldy Exp $
+ *	\version    $Id: search.php,v 1.19 2011/07/31 23:50:55 eldy Exp $
  *	\author		Laurent Destailleur
  */
 
@@ -214,5 +213,5 @@ print '<br>';
 // End of page
 $db->close();
 
-llxFooter('$Date: 2011/07/06 20:56:50 $ - $Revision: 1.18 $');
+llxFooter('$Date: 2011/07/31 23:50:55 $ - $Revision: 1.19 $');
 ?>
diff --git a/htdocs/expedition/class/expeditionstats.class.php b/htdocs/expedition/class/expeditionstats.class.php
index d7bf1e9dd7a..07b8bdd79e5 100644
--- a/htdocs/expedition/class/expeditionstats.class.php
+++ b/htdocs/expedition/class/expeditionstats.class.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \file       htdocs/expedition/class/expeditionstats.class.php
  *  \ingroup    expedition
  *  \brief      Fichier des classes expedition
- *  \version    $Id: expeditionstats.class.php,v 1.4 2011/07/04 10:30:01 eldy Exp $
+ *  \version    $Id: expeditionstats.class.php,v 1.5 2011/07/31 23:50:54 eldy Exp $
  */
 
 /**
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index 7b2e688f114..c0510ca265b 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/expedition/index.php
  *       \ingroup    expedition
  *       \brief      Home page of shipping area.
- *       \version    $Id$
+ *       \version    $Id: index.php,v 1.52 2011/07/31 23:50:53 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -284,6 +283,6 @@ print '</td></tr></table>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:50:53 $ - $Revision: 1.52 $');
 
 ?>
diff --git a/htdocs/expedition/liste.php b/htdocs/expedition/liste.php
index b2d8752f534..370174cfdce 100644
--- a/htdocs/expedition/liste.php
+++ b/htdocs/expedition/liste.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/expedition/liste.php
  *      \ingroup    expedition
  *      \brief      Page to list all shipments
- *		\version	$Id$
+ *		\version	$Id: liste.php,v 1.60 2011/07/31 23:50:53 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -158,5 +157,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:50:53 $ - $Revision: 1.60 $');
 ?>
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index dffd2222e98..6cfa547028c 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 // Code identique a /expedition/fiche.php
@@ -23,7 +22,7 @@
 /**
  *	\file       htdocs/expedition/shipment.php
  *	\ingroup    expedition
- *	\version    $Id$
+ *	\version    $Id: shipment.php,v 1.30 2011/07/31 23:50:53 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -668,5 +667,5 @@ if ($id > 0 || ! empty($ref))
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:50:53 $ - $Revision: 1.30 $');
 ?>
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index 314ec314762..a0fe9614ccc 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *     \file       htdocs/expedition/stats/index.php
  *     \ingroup    expedition
  *     \brief      Page des stats expeditions
- *     \version    $Id$
+ *     \version    $Id: index.php,v 1.13 2011/07/31 23:50:55 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -68,5 +67,5 @@ print '<i>'.$langs->trans("StatsOnShipmentsOnlyValidated").'</i>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:50:55 $ - $Revision: 1.13 $');
 ?>
diff --git a/htdocs/expedition/stats/month.php b/htdocs/expedition/stats/month.php
index 703865b64d8..0b30aacf3cf 100644
--- a/htdocs/expedition/stats/month.php
+++ b/htdocs/expedition/stats/month.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *    \file       htdocs/expedition/stats/month.php
  *    \ingroup    commande
  *    \brief      Page des stats expeditions par mois
- *    \version    $Id$
+ *    \version    $Id: month.php,v 1.17 2011/07/31 23:50:55 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -71,5 +70,5 @@ print '</table>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:50:55 $ - $Revision: 1.17 $');
 ?>
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index f487f9c7ac3..60332674b40 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/exports/class/export.class.php
  *	\ingroup    export
  *	\brief      File of class to manage exports
- *	\version    $Id: export.class.php,v 1.11 2011/07/20 19:03:34 eldy Exp $
+ *	\version    $Id: export.class.php,v 1.12 2011/07/31 23:50:57 eldy Exp $
  */
 
 
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 257fd1d2732..3628336c655 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/exports/export.php
  *       \ingroup    export
  *       \brief      Pages of export Wizard
- *       \version    $Id$
+ *       \version    $Id: export.php,v 1.83 2011/07/31 23:50:55 eldy Exp $
  */
 
 require_once("../main.inc.php");
@@ -808,7 +807,7 @@ print '<br>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:50:55 $ - $Revision: 1.83 $');
 
 
 /**
diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php
index 7e56e9f1070..842369e96aa 100644
--- a/htdocs/exports/index.php
+++ b/htdocs/exports/index.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/exports/index.php
  *       \ingroup    export
  *       \brief      Home page of export tools
- *       \version    $Id$
+ *       \version    $Id: index.php,v 1.31 2011/07/31 23:50:55 eldy Exp $
  */
 
 require_once("../main.inc.php");
@@ -149,5 +148,5 @@ print '</table>';
 $db->close();
 
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:50:55 $ - $Revision: 1.31 $');
 ?>
diff --git a/htdocs/externalsite/admin/externalsite.php b/htdocs/externalsite/admin/externalsite.php
index 563584e1db6..5471f64cc1a 100644
--- a/htdocs/externalsite/admin/externalsite.php
+++ b/htdocs/externalsite/admin/externalsite.php
@@ -16,15 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *    \file       htdocs/externalsite/admin/externalsite.php
  *    \ingroup    externalsite
  *    \brief      Page de configuration du module externalsite
- *    \version    $Id$
+ *    \version    $Id: externalsite.php,v 1.4 2011/07/31 23:50:53 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -116,5 +115,5 @@ if ($mesg) print "<br>$mesg<br>";
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:50:53 $ - $Revision: 1.4 $');
 ?>
diff --git a/htdocs/externalsite/frames.php b/htdocs/externalsite/frames.php
index a826416cd52..9839079b478 100644
--- a/htdocs/externalsite/frames.php
+++ b/htdocs/externalsite/frames.php
@@ -12,17 +12,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: frames.php,v 1.10 2011/07/31 23:50:56 eldy Exp $
  */
 
 /**	    \file       htdocs/externalsite/frames.php
         \ingroup    externalsite
 		\brief      Page that build two frames: One for menu, the other for the target page to show
 		\author	    Laurent Destailleur
-		\version    $Revision$
+		\version    $Revision: 1.10 $
 */
 
 require("../main.inc.php");
@@ -33,7 +32,7 @@ if (empty($conf->global->EXTERNALSITE_URL))
 {
 	llxHeader();
 	print '<div class="error">Module ExternalSite was not configured properly.</div>';
-	llxFooter('$Date$ - $Revision$');
+	llxFooter('$Date: 2011/07/31 23:50:56 $ - $Revision: 1.10 $');
 }
 
 $mainmenu=GETPOST('mainmenu');
diff --git a/htdocs/externalsite/frametop.php b/htdocs/externalsite/frametop.php
index 9cd532fde75..bb1c1e371b3 100644
--- a/htdocs/externalsite/frametop.php
+++ b/htdocs/externalsite/frametop.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\file 		htdocs/externalsite/frametop.php
  *      \ingroup    externalsite
  *		\brief      Top frame to show external web application
- *		\version    $Id$
+ *		\version    $Id: frametop.php,v 1.5 2011/07/31 23:50:56 eldy Exp $
  */
 
 require ("../main.inc.php");
diff --git a/htdocs/externalsite/index.php b/htdocs/externalsite/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/externalsite/index.php
+++ b/htdocs/externalsite/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/fichinter/apercu.php b/htdocs/fichinter/apercu.php
index fbef251823d..3f2cd4d4f6c 100644
--- a/htdocs/fichinter/apercu.php
+++ b/htdocs/fichinter/apercu.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  * 		\file		htdocs/fichinter/apercu.php
  * 		\ingroup	fichinter
  * 		\brief		Page de l'onglet apercu d'une fiche d'intervention
- * 		\version	$Id$
+ * 		\version	$Id: apercu.php,v 1.25 2011/07/31 23:50:54 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -187,5 +186,5 @@ print '</div>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:50:54 $ - $Revision: 1.25 $');
 ?>
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 38d6edf913f..a3e521605f6 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -15,14 +15,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**	    \file       htdocs/fichinter/class/fichinter.class.php
  *		\ingroup    ficheinter
  *		\brief      Fichier de la classe des gestion des fiches interventions
- *		\version    $Id: fichinter.class.php,v 1.21 2011/07/10 13:48:25 eldy Exp $
+ *		\version    $Id: fichinter.class.php,v 1.22 2011/07/31 23:50:56 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php
index 0ea01a46ee6..70ef5471413 100644
--- a/htdocs/fichinter/contact.php
+++ b/htdocs/fichinter/contact.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/fichinter/contact.php
  *       \ingroup    fichinter
  *       \brief      Onglet de gestion des contacts de fiche d'intervention
- *       \version    $Id$
+ *       \version    $Id: contact.php,v 1.30 2011/07/31 23:50:54 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -385,5 +384,5 @@ if ($id > 0)
 
 $db->close();
 
-llxFooter('$Date$');
+llxFooter('$Date: 2011/07/31 23:50:54 $');
 ?>
\ No newline at end of file
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index 3c5aaa99a6b..be86df09251 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -17,15 +17,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/fichinter/document.php
  *       \ingroup    fichinter
  *       \brief      Page des documents joints sur les contrats
- *       \version    $Id: document.php,v 1.21 2011/07/06 20:56:50 eldy Exp $
+ *       \version    $Id: document.php,v 1.22 2011/07/31 23:50:54 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -174,5 +173,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/06 20:56:50 $ - $Revision: 1.21 $');
+llxFooter('$Date: 2011/07/31 23:50:54 $ - $Revision: 1.22 $');
 ?>
diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php
index 1035801aa60..53045359d42 100644
--- a/htdocs/fichinter/fiche.php
+++ b/htdocs/fichinter/fiche.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/fichinter/fiche.php
  *	\brief      Fichier fiche intervention
  *	\ingroup    ficheinter
- *	\version    $Id: fiche.php,v 1.172 2011/07/18 03:04:48 eldy Exp $
+ *	\version    $Id: fiche.php,v 1.173 2011/07/31 23:50:53 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -1219,5 +1218,5 @@ elseif ($fichinterid)
 
 $db->close();
 
-llxFooter('$Date: 2011/07/18 03:04:48 $ - $Revision: 1.172 $');
+llxFooter('$Date: 2011/07/31 23:50:53 $ - $Revision: 1.173 $');
 ?>
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index 9afa9447bb9..b42bb00a22b 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/fichinter/index.php
  *	\brief      List of all interventions
  *	\ingroup    ficheinter
- *	\version    $Id: index.php,v 1.65 2011/07/02 16:48:32 eldy Exp $
+ *	\version    $Id: index.php,v 1.66 2011/07/31 23:50:54 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -173,5 +172,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/02 16:48:32 $ - $Revision: 1.65 $');
+llxFooter('$Date: 2011/07/31 23:50:54 $ - $Revision: 1.66 $');
 ?>
diff --git a/htdocs/fichinter/info.php b/htdocs/fichinter/info.php
index 3e63f0c0afc..a831c22c95e 100644
--- a/htdocs/fichinter/info.php
+++ b/htdocs/fichinter/info.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/fichinter/info.php
  *	\ingroup    fichinter
  *	\brief      Page d'affichage des infos d'une fiche d'intervention
- *	\version    $Id: info.php,v 1.14 2011/07/02 17:33:24 eldy Exp $
+ *	\version    $Id: info.php,v 1.15 2011/07/31 23:50:54 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -65,5 +64,5 @@ print '</div>';
 
 $db->close();
 
-llxFooter('$Date: 2011/07/02 17:33:24 $ - $Revision: 1.14 $');
+llxFooter('$Date: 2011/07/31 23:50:54 $ - $Revision: 1.15 $');
 ?>
diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php
index c30d20359d9..7304ba6b111 100644
--- a/htdocs/fichinter/note.php
+++ b/htdocs/fichinter/note.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/fichinter/note.php
  *	\ingroup    fichinter
  *	\brief      Fiche d'information sur une fiche d'intervention
- *	\version    $Id: note.php,v 1.18 2011/07/02 17:33:24 eldy Exp $
+ *	\version    $Id: note.php,v 1.19 2011/07/31 23:50:54 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -168,5 +167,5 @@ if ($fichinterid)
 	}
 }
 $db->close();
-llxFooter('$Date: 2011/07/02 17:33:24 $ - $Revision: 1.15 ');
+llxFooter('$Date: 2011/07/31 23:50:54 $ - $Revision: 1.15 ');
 ?>
diff --git a/htdocs/fichinter/rapport.php b/htdocs/fichinter/rapport.php
index 88c3666c40b..d0d4273da6d 100644
--- a/htdocs/fichinter/rapport.php
+++ b/htdocs/fichinter/rapport.php
@@ -14,10 +14,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id: rapport.php,v 1.25 2011/07/02 17:33:24 eldy Exp $
+ * $Id: rapport.php,v 1.26 2011/07/31 23:50:54 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -144,5 +143,5 @@ else
 }
 $db->close();
 
-llxFooter("$Date: 2011/07/02 17:33:24 $ - $Revision: 1.25 $");
+llxFooter("$Date: 2011/07/31 23:50:54 $ - $Revision: 1.26 $");
 ?>
diff --git a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
index 193e9eaf838..71c2a006abb 100755
--- a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id: linkedobjectblock.tpl.php,v 1.1 2011/07/01 16:24:44 simnandez Exp $
+ * $Id: linkedobjectblock.tpl.php,v 1.2 2011/07/31 23:50:56 eldy Exp $
  */
 ?>
 
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 4e96c341f34..13a97bf54b3 100755
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -28,7 +28,7 @@
  *	\file       htdocs/filefunc.inc.php
  * 	\ingroup	core
  *  \brief      File that include conf.php file and functions.lib.php
- *  \version    $Id: filefunc.inc.php,v 1.18 2011/07/13 21:19:58 eldy Exp $
+ *  \version    $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $
  */
 
 define('DOL_VERSION','3.1.0-beta');	// Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
@@ -61,8 +61,17 @@ error_reporting(E_ALL ^ E_NOTICE);
 //error_reporting(E_ALL);
 
 
+$conffiletoshowshort = "conf.php";
+# Define localization of conf file
+$conffile = "conf/conf.php";
+$conffiletoshow = "htdocs/conf/conf.php";
+# For debian like systems
+#$conffile = "/etc/dolibarr/conf.php";
+#$conffiletoshow = "/etc/dolibarr/conf.php";
+
+
 // Include configuration
-$result=@include_once("conf/conf.php");
+$result=@include_once($conffile);
 if (! $result && ! empty($_SERVER["GATEWAY_INTERFACE"]))    // If install not done and we are in a web session
 {
 	header("Location: install/index.php");
@@ -92,8 +101,8 @@ if (! defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && ! empty($_SERVER
 }
 if (empty($dolibarr_main_db_host))
 {
-	print 'Dolibarr setup was run but was not completed.<br>'."\n";
-	print 'Please, click <a href="install/index.php">here to finish Dolibarr install process</a> ...'."\n";
+	print 'Dolibarr setup is not yet complete.<br><br>'."\n";
+	print '<a href="install/index.php">Click here to finish Dolibarr install process</a> ...'."\n";
 	die;
 }
 if (empty($dolibarr_main_url_root))
diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php
index 0a6d25e6674..94330683cba 100644
--- a/htdocs/fourn/class/fournisseur.class.php
+++ b/htdocs/fourn/class/fournisseur.class.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/fourn/class/fournisseur.class.php
  *	\ingroup    fournisseur,societe
  *	\brief      File of class to manage suppliers
- *	\version    $Id$
+ *	\version    $Id: fournisseur.class.php,v 1.8 2011/07/31 23:57:02 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php");
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 5b8405499d7..32688756d8e 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -17,15 +17,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/fourn/class/fournisseur.commande.class.php
  *	\ingroup    fournisseur,commande
  *	\brief      File of class to manage suppliers orders
- *	\version    $Id: fournisseur.commande.class.php,v 1.47 2011/07/04 09:36:29 eldy Exp $
+ *	\version    $Id: fournisseur.commande.class.php,v 1.48 2011/07/31 23:57:02 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 34e8e9d4e26..fe4ead64927 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -17,15 +17,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/fourn/class/fournisseur.facture.class.php
  *	\ingroup    fournisseur,facture
  *	\brief      File of class to manage suppliers invoices
- *	\version    $Id$
+ *	\version    $Id: fournisseur.facture.class.php,v 1.35 2011/07/31 23:57:02 eldy Exp $
  */
 
 include_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 58794a7c3f5..ee4cbef9ede 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  * 	\file       htdocs/fourn/class/fournisseur.product.class.php
  * 	\ingroup    produit
  * 	\brief      File of class to manage predefined suppliers products
- * 	\version    $Id$
+ * 	\version    $Id: fournisseur.product.class.php,v 1.7 2011/07/31 23:57:02 eldy Exp $
  */
 
 require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index 9070c567018..1a5129f2977 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\file       htdocs/fourn/class/paiementfourn.class.php
  *		\ingroup    fournisseur, facture
  *		\brief      File of class to manage payments of suppliers invoices
- *		\version    $Id$
+ *		\version    $Id: paiementfourn.class.php,v 1.7 2011/07/31 23:57:02 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php');
 require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php');
diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index 5caad39fd0b..8acd2588831 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/fourn/commande/contact.php
  *       \ingroup    commande
  *       \brief      Onglet de gestion des contacts de commande
- *       \version    $Id$
+ *       \version    $Id: contact.php,v 1.20 2011/07/31 23:57:02 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -393,5 +392,5 @@ if ($id > 0 || ! empty($ref))
 
 $db->close();
 
-llxFooter('$Date$');
+llxFooter('$Date: 2011/07/31 23:57:02 $');
 ?>
\ No newline at end of file
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index e17f9f3684d..45bb379a21a 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/fourn/commande/document.php
  *	\ingroup    supplier
  *	\brief      Page de gestion des documents attachees a une commande fournisseur
- *	\version    $Id: document.php,v 1.23 2011/07/06 20:56:50 eldy Exp $
+ *	\version    $Id: document.php,v 1.24 2011/07/31 23:57:02 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -217,5 +216,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/06 20:56:50 $ - $Revision: 1.23 $');
+llxFooter('$Date: 2011/07/31 23:57:02 $ - $Revision: 1.24 $');
 ?>
diff --git a/htdocs/fourn/commande/history.php b/htdocs/fourn/commande/history.php
index 066332e726b..705b5ae1d64 100644
--- a/htdocs/fourn/commande/history.php
+++ b/htdocs/fourn/commande/history.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/fourn/commande/history.php
  *       \ingroup    commande
  *       \brief      Fiche commande
- *       \version    $Id$
+ *       \version    $Id: history.php,v 1.36 2011/07/31 23:57:02 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -188,5 +187,5 @@ if ($id > 0 || ! empty($ref))
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:57:02 $ - $Revision: 1.36 $');
 ?>
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index ad02cd337c0..62c5acf67be 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	 \file       htdocs/fourn/commande/index.php
  *	 \ingroup    commande
  *	 \brief      Page accueil commandes fournisseurs
- *   \version    $Revision$
+ *   \version    $Revision: 1.43 $
  */
 
 require("../../main.inc.php");
@@ -388,5 +387,5 @@ print '</td></tr></table>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:57:02 $ - $Revision: 1.43 $');
 ?>
diff --git a/htdocs/fourn/commande/liste.php b/htdocs/fourn/commande/liste.php
index 3d4b4bacf9f..f85c82ad13a 100644
--- a/htdocs/fourn/commande/liste.php
+++ b/htdocs/fourn/commande/liste.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *   \file       htdocs/fourn/commande/liste.php
  *   \ingroup    fournisseur
  *   \brief      List of suppliers orders
- *   \version    $Id$
+ *   \version    $Id: liste.php,v 1.42 2011/07/31 23:57:02 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -204,5 +203,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:57:02 $ - $Revision: 1.42 $');
 ?>
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index 7f264d4f09b..92904fcc408 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/fourn/commande/note.php
  *       \ingroup    commande
  *       \brief      Fiche note commande
- *       \version    $Id$
+ *       \version    $Id: note.php,v 1.38 2011/07/31 23:57:01 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -180,5 +179,5 @@ if ($id > 0 || ! empty($ref))
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:57:01 $ - $Revision: 1.38 $');
 ?>
diff --git a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
index 88ba9c25132..15e1bd935fd 100755
--- a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: linkedobjectblock.tpl.php,v 1.4 2011/07/31 23:57:01 eldy Exp $
  */
 ?>
 
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index 12c2e68941a..85bb31baed9 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/fourn/contact.php
  *      \ingroup    fournisseur
  *		\brief      Liste des contacts fournisseurs
- *		\version    $Id$
+ *		\version    $Id: contact.php,v 1.34 2011/07/31 23:57:03 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -131,5 +130,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:57:03 $ - $Revision: 1.34 $');
 ?>
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index 9fcd533b320..5db344bba6d 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/fourn/facture/contact.php
  *      \ingroup    facture, fournisseur
  *      \brief      Onglet de gestion des contacts des factures
- *      \version    $Id$
+ *      \version    $Id: contact.php,v 1.27 2011/07/31 23:57:01 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -385,5 +384,5 @@ if ($id > 0)
 
 $db->close();
 
-llxFooter('$Date$');
+llxFooter('$Date: 2011/07/31 23:57:01 $');
 ?>
\ No newline at end of file
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index b74544c401f..176557550bd 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/fourn/facture/document.php
  *       \ingroup    facture, fournisseur
  *       \brief      Page de gestion des documents attachees a une facture fournisseur
- *       \version    $Id: document.php,v 1.45 2011/07/06 20:56:48 eldy Exp $
+ *       \version    $Id: document.php,v 1.46 2011/07/31 23:57:01 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -196,5 +195,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/06 20:56:48 $ - $Revision: 1.45 $');
+llxFooter('$Date: 2011/07/31 23:57:01 $ - $Revision: 1.46 $');
 ?>
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index e2821a326ab..2997c99350a 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -17,15 +17,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/fourn/facture/fiche.php
  *	\ingroup    facture, fournisseur
  *	\brief      Page for supplier invoice card (view, edit, validate)
- *	\version    $Id: fiche.php,v 1.261 2011/07/10 20:03:39 eldy Exp $
+ *	\version    $Id: fiche.php,v 1.262 2011/07/31 23:57:00 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -1916,5 +1915,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/10 20:03:39 $ - $Revision: 1.261 $');
+llxFooter('$Date: 2011/07/31 23:57:00 $ - $Revision: 1.262 $');
 ?>
diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php
index b0a4d8fdba1..422f1b6bddc 100644
--- a/htdocs/fourn/facture/impayees.php
+++ b/htdocs/fourn/facture/impayees.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\file       htdocs/fourn/facture/impayees.php
  *		\ingroup    facture
  *		\brief      Page to list all unpaid invoices
- *		\version    $Id$
+ *		\version    $Id: impayees.php,v 1.25 2011/07/31 23:57:01 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -265,5 +264,5 @@ if ($user->rights->fournisseur->facture->lire)
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:57:01 $ - $Revision: 1.25 $');
 ?>
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index 5d753e8e01d..67053cd27dd 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/fourn/facture/index.php
  *       \ingroup    fournisseur,facture
  *       \brief      List of suppliers invoices
- *       \version    $Id: index.php,v 1.84 2011/07/13 13:10:51 eldy Exp $
+ *       \version    $Id: index.php,v 1.85 2011/07/31 23:57:01 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -293,5 +292,5 @@ else
 $db->close();
 
 
-llxFooter('$Date: 2011/07/13 13:10:51 $ - $Revision: 1.84 $');
+llxFooter('$Date: 2011/07/31 23:57:01 $ - $Revision: 1.85 $');
 ?>
diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php
index c8a39b7de9a..ec06455a435 100644
--- a/htdocs/fourn/facture/info.php
+++ b/htdocs/fourn/facture/info.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/fourn/facture/info.php
  *      \ingroup    facture, fournisseur
  *		\brief      Page des informations d'une facture fournisseur
- *		\version    $Id$
+ *		\version    $Id: info.php,v 1.14 2011/07/31 23:57:00 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -65,5 +64,5 @@ print '</div>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:57:00 $ - $Revision: 1.14 $');
 ?>
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index 172a6ebf01b..56762614293 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/fourn/facture/note.php
  *      \ingroup    facture
  *      \brief      Fiche de notes sur une facture fournisseur
- *		\version    $Id$
+ *		\version    $Id: note.php,v 1.22 2011/07/31 23:57:01 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -174,5 +173,5 @@ if ($_GET["facid"])
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:57:01 $ - $Revision: 1.22 $');
 ?>
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 4d702718b8d..e5bd43ac84a 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -16,15 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/fourn/facture/paiement.php
  *	\ingroup    fournisseur,facture
  *	\brief      Payment page for suppliers invoices
- *	\version    $Id$
+ *	\version    $Id: paiement.php,v 1.94 2011/07/31 23:57:01 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -488,5 +487,5 @@ if (! $_GET['action'] && ! $_POST['action'])
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:57:01 $ - $Revision: 1.94 $');
 ?>
diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
index afa4d150875..7be74b211e0 100755
--- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: linkedobjectblock.tpl.php,v 1.4 2011/07/31 23:57:02 eldy Exp $
  */
 ?>
 
diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php
index a8aa38a722e..3aff3a25300 100644
--- a/htdocs/fourn/fiche.php
+++ b/htdocs/fourn/fiche.php
@@ -16,15 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/fourn/fiche.php
  *	\ingroup    fournisseur, facture
  *	\brief      Page for supplier third party card (view, edit)
- *	\version	$Id$
+ *	\version	$Id: fiche.php,v 1.140 2011/07/31 23:57:03 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -421,5 +420,5 @@ else
 }
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:57:03 $ - $Revision: 1.140 $');
 ?>
diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php
index 648dd52723f..9ca804594aa 100644
--- a/htdocs/fourn/index.php
+++ b/htdocs/fourn/index.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/fourn/index.php
  *	\ingroup    fournisseur
  *	\brief      Page accueil de la zone fournisseurs
- *	\version    $Id$
+ *	\version    $Id: index.php,v 1.68 2011/07/31 23:57:03 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -321,5 +320,5 @@ print "</table>\n";
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:57:03 $ - $Revision: 1.68 $');
 ?>
diff --git a/htdocs/fourn/liste.php b/htdocs/fourn/liste.php
index b8e61738d23..ed3d6fee215 100644
--- a/htdocs/fourn/liste.php
+++ b/htdocs/fourn/liste.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/fourn/liste.php
  *       \ingroup    fournisseur
  *       \brief      Home page of supplier area
- *       \version    $Id$
+ *       \version    $Id: liste.php,v 1.30 2011/07/31 23:57:03 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -201,5 +200,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:57:03 $ - $Revision: 1.30 $');
 ?>
\ No newline at end of file
diff --git a/htdocs/fourn/paiement/fiche.php b/htdocs/fourn/paiement/fiche.php
index 9742d610a9c..375f5b73bf1 100644
--- a/htdocs/fourn/paiement/fiche.php
+++ b/htdocs/fourn/paiement/fiche.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -23,7 +22,7 @@
  *	\ingroup    facture, fournisseur
  *	\brief      Tab to show a payment of a supplier invoice
  *	\remarks	Fichier presque identique a compta/paiement/fiche.php
- *	\version    $Id$
+ *	\version    $Id: fiche.php,v 1.34 2011/07/31 23:57:03 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -360,5 +359,5 @@ dol_fiche_end();
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:57:03 $ - $Revision: 1.34 $');
 ?>
diff --git a/htdocs/fourn/paiement/index.php b/htdocs/fourn/paiement/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/fourn/paiement/index.php
+++ b/htdocs/fourn/paiement/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/fourn/paiement/info.php b/htdocs/fourn/paiement/info.php
index d93d7d05c6d..10a6871c5e4 100644
--- a/htdocs/fourn/paiement/info.php
+++ b/htdocs/fourn/paiement/info.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *   	\file       htdocs/fourn/paiement/info.php
  *		\ingroup    facture
  *		\brief      Onglet info d'un paiement fournisseur
- *		\version    $Id$
+ *		\version    $Id: info.php,v 1.11 2011/07/31 23:57:03 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -64,5 +63,5 @@ print '</div>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:57:03 $ - $Revision: 1.11 $');
 ?>
diff --git a/htdocs/fourn/product/categorie.php b/htdocs/fourn/product/categorie.php
index 0bc20a79acc..2766e2ed3d2 100644
--- a/htdocs/fourn/product/categorie.php
+++ b/htdocs/fourn/product/categorie.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/fourn/product/categorie.php
  *	\ingroup    product
  *	\brief      Page of products categories
- *	\version    $Id$
+ *	\version    $Id: categorie.php,v 1.18 2011/07/31 23:57:03 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -173,6 +172,6 @@ if ($_GET["id"])
 $db->close();
 
 
-llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
+llxFooter("<em>Derni&egrave;re modification $Date: 2011/07/31 23:57:03 $ r&eacute;vision $Revision: 1.18 $</em>");
 ?>
 
diff --git a/htdocs/fourn/product/fourn.php b/htdocs/fourn/product/fourn.php
index 1c188834d83..e35c41d7650 100644
--- a/htdocs/fourn/product/fourn.php
+++ b/htdocs/fourn/product/fourn.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/fourn/product/fourn.php
  *	\ingroup    product
  *	\brief      Page de la fiche produit fournisseur
- *	\version    $Id$
+ *	\version    $Id: fourn.php,v 1.24 2011/07/31 23:57:03 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -216,6 +215,6 @@ else
 }
 $db->close();
 
-llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
+llxFooter("<em>Derni&egrave;re modification $Date: 2011/07/31 23:57:03 $ r&eacute;vision $Revision: 1.24 $</em>");
 ?>
 
diff --git a/htdocs/fourn/product/index.php b/htdocs/fourn/product/index.php
index a66155d4051..800c43dd1d6 100644
--- a/htdocs/fourn/product/index.php
+++ b/htdocs/fourn/product/index.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
   \file       htdocs/product/index.php
   \ingroup    product
   \brief      Page accueil des produits et services
-  \version    $Id$
+  \version    $Id: index.php,v 1.15 2011/07/31 23:57:03 eldy Exp $
 */
 
 require("../../main.inc.php");
@@ -148,5 +147,5 @@ print '</td></tr></table>';
 
 $db->close();
 
-llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
+llxFooter("<em>Derni&egrave;re modification $Date: 2011/07/31 23:57:03 $ r&eacute;vision $Revision: 1.15 $</em>");
 ?>
diff --git a/htdocs/fourn/product/liste.php b/htdocs/fourn/product/liste.php
index a77cdcdea03..449cb08da28 100644
--- a/htdocs/fourn/product/liste.php
+++ b/htdocs/fourn/product/liste.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\file       htdocs/fourn/product/liste.php
  *		\ingroup    produit
  *		\brief      Page liste des produits ou services
- *		\version    $Id$
+ *		\version    $Id: liste.php,v 1.42 2011/07/31 23:57:03 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -260,5 +259,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:57:03 $ - $Revision: 1.42 $');
 ?>
diff --git a/htdocs/fourn/product/photos.php b/htdocs/fourn/product/photos.php
index 0fa452a3087..db9202cfbd0 100644
--- a/htdocs/fourn/product/photos.php
+++ b/htdocs/fourn/product/photos.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  \file       htdocs/fourn/product/photos.php
  \ingroup    product
  \brief      Page de la fiche produit
- \version    $Id$
+ \version    $Id: photos.php,v 1.28 2011/07/31 23:57:03 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -215,5 +214,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:57:03 $ - $Revision: 1.28 $');
 ?>
diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php
index a18803829f6..89d12d91a44 100644
--- a/htdocs/fourn/recap-fourn.php
+++ b/htdocs/fourn/recap-fourn.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  	\file       htdocs/fourn/recap-fourn.php
  *		\ingroup    fournisseur
  *		\brief      Page de fiche recap fournisseur
- *		\version    $Id$
+ *		\version    $Id: recap-fourn.php,v 1.15 2011/07/31 23:57:03 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -218,5 +217,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:57:03 $ - $Revision: 1.15 $');
 ?>
diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php
index 4825fc52e5d..4fa6c04ce54 100644
--- a/htdocs/ftp/admin/ftpclient.php
+++ b/htdocs/ftp/admin/ftpclient.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/ftp/admin/ftpclient.php
  *       \ingroup    ftp
  *       \brief      Admin page to setup FTP client module
- *       \version    $Id$
+ *       \version    $Id: ftpclient.php,v 1.5 2011/08/01 00:01:01 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -287,5 +286,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/08/01 00:01:01 $ - $Revision: 1.5 $');
 ?>
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index 31570262d5c..5d90a5f750b 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/ftp/index.php
  *	\ingroup    ftp
  *	\brief      Main page for FTP section area
- *	\version    $Id: index.php,v 1.23 2011/07/18 00:49:19 eldy Exp $
+ *	\version    $Id: index.php,v 1.24 2011/08/01 00:01:02 eldy Exp $
  *	\author		Laurent Destailleur
  */
 
@@ -625,7 +624,7 @@ if ($conn_id) ftp_close($conn_id);
 // End of page
 $db->close();
 
-llxFooter('$Date: 2011/07/18 00:49:19 $ - $Revision: 1.23 $');
+llxFooter('$Date: 2011/08/01 00:01:02 $ - $Revision: 1.24 $');
 
 
 /**
diff --git a/htdocs/ftp/pre.inc.php b/htdocs/ftp/pre.inc.php
index 1ac92b9e715..cbee9770180 100644
--- a/htdocs/ftp/pre.inc.php
+++ b/htdocs/ftp/pre.inc.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\file 		htdocs/ftp/pre.inc.php
  *		\ingroup    ftp
  *		\brief      File to manage left menu for FTP module
- *		\version    $Id$
+ *		\version    $Id: pre.inc.php,v 1.9 2011/08/01 00:01:02 eldy Exp $
  */
 
 require ("../main.inc.php");
diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php
index f7bcf3f8099..0fd0590351b 100644
--- a/htdocs/imports/class/import.class.php
+++ b/htdocs/imports/class/import.class.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/imports/class/import.class.php
  *	\ingroup    import
  *	\brief      File of class to manage imports
- *	\version    $Id$
+ *	\version    $Id: import.class.php,v 1.8 2011/07/31 23:46:39 eldy Exp $
  */
 
 /**
diff --git a/htdocs/imports/emptyexample.php b/htdocs/imports/emptyexample.php
index a24f6c6a65e..7a859172a9c 100644
--- a/htdocs/imports/emptyexample.php
+++ b/htdocs/imports/emptyexample.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/imports/emptyexample.php
  *      \ingroup    import
  *      \brief      Show example of import file
- *      \version    $Id$
+ *      \version    $Id: emptyexample.php,v 1.8 2011/07/31 23:46:39 eldy Exp $
  */
 
 // This is to make Dolibarr working with Plesk
@@ -47,7 +46,7 @@ if (empty($datatoimport))
 
 	llxHeader();
 	print '<div class="error">Bad value for datatoimport.</div>';
-	llxFooter('$Date$ - $Revision$');
+	llxFooter('$Date: 2011/07/31 23:46:39 $ - $Revision: 1.8 $');
 	exit;
 }
 
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 526527702a5..c03b55d2347 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2005-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,7 +21,7 @@
  *      \file       htdocs/imports/import.php
  *      \ingroup    import
  *      \brief      Pages of import Wizard
- *      \version    $Id: import.php,v 1.67 2011/07/04 11:33:23 eldy Exp $
+ *      \version    $Id: import.php,v 1.68 2011/07/29 22:31:37 eldy Exp $
  */
 
 require_once("../main.inc.php");
@@ -424,13 +424,13 @@ if ($step == 2 && $datatoimport)
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="max_file_size" value="'.$conf->maxfilesize.'">';
 
+	print $langs->trans("ChooseFormatOfFileToImport",img_picto('','filenew')).'<br>';
 	print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
 
 	$filetoimport='';
 	$var=true;
 
 	// Add format informations and link to download example
-	print '<tr><td colspan="4">'.$langs->trans("ChooseFormatOfFileToImport",img_picto('','filenew')).'</td></tr>';
 	print '<tr class="liste_titre"><td colspan="6">';
 	print $langs->trans("FileMustHaveOneOfFollowingFormat");
 	print '</td></tr>';
@@ -1669,7 +1669,7 @@ print '<br>';
 
 $db->close();
 
-llxFooter('$Date: 2011/07/04 11:33:23 $ - $Revision: 1.67 $');
+llxFooter('$Date: 2011/07/29 22:31:37 $ - $Revision: 1.68 $');
 
 
 /*
diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php
index 7913bebaf64..e1f310eea0a 100644
--- a/htdocs/imports/index.php
+++ b/htdocs/imports/index.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/imports/index.php
  *       \ingroup    import
  *       \brief      Page accueil de la zone import
- *       \version    $Id$
+ *       \version    $Id: index.php,v 1.13 2011/07/31 23:46:39 eldy Exp $
  */
 
 require_once("../main.inc.php");
@@ -139,6 +138,6 @@ print '</table>';
 $db->close();
 
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:46:39 $ - $Revision: 1.13 $');
 
 ?>
diff --git a/htdocs/includes/adodbtime/index.php b/htdocs/includes/adodbtime/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/includes/adodbtime/index.php
+++ b/htdocs/includes/adodbtime/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/includes/barcode/html.formbarcode.class.php b/htdocs/includes/barcode/html.formbarcode.class.php
index 253664281d9..2424ec2a803 100644
--- a/htdocs/includes/barcode/html.formbarcode.class.php
+++ b/htdocs/includes/barcode/html.formbarcode.class.php
@@ -13,16 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: html.formbarcode.class.php,v 1.16 2011/07/31 23:29:11 eldy Exp $
  */
 
 /**
         \file       htdocs/includes/barcode/html.formbarcode.class.php
         \brief      Fichier de la classe des fonctions predefinie de composants html
-        \version    $Revision$
+        \version    $Revision: 1.16 $
 */
 
 
diff --git a/htdocs/includes/boxes/box_actions.php b/htdocs/includes/boxes/box_actions.php
index c09d95ecf16..68bf4bc1f6d 100644
--- a/htdocs/includes/boxes/box_actions.php
+++ b/htdocs/includes/boxes/box_actions.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/includes/boxes/box_actions.php
  *	\ingroup    actions
  *	\brief      Module to build boxe for events
- *	\version	$Id: box_actions.php,v 1.48 2011/07/03 12:55:33 eldy Exp $
+ *	\version	$Id: box_actions.php,v 1.49 2011/07/31 23:29:09 eldy Exp $
  */
 
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
diff --git a/htdocs/includes/boxes/box_bookmarks.php b/htdocs/includes/boxes/box_bookmarks.php
index 17e823e6dd1..241398d8ad1 100644
--- a/htdocs/includes/boxes/box_bookmarks.php
+++ b/htdocs/includes/boxes/box_bookmarks.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/includes/boxes/box_bookmarks.php
  *      \ingroup    bookmark
  *      \brief      Module to generate box of bookmarks list
- *		\version	$Id$
+ *		\version	$Id: box_bookmarks.php,v 1.18 2011/07/31 23:29:10 eldy Exp $
  */
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
 
diff --git a/htdocs/includes/boxes/box_clients.php b/htdocs/includes/boxes/box_clients.php
index 21da64ebff1..6ea6b3fa93a 100644
--- a/htdocs/includes/boxes/box_clients.php
+++ b/htdocs/includes/boxes/box_clients.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/includes/boxes/box_clients.php
  *	\ingroup    societes
  *	\brief      Module de generation de l'affichage de la box clients
- *	\version	$Id$
+ *	\version	$Id: box_clients.php,v 1.40 2011/07/31 23:29:09 eldy Exp $
  */
 
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
diff --git a/htdocs/includes/boxes/box_commandes.php b/htdocs/includes/boxes/box_commandes.php
index 895bf51c96c..d6dd903d62b 100644
--- a/htdocs/includes/boxes/box_commandes.php
+++ b/htdocs/includes/boxes/box_commandes.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\file       htdocs/includes/boxes/box_commandes.php
  *		\ingroup    commande
  *		\brief      Module de generation de l'affichage de la box commandes
- *		\version	$Id$
+ *		\version	$Id: box_commandes.php,v 1.33 2011/07/31 23:29:10 eldy Exp $
  */
 
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
diff --git a/htdocs/includes/boxes/box_comptes.php b/htdocs/includes/boxes/box_comptes.php
index 8f4638748e8..b0f12333f7c 100644
--- a/htdocs/includes/boxes/box_comptes.php
+++ b/htdocs/includes/boxes/box_comptes.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/includes/boxes/box_comptes.php
  *      \ingroup    banque
  *      \brief      Module to generate box for bank accounts
- *		\version	$Id$
+ *		\version	$Id: box_comptes.php,v 1.21 2011/07/31 23:29:09 eldy Exp $
  */
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
 include_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php");
diff --git a/htdocs/includes/boxes/box_contacts.php b/htdocs/includes/boxes/box_contacts.php
index bc2a072ee1d..1a053bc8b04 100755
--- a/htdocs/includes/boxes/box_contacts.php
+++ b/htdocs/includes/boxes/box_contacts.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/includes/boxes/box_contacts.php
  *	\ingroup    societes
  *	\brief      Module to show box of contacts
- *	\version	$Id$
+ *	\version	$Id: box_contacts.php,v 1.3 2011/07/31 23:29:10 eldy Exp $
  */
 
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
diff --git a/htdocs/includes/boxes/box_contracts.php b/htdocs/includes/boxes/box_contracts.php
index 8f92bac5704..10c61eca9c7 100644
--- a/htdocs/includes/boxes/box_contracts.php
+++ b/htdocs/includes/boxes/box_contracts.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  * 		\file       htdocs/includes/boxes/box_contracts.php
  * 		\ingroup    contracts
  * 		\brief      Module de generation de l'affichage de la box contracts
- * 		\version	$Id$
+ * 		\version	$Id: box_contracts.php,v 1.10 2011/07/31 23:29:10 eldy Exp $
  */
 
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
diff --git a/htdocs/includes/boxes/box_external_rss.php b/htdocs/includes/boxes/box_external_rss.php
index b41c4b8ec3d..0859f336cb4 100644
--- a/htdocs/includes/boxes/box_external_rss.php
+++ b/htdocs/includes/boxes/box_external_rss.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  * 	    \file       htdocs/includes/boxes/box_external_rss.php
  *      \ingroup    external_rss
  *      \brief      Fichier de gestion d'une box pour le module external_rss
- *      \version    $Id$
+ *      \version    $Id: box_external_rss.php,v 1.34 2011/07/31 23:29:10 eldy Exp $
  */
 
 include_once(MAGPIERSS_PATH."rss_fetch.inc");
diff --git a/htdocs/includes/boxes/box_factures.php b/htdocs/includes/boxes/box_factures.php
index 7adc61d5729..f81d4421282 100644
--- a/htdocs/includes/boxes/box_factures.php
+++ b/htdocs/includes/boxes/box_factures.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/includes/boxes/box_factures.php
  *	\ingroup    factures
  *	\brief      Module de generation de l'affichage de la box factures
- *	\version	$Id$
+ *	\version	$Id: box_factures.php,v 1.52 2011/07/31 23:29:09 eldy Exp $
  */
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
 
diff --git a/htdocs/includes/boxes/box_factures_fourn.php b/htdocs/includes/boxes/box_factures_fourn.php
index 2fe7ba95c0b..e086035ea9e 100644
--- a/htdocs/includes/boxes/box_factures_fourn.php
+++ b/htdocs/includes/boxes/box_factures_fourn.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/includes/boxes/box_factures_fourn.php
  *      \ingroup    supplier
  *		\brief      Fichier de gestion d'une box des factures fournisseurs
- *		\version    $Id$
+ *		\version    $Id: box_factures_fourn.php,v 1.36 2011/07/31 23:29:10 eldy Exp $
  */
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
 
diff --git a/htdocs/includes/boxes/box_factures_fourn_imp.php b/htdocs/includes/boxes/box_factures_fourn_imp.php
index 2482944c9fa..8a04eae534d 100644
--- a/htdocs/includes/boxes/box_factures_fourn_imp.php
+++ b/htdocs/includes/boxes/box_factures_fourn_imp.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/includes/boxes/box_factures_fourn_imp.php
  *      \ingroup    fournisseur
  *		\brief      Fichier de gestion d'une box des factures fournisseurs impayees
- *		\version    $Id$
+ *		\version    $Id: box_factures_fourn_imp.php,v 1.37 2011/07/31 23:29:10 eldy Exp $
  */
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
 
diff --git a/htdocs/includes/boxes/box_factures_imp.php b/htdocs/includes/boxes/box_factures_imp.php
index f4a1818e45d..efc0e8a8e67 100644
--- a/htdocs/includes/boxes/box_factures_imp.php
+++ b/htdocs/includes/boxes/box_factures_imp.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/includes/boxes/box_factures_imp.php
  *	\ingroup    factures
  *	\brief      Module de generation de l'affichage de la box factures impayees
- *	\version	$Id$
+ *	\version	$Id: box_factures_imp.php,v 1.54 2011/07/31 23:29:10 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
diff --git a/htdocs/includes/boxes/box_fournisseurs.php b/htdocs/includes/boxes/box_fournisseurs.php
index 7dda9b9f14d..36b00b5ea90 100644
--- a/htdocs/includes/boxes/box_fournisseurs.php
+++ b/htdocs/includes/boxes/box_fournisseurs.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
     \file       htdocs/includes/boxes/box_fournisseurs.php
     \ingroup    fournisseurs
     \brief      Module to generate box of suppliers
-	\version	$Id$
+	\version	$Id: box_fournisseurs.php,v 1.30 2011/07/31 23:29:10 eldy Exp $
 */
 
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
diff --git a/htdocs/includes/boxes/box_members.php b/htdocs/includes/boxes/box_members.php
index 7d0c80c916b..d6daac28e8c 100755
--- a/htdocs/includes/boxes/box_members.php
+++ b/htdocs/includes/boxes/box_members.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/includes/boxes/box_members.php
  *	\ingroup    societes
  *	\brief      Module de generation de l'affichage de la box clients
- *	\version	$Id$
+ *	\version	$Id: box_members.php,v 1.4 2011/07/31 23:29:09 eldy Exp $
  */
 
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
diff --git a/htdocs/includes/boxes/box_osc_client.php b/htdocs/includes/boxes/box_osc_client.php
index 60e210697c3..362a070865f 100644
--- a/htdocs/includes/boxes/box_osc_client.php
+++ b/htdocs/includes/boxes/box_osc_client.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
     \file       htdocs/includes/boxes/box_osc_client.php
     \ingroup    osc
     \brief      Module to generate box of shop customers
-	\version	$Id$
+	\version	$Id: box_osc_client.php,v 1.17 2011/07/31 23:29:10 eldy Exp $
 */
 
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
diff --git a/htdocs/includes/boxes/box_produits.php b/htdocs/includes/boxes/box_produits.php
index 560053eb8f1..9287c9bb20b 100644
--- a/htdocs/includes/boxes/box_produits.php
+++ b/htdocs/includes/boxes/box_produits.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/includes/boxes/box_produits.php
  *	\ingroup    produits,services
  *	\brief      Module to generate box of last products/services
- *	\version	$Id$
+ *	\version	$Id: box_produits.php,v 1.41 2011/07/31 23:29:10 eldy Exp $
  */
 
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
diff --git a/htdocs/includes/boxes/box_propales.php b/htdocs/includes/boxes/box_propales.php
index 12c8f7580e6..f384997e797 100644
--- a/htdocs/includes/boxes/box_propales.php
+++ b/htdocs/includes/boxes/box_propales.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
 		\file       htdocs/includes/boxes/box_propales.php
 		\ingroup    propales
 		\brief      Module de generation de l'affichage de la box propales
-		\version	$Id$
+		\version	$Id: box_propales.php,v 1.47 2011/07/31 23:29:10 eldy Exp $
 */
 
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
diff --git a/htdocs/includes/boxes/box_prospect.php b/htdocs/includes/boxes/box_prospect.php
index a3fcd9847fa..07ceb0b7ec7 100644
--- a/htdocs/includes/boxes/box_prospect.php
+++ b/htdocs/includes/boxes/box_prospect.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *   \file       htdocs/includes/boxes/box_prospect.php
  *   \ingroup    societe
  *   \brief      Module to generate the last prospects box.
- *	\version	$Id$
+ *	\version	$Id: box_prospect.php,v 1.43 2011/07/31 23:29:10 eldy Exp $
  */
 
 
diff --git a/htdocs/includes/boxes/box_services_vendus.php b/htdocs/includes/boxes/box_services_vendus.php
index 34e35392858..c9caa3b3516 100644
--- a/htdocs/includes/boxes/box_services_vendus.php
+++ b/htdocs/includes/boxes/box_services_vendus.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/includes/boxes/box_services_vendus.php
  *		\ingroup    produits,services
  *      \brief      Module de generation de l'affichage de la box services_vendus
- *		\version	$Id$
+ *		\version	$Id: box_services_vendus.php,v 1.54 2011/07/31 23:29:09 eldy Exp $
  */
 
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
diff --git a/htdocs/includes/boxes/modules_boxes.php b/htdocs/includes/boxes/modules_boxes.php
index e13affbe9ec..5a7dafa719c 100644
--- a/htdocs/includes/boxes/modules_boxes.php
+++ b/htdocs/includes/boxes/modules_boxes.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +20,7 @@
  *	    \file       htdocs/includes/boxes/modules_boxes.php
  *		\ingroup    facture
  *		\brief      Fichier contenant la classe mere des boites
- *		\version    $Id: modules_boxes.php,v 1.55 2011/07/20 19:03:35 eldy Exp $
+ *		\version    $Id: modules_boxes.php,v 1.56 2011/07/31 23:29:10 eldy Exp $
  */
 
 
diff --git a/htdocs/includes/dolibarr_changes.txt b/htdocs/includes/dolibarr_changes.txt
index 45b32ffa341..486f39278c0 100644
--- a/htdocs/includes/dolibarr_changes.txt
+++ b/htdocs/includes/dolibarr_changes.txt
@@ -59,8 +59,9 @@ PHP-BARCODE:
 ------------
 If files are replaced by new version, following changes must be done:
 
-* Add lines into barcode_outimage function
-*******************************************
+* Restore changes done into php-barcode.php marked with DOL_CHANGE LDR
+
+* Add lines into barcode_outimage function:
 	// DOLCHANGE LDR
     global $filebarcode;
 
diff --git a/htdocs/includes/jquery/plugins/tiptip/tipTip.css b/htdocs/includes/jquery/plugins/tiptip/tipTip.css
index 5051478c3da..2fa1f57f789 100755
--- a/htdocs/includes/jquery/plugins/tiptip/tipTip.css
+++ b/htdocs/includes/jquery/plugins/tiptip/tipTip.css
@@ -32,7 +32,6 @@
     border: 1px solid rgba(255,255,255,0.25);
     background-color: rgb(215,215,215);
     background-color: rgba(255,255,255,0.94);
-    background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(transparent), to(#000));
     border-radius: 3px;
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
diff --git a/htdocs/includes/login/functions_dolibarr.php b/htdocs/includes/login/functions_dolibarr.php
index f15204c6afb..6e086409c3d 100644
--- a/htdocs/includes/login/functions_dolibarr.php
+++ b/htdocs/includes/login/functions_dolibarr.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/includes/login/functions_dolibarr.php
  *      \ingroup    core
  *      \brief      Authentication functions for Dolibarr mode
- *		\version	$Id$
+ *		\version	$Id: functions_dolibarr.php,v 1.13 2011/07/31 23:29:11 eldy Exp $
  */
 
 
diff --git a/htdocs/includes/login/functions_empty.php b/htdocs/includes/login/functions_empty.php
index 0539aa72c92..c3ab605c80c 100644
--- a/htdocs/includes/login/functions_empty.php
+++ b/htdocs/includes/login/functions_empty.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/includes/login/functions_empty.php
  *      \ingroup    core
  *      \brief      Empty authentication functions for test
- *		\version	$Id$
+ *		\version	$Id: functions_empty.php,v 1.2 2011/07/31 23:29:10 eldy Exp $
  */
 
 
diff --git a/htdocs/includes/login/functions_forceuser.php b/htdocs/includes/login/functions_forceuser.php
index de4d4fc1a7f..0aa66999b96 100644
--- a/htdocs/includes/login/functions_forceuser.php
+++ b/htdocs/includes/login/functions_forceuser.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: functions_forceuser.php,v 1.4 2011/07/31 23:29:11 eldy Exp $
  */
 
 /**
diff --git a/htdocs/includes/login/functions_http.php b/htdocs/includes/login/functions_http.php
index b6facb72289..09ff60a301a 100644
--- a/htdocs/includes/login/functions_http.php
+++ b/htdocs/includes/login/functions_http.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
         \file       htdocs/includes/login/functions_http.php
         \ingroup    core
         \brief      Authentication functions for HTTP Basic
-		\version	$Id$
+		\version	$Id: functions_http.php,v 1.4 2011/07/31 23:29:11 eldy Exp $
 */
 
 
diff --git a/htdocs/includes/login/functions_ldap.php b/htdocs/includes/login/functions_ldap.php
index e7f0359ced4..3b330afdb2f 100644
--- a/htdocs/includes/login/functions_ldap.php
+++ b/htdocs/includes/login/functions_ldap.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: functions_ldap.php,v 1.18 2011/07/31 23:29:11 eldy Exp $
  */
 
 /**
diff --git a/htdocs/includes/login/functions_myopenid.php b/htdocs/includes/login/functions_myopenid.php
index e1a67e82403..b54f46cb1bc 100644
--- a/htdocs/includes/login/functions_myopenid.php
+++ b/htdocs/includes/login/functions_myopenid.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/includes/login/functions_dolibarr.php
  *      \ingroup    core
  *      \brief      Authentication functions for Dolibarr mode
- *		\version	$Id$
+ *		\version	$Id: functions_myopenid.php,v 1.4 2011/07/31 23:29:11 eldy Exp $
  */
 
 
diff --git a/htdocs/includes/menus/smartphone/smartphone.lib.php b/htdocs/includes/menus/smartphone/smartphone.lib.php
index b45e9033eaf..c21f142d70e 100755
--- a/htdocs/includes/menus/smartphone/smartphone.lib.php
+++ b/htdocs/includes/menus/smartphone/smartphone.lib.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
 /**
  *  \file		htdocs/includes/menus/smartphone/smartphone.lib.php
  *  \brief		Library for file smartphone menus
- *  \version	$Id$
+ *  \version	$Id: smartphone.lib.php,v 1.7 2011/07/31 23:46:08 eldy Exp $
  */
 
 
diff --git a/htdocs/includes/menus/smartphone/smartphone_backoffice.php b/htdocs/includes/menus/smartphone/smartphone_backoffice.php
index fc149718a90..5b763df4db8 100755
--- a/htdocs/includes/menus/smartphone/smartphone_backoffice.php
+++ b/htdocs/includes/menus/smartphone/smartphone_backoffice.php
@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\file       htdocs/includes/menus/smartphone/smartphone_backoffice.php
  *		\brief      Gestionnaire nomme smartphone du menu smartphone
- *		\version    $Id$
+ *		\version    $Id: smartphone_backoffice.php,v 1.4 2011/07/31 23:46:08 eldy Exp $
  */
 
 
diff --git a/htdocs/includes/menus/smartphone/smartphone_frontoffice.php b/htdocs/includes/menus/smartphone/smartphone_frontoffice.php
index e8b69ad05e8..34f83906747 100755
--- a/htdocs/includes/menus/smartphone/smartphone_frontoffice.php
+++ b/htdocs/includes/menus/smartphone/smartphone_frontoffice.php
@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/includes/menus/smartphone/smartphone_frontoffice.php
  *	\brief      Gestionnaire nomme smartphone du menu smartphone
- *	\version    $Id$
+ *	\version    $Id: smartphone_frontoffice.php,v 1.4 2011/07/31 23:46:08 eldy Exp $
  */
 
 
diff --git a/htdocs/includes/menus/standard/auguria.lib.php b/htdocs/includes/menus/standard/auguria.lib.php
index c866bd0a7a9..e7b05a7f95d 100644
--- a/htdocs/includes/menus/standard/auguria.lib.php
+++ b/htdocs/includes/menus/standard/auguria.lib.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
 /**
  *  \file		htdocs/includes/menus/standard/auguria.lib.php
  *  \brief		Library for file auguria menus
- *  \version	$Id: auguria.lib.php,v 1.20 2011/07/18 20:19:41 eldy Exp $
+ *  \version	$Id: auguria.lib.php,v 1.21 2011/07/31 23:46:07 eldy Exp $
  */
 
 
diff --git a/htdocs/includes/menus/standard/auguria_backoffice.php b/htdocs/includes/menus/standard/auguria_backoffice.php
index d984931a8c7..d25b96e8353 100644
--- a/htdocs/includes/menus/standard/auguria_backoffice.php
+++ b/htdocs/includes/menus/standard/auguria_backoffice.php
@@ -14,14 +14,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/includes/menus/standard/auguria_backoffice.php
  *	\brief      Gestionnaire nomme Auguria du menu du haut
- *	\version    $Id$
+ *	\version    $Id: auguria_backoffice.php,v 1.4 2011/07/31 23:46:07 eldy Exp $
  *
  *	\remarks    La construction d'un gestionnaire pour le menu du haut est simple:
  *	\remarks    Toutes les entrees de menu a faire apparaitre dans la barre du haut
diff --git a/htdocs/includes/menus/standard/auguria_frontoffice.php b/htdocs/includes/menus/standard/auguria_frontoffice.php
index ca4e0c0fb7c..09ffa45ba58 100644
--- a/htdocs/includes/menus/standard/auguria_frontoffice.php
+++ b/htdocs/includes/menus/standard/auguria_frontoffice.php
@@ -14,14 +14,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/includes/menus/standard/auguria_frontoffice.php
  *	\brief      Gestionnaire nomme Auguria du menu du haut
- *	\version    $Id$
+ *	\version    $Id: auguria_frontoffice.php,v 1.4 2011/07/31 23:46:07 eldy Exp $
  *
  *	\remarks    La construction d'un gestionnaire pour le menu du haut est simple:
  *	\remarks    Toutes les entrees de menu a faire apparaitre dans la barre du haut
diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php
index 8c81bf6ea3a..6a2fb21f658 100644
--- a/htdocs/includes/menus/standard/eldy.lib.php
+++ b/htdocs/includes/menus/standard/eldy.lib.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
 /**
  *  \file		htdocs/includes/menus/standard/eldy.lib.php
  *  \brief		Library for file eldy menus
- *  \version	$Id: eldy.lib.php,v 1.60 2011/07/18 20:19:41 eldy Exp $
+ *  \version	$Id: eldy.lib.php,v 1.61 2011/07/31 23:46:07 eldy Exp $
  */
 
 
diff --git a/htdocs/includes/menus/standard/eldy_backoffice.php b/htdocs/includes/menus/standard/eldy_backoffice.php
index d8320c49874..f9d6e18c63e 100644
--- a/htdocs/includes/menus/standard/eldy_backoffice.php
+++ b/htdocs/includes/menus/standard/eldy_backoffice.php
@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\file       htdocs/includes/menus/standard/eldy_backoffice.php
  *		\brief      Gestionnaire nomme eldy du menu du haut
- *		\version    $Id$
+ *		\version    $Id: eldy_backoffice.php,v 1.5 2011/07/31 23:46:07 eldy Exp $
  *
  *		\remarks    La construction d'un gestionnaire pour le menu du haut est simple:
  *		\remarks    Toutes les entrees de menu a faire apparaitre dans la barre du haut
diff --git a/htdocs/includes/menus/standard/eldy_frontoffice.php b/htdocs/includes/menus/standard/eldy_frontoffice.php
index 431df6c678b..62a7c789d7c 100644
--- a/htdocs/includes/menus/standard/eldy_frontoffice.php
+++ b/htdocs/includes/menus/standard/eldy_frontoffice.php
@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/includes/menus/standard/eldy_frontoffice.php
  *	\brief      Gestionnaire nomme eldy du menu du haut
- *	\version    $Id$
+ *	\version    $Id: eldy_frontoffice.php,v 1.4 2011/07/31 23:46:07 eldy Exp $
  *
  *	\remarks    La construction d'un gestionnaire pour le menu du haut est simple:
  *	\remarks    Toutes les entrees de menu a faire apparaitre dans la barre du haut
diff --git a/htdocs/includes/menus/standard/empty.php b/htdocs/includes/menus/standard/empty.php
index a22032ead2e..81e71707014 100644
--- a/htdocs/includes/menus/standard/empty.php
+++ b/htdocs/includes/menus/standard/empty.php
@@ -12,14 +12,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/includes/menus/standard/empty.php
  *		\brief      This is an example of an empty top menu handler
- *		\version    $Id$
+ *		\version    $Id: empty.php,v 1.6 2011/07/31 23:46:08 eldy Exp $
  */
 
 /**
diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php
index e884e791d8f..5ed88b641a6 100644
--- a/htdocs/includes/modules/DolibarrModules.class.php
+++ b/htdocs/includes/modules/DolibarrModules.class.php
@@ -17,14 +17,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \file           htdocs/includes/modules/DolibarrModules.class.php
  *  \brief          Fichier de description et activation des modules Dolibarr
- *  \version        $Id: DolibarrModules.class.php,v 1.162 2011/07/17 18:13:44 eldy Exp $
+ *  \version        $Id: DolibarrModules.class.php,v 1.163 2011/07/31 23:28:12 eldy Exp $
  */
 
 
diff --git a/htdocs/includes/modules/action/rapport.pdf.php b/htdocs/includes/modules/action/rapport.pdf.php
index e7e4eac9505..9fafd03df67 100644
--- a/htdocs/includes/modules/action/rapport.pdf.php
+++ b/htdocs/includes/modules/action/rapport.pdf.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +22,7 @@
  *	\file       htdocs/includes/modules/action/rapport.pdf.php
  *	\ingroup    commercial
  *	\brief      File to build PDF with events
- *	\version    $Id$
+ *	\version    $Id: rapport.pdf.php,v 1.35 2011/07/31 23:28:17 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php');
diff --git a/htdocs/includes/modules/barcode/admin/barcode.php b/htdocs/includes/modules/barcode/admin/barcode.php
index 9ff1ee8fbfc..d3e5dfef96d 100644
--- a/htdocs/includes/modules/barcode/admin/barcode.php
+++ b/htdocs/includes/modules/barcode/admin/barcode.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/includes/modules/barcode/admin/barcode.php
  *	\ingroup    barcode
  *	\brief      Page d'administration/configuration du module Code barre
- *	\version    $Id$
+ *	\version    $Id: barcode.php,v 1.6 2011/07/31 23:46:07 eldy Exp $
  */
 
 require("../../../../main.inc.php");
@@ -298,5 +297,5 @@ print "<br>";
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:46:07 $ - $Revision: 1.6 $');
 ?>
\ No newline at end of file
diff --git a/htdocs/includes/modules/barcode/modules_barcode.php b/htdocs/includes/modules/barcode/modules_barcode.php
index cf5df713d1a..d3ebaa07d55 100644
--- a/htdocs/includes/modules/barcode/modules_barcode.php
+++ b/htdocs/includes/modules/barcode/modules_barcode.php
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -24,7 +23,7 @@
  *   \file       htdocs/includes/modules/barcode/modules_barcode.php
  *   \ingroup    barcode
  *   \brief      Fichier contenant la classe mere de generation des codes barres
- *   \version    $Id$
+ *   \version    $Id: modules_barcode.php,v 1.5 2011/07/31 23:28:17 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php');
 
diff --git a/htdocs/includes/modules/barcode/phpbarcode.modules.php b/htdocs/includes/modules/barcode/phpbarcode.modules.php
index 6ad4c946de8..11c1e46cc56 100644
--- a/htdocs/includes/modules/barcode/phpbarcode.modules.php
+++ b/htdocs/includes/modules/barcode/phpbarcode.modules.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +21,7 @@
  *	\file       htdocs/includes/modules/barcode/phpbarcode.modules.php
  *	\ingroup    facture
  *	\brief      Fichier contenant la classe du modele de generation code barre phpbarcode
- *	\version    $Id$
+ *	\version    $Id: phpbarcode.modules.php,v 1.14 2011/07/31 23:28:17 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/barcode/modules_barcode.php");
diff --git a/htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php b/htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php
index 1d6eab22970..6f552b8679e 100644
--- a/htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php
+++ b/htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -24,7 +23,7 @@
  *	\file       htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php
  *	\ingroup    facture
  *	\brief      File with parent class of check receipt document generators
- *	\version    $Id$
+ *	\version    $Id: modules_chequereceipts.php,v 1.5 2011/07/31 23:28:16 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
diff --git a/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php b/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php
index a4dd732c428..e95374717d6 100644
--- a/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php
+++ b/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +21,7 @@
  *	\file       htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php
  *	\ingroup    banque
  *	\brief      File to build cheque deposit receipts
- *	\version    $Id$
+ *	\version    $Id: pdf_blochet.class.php,v 1.41 2011/07/31 23:28:16 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
diff --git a/htdocs/includes/modules/commande/mod_commande_marbre.php b/htdocs/includes/modules/commande/mod_commande_marbre.php
index 70cd49b0b3c..2c1c30d9857 100644
--- a/htdocs/includes/modules/commande/mod_commande_marbre.php
+++ b/htdocs/includes/modules/commande/mod_commande_marbre.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +21,7 @@
  *  \file       htdocs/includes/modules/commande/mod_commande_marbre.php
  *  \ingroup    commande
  *  \brief      File of class to manage customer order numbering rules Marbre
- *  \version    $Id$
+ *  \version    $Id: mod_commande_marbre.php,v 1.23 2011/07/31 23:28:13 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.php");
 
diff --git a/htdocs/includes/modules/commande/mod_commande_saphir.php b/htdocs/includes/modules/commande/mod_commande_saphir.php
index fd42edd4366..27499d13d3c 100644
--- a/htdocs/includes/modules/commande/mod_commande_saphir.php
+++ b/htdocs/includes/modules/commande/mod_commande_saphir.php
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -24,7 +23,7 @@
 	\file       htdocs/includes/modules/commande/mod_commande_saphir.php
 	\ingroup    commande
 	\brief      Fichier contenant la classe du modele de numerotation de reference de commande Saphir
-	\version    $Id$
+	\version    $Id: mod_commande_saphir.php,v 1.26 2011/07/31 23:28:13 eldy Exp $
 */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.php");
diff --git a/htdocs/includes/modules/commande/modules_commande.php b/htdocs/includes/modules/commande/modules_commande.php
index 0a10adcd852..ce72e32e5ca 100644
--- a/htdocs/includes/modules/commande/modules_commande.php
+++ b/htdocs/includes/modules/commande/modules_commande.php
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -26,7 +25,7 @@
  *  \ingroup		commande
  *  \brief			Fichier contenant la classe mere de generation des commandes en PDF
  *  				et la classe mere de numerotation des commandes
- *  \version    	$Id: modules_commande.php,v 1.47 2011/07/04 10:35:49 hregis Exp $
+ *  \version    	$Id: modules_commande.php,v 1.48 2011/07/31 23:28:13 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
diff --git a/htdocs/includes/modules/commande/pdf_edison.modules.php b/htdocs/includes/modules/commande/pdf_edison.modules.php
index ed5406a52e4..019231e34c5 100644
--- a/htdocs/includes/modules/commande/pdf_edison.modules.php
+++ b/htdocs/includes/modules/commande/pdf_edison.modules.php
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -24,7 +23,7 @@
  *	\file       htdocs/includes/modules/commande/pdf_edison.modules.php
  *	\ingroup    commande
  *	\brief      Fichier de la classe permettant de generer les commandes au modele Edison
- *	\version    $Id$
+ *	\version    $Id: pdf_edison.modules.php,v 1.89 2011/07/31 23:28:13 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.php");
diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php
index adb3da49612..316e66a000a 100644
--- a/htdocs/includes/modules/commande/pdf_einstein.modules.php
+++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -25,7 +24,7 @@
  *	\ingroup    commande
  *	\brief      Fichier de la classe permettant de generer les commandes au modele Einstein
  *	\author	    Laurent Destailleur
- *	\version    $Id$
+ *	\version    $Id: pdf_einstein.modules.php,v 1.163 2011/07/31 23:28:13 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.php");
diff --git a/htdocs/includes/modules/contract/mod_contract_magre.php b/htdocs/includes/modules/contract/mod_contract_magre.php
index ff403f351a5..e510478a966 100755
--- a/htdocs/includes/modules/contract/mod_contract_magre.php
+++ b/htdocs/includes/modules/contract/mod_contract_magre.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +20,7 @@
  *  \file       htdocs/includes/modules/contract/mod_contract_magre.php
  *  \ingroup    contract
  *  \brief      File of class to manage contract numbering rules Magre
- *  \version    $Id$
+ *  \version    $Id: mod_contract_magre.php,v 1.3 2011/07/31 23:28:16 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/contract/modules_contract.php");
diff --git a/htdocs/includes/modules/contract/mod_contract_serpis.php b/htdocs/includes/modules/contract/mod_contract_serpis.php
index e537971ec3c..26c092a82ce 100755
--- a/htdocs/includes/modules/contract/mod_contract_serpis.php
+++ b/htdocs/includes/modules/contract/mod_contract_serpis.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +20,7 @@
  *  \file       htdocs/includes/modules/contract/mod_contract_serpis.php
  *  \ingroup    contract
  *  \brief      File of class to manage contract numbering rules Serpis
- *  \version    $Id$
+ *  \version    $Id: mod_contract_serpis.php,v 1.2 2011/07/31 23:28:17 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/contract/modules_contract.php");
 
diff --git a/htdocs/includes/modules/contract/modules_contract.php b/htdocs/includes/modules/contract/modules_contract.php
index 977df36c77a..dd1c8a51d99 100755
--- a/htdocs/includes/modules/contract/modules_contract.php
+++ b/htdocs/includes/modules/contract/modules_contract.php
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -26,7 +25,7 @@
  *  \file       htdocs/includes/modules/contract/modules_contract.php
  *  \ingroup    contract
  *  \brief      File of class to manage contract numbering
- *  \version    $Id$
+ *  \version    $Id: modules_contract.php,v 1.3 2011/07/31 23:28:16 eldy Exp $
  */
 
 class ModelNumRefContracts
diff --git a/htdocs/includes/modules/dons/html_cerfafr.modules.php b/htdocs/includes/modules/dons/html_cerfafr.modules.php
index 95ebe53aa84..a3e88d7517c 100644
--- a/htdocs/includes/modules/dons/html_cerfafr.modules.php
+++ b/htdocs/includes/modules/dons/html_cerfafr.modules.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
 			\file       htdocs/includes/modules/dons/html_cerfafr.modules.php
 			\ingroup    don
 			\brief      Formulaire de don
-			\version    $Id$
+			\version    $Id: html_cerfafr.modules.php,v 1.30 2011/07/31 23:28:14 eldy Exp $
 */
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/dons/modules_don.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php");
diff --git a/htdocs/includes/modules/dons/modules_don.php b/htdocs/includes/modules/dons/modules_don.php
index 6ef01d0731f..2b04f7f092d 100644
--- a/htdocs/includes/modules/dons/modules_don.php
+++ b/htdocs/includes/modules/dons/modules_don.php
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -24,7 +23,7 @@
 	    \file       htdocs/includes/modules/dons/modules_don.php
 		\ingroup    don
 		\brief      Fichier contenant la classe m�re de generation des dons
-		\version    $Id$
+		\version    $Id: modules_don.php,v 1.20 2011/07/31 23:28:14 eldy Exp $
 */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
diff --git a/htdocs/includes/modules/expedition/methode_expedition.modules.php b/htdocs/includes/modules/expedition/methode_expedition.modules.php
index 5fe436eb5c5..b7c9b78edf4 100644
--- a/htdocs/includes/modules/expedition/methode_expedition.modules.php
+++ b/htdocs/includes/modules/expedition/methode_expedition.modules.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +22,7 @@
  *	\ingroup    expedition
  *	\brief      Fichier contenant la classe mere de generation de bon de livraison en PDF
  *				et la classe mere de numerotation des bons de livraisons
- * 	\version	$Id$
+ * 	\version	$Id: methode_expedition.modules.php,v 1.10 2011/07/31 23:28:14 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
 require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php');
diff --git a/htdocs/includes/modules/expedition/mod_expedition_ribera.php b/htdocs/includes/modules/expedition/mod_expedition_ribera.php
index 9c49eae8a3b..b73af2d7469 100755
--- a/htdocs/includes/modules/expedition/mod_expedition_ribera.php
+++ b/htdocs/includes/modules/expedition/mod_expedition_ribera.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +20,7 @@
  *  \file       htdocs/includes/modules/expedition/mod_expedition_ribera.php
  *  \ingroup    expedition
  *  \brief      File of class to manage expedition numbering rules Ribera
- *  \version    $Id$
+ *  \version    $Id: mod_expedition_ribera.php,v 1.2 2011/07/31 23:28:14 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/expedition/modules_expedition.php");
diff --git a/htdocs/includes/modules/expedition/mod_expedition_safor.php b/htdocs/includes/modules/expedition/mod_expedition_safor.php
index a7d1ec7dc9d..9691a525223 100755
--- a/htdocs/includes/modules/expedition/mod_expedition_safor.php
+++ b/htdocs/includes/modules/expedition/mod_expedition_safor.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +20,7 @@
  *  \file       htdocs/includes/modules/expedition/mod_expedition_safor.php
  *  \ingroup    expedition
  *  \brief      File of class to manage shipments numbering rules Safor
- *  \version    $Id$
+ *  \version    $Id: mod_expedition_safor.php,v 1.3 2011/07/31 23:28:14 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/expedition/modules_expedition.php");
 
diff --git a/htdocs/includes/modules/expedition/modules_expedition.php b/htdocs/includes/modules/expedition/modules_expedition.php
index dfdf420e905..c1335ebc9dc 100755
--- a/htdocs/includes/modules/expedition/modules_expedition.php
+++ b/htdocs/includes/modules/expedition/modules_expedition.php
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -26,7 +25,7 @@
  *  \file       htdocs/includes/modules/expedition/modules_expedition.php
  *  \ingroup    expedition
  *  \brief      File of class to manage expedition numbering
- *  \version    $Id$
+ *  \version    $Id: modules_expedition.php,v 1.3 2011/07/31 23:28:14 eldy Exp $
  */
 
 class ModelNumRefExpedition
diff --git a/htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php b/htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php
index 9abbf28af0d..34ae04b6766 100644
--- a/htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php
+++ b/htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +22,7 @@
  *  \file       htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php
  *  \ingroup    shipping
  *  \brief      Fichier contenant la classe mere de generation des expeditions
- *  \version    $Id$
+ *  \version    $Id: ModelePdfExpedition.class.php,v 1.16 2011/07/31 23:28:13 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
index 3fa31ae73f7..6b97bf3d4d5 100644
--- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
+++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +22,7 @@
  *	\file       htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
  *	\ingroup    expedition
  *	\brief      Fichier de la classe permettant de generer les bordereaux envoi au modele Merou
- *	\version    $Id$
+ *	\version    $Id: pdf_expedition_merou.modules.php,v 1.85 2011/07/31 23:28:13 eldy Exp $
  */
 
 require_once DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/ModelePdfExpedition.class.php";
diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
index 82c400372bd..349bb32b719 100644
--- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
+++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +22,7 @@
  *	\file       htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
  *	\ingroup    expedition
  *	\brief      Fichier de la classe permettant de generer les bordereaux envoi au modele Rouget
- *	\version    $Id$
+ *	\version    $Id: pdf_expedition_rouget.modules.php,v 1.60 2011/07/31 23:28:13 eldy Exp $
  */
 
 require_once DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/ModelePdfExpedition.class.php";
diff --git a/htdocs/includes/modules/export/export_csv.modules.php b/htdocs/includes/modules/export/export_csv.modules.php
index 293f8f14ebe..257b95e4e3c 100644
--- a/htdocs/includes/modules/export/export_csv.modules.php
+++ b/htdocs/includes/modules/export/export_csv.modules.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +21,7 @@
  *		\ingroup    export
  *		\brief      File of class to build exports with CSV format
  *		\author	    Laurent Destailleur
- *		\version    $Id$
+ *		\version    $Id: export_csv.modules.php,v 1.30 2011/07/31 23:28:18 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php");
@@ -66,7 +65,7 @@ class ExportCsv extends ModeleExports
 		$this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape);
 		$this->extension='csv';         // Extension for generated file by this driver
 		$this->picto='mime/other';		// Picto
-		$ver=explode(' ','$Revision$');
+		$ver=explode(' ','$Revision: 1.30 $');
 		$this->version=$ver[2];         // Driver version
 
 		// If driver use an external library, put its name here
diff --git a/htdocs/includes/modules/export/export_excel.modules.php b/htdocs/includes/modules/export/export_excel.modules.php
index 32cdc6f3e92..127eb16e389 100644
--- a/htdocs/includes/modules/export/export_excel.modules.php
+++ b/htdocs/includes/modules/export/export_excel.modules.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +21,7 @@
  *	\ingroup    export
  *	\brief      File of class to generate export file with Excel format
  *	\author	    Laurent Destailleur
- *	\version    $Id$
+ *	\version    $Id: export_excel.modules.php,v 1.27 2011/07/31 23:28:18 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php");
@@ -65,7 +64,7 @@ class ExportExcel extends ModeleExports
 		$this->desc='<b>Excel</b> file format (.xls)<br>This is native Excel 95 format.';
 		$this->extension='xls';             // Extension for generated file by this driver
         $this->picto='mime/xls';					// Picto
-		$ver=explode(' ','$Revision$');
+		$ver=explode(' ','$Revision: 1.27 $');
 		$this->version=$ver[2];             // Driver version
 
 		// If driver use an external library, put its name here
diff --git a/htdocs/includes/modules/export/modules_export.php b/htdocs/includes/modules/export/modules_export.php
index 460f5b42979..ec7e1af07c6 100644
--- a/htdocs/includes/modules/export/modules_export.php
+++ b/htdocs/includes/modules/export/modules_export.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +21,7 @@
  *	\file       htdocs/includes/modules/export/modules_export.php
  *	\ingroup    export
  *	\brief      File of parent class for export modules
- *	\version    $Id$
+ *	\version    $Id: modules_export.php,v 1.24 2011/07/31 23:28:18 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php');
diff --git a/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php
index a6536023b1e..e42ecd75db5 100644
--- a/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -22,7 +22,7 @@
  *	\ingroup    societe
  *	\brief      File of class to build ODT documents for third parties
  *	\author	    Laurent Destailleur
- *	\version    $Id$
+ *	\version    $Id: doc_generic_invoice_odt.modules.php,v 1.19 2011/07/21 22:54:36 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php");
@@ -196,37 +196,9 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
 		// Add list of substitution keys
 		$texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
-        /*$dummy=new User($db);
-        $tmparray=$this->get_substitutionarray_user($dummy,$langs);
-        $nb=0;
-        foreach($tmparray as $key => $val)
-        {
-            $texthelp.='{'.$key.'}<br>';
-            $nb++;
-            if ($nb >= 5) { $texthelp.='...<br>'; break; }
-        }
-		$dummy=new Societe($db);
-		$tmparray=$this->get_substitutionarray_mysoc($dummy,$langs);
-		$nb=0;
-		foreach($tmparray as $key => $val)
-		{
-			$texthelp.='{'.$key.'}<br>';
-			$nb++;
-			if ($nb >= 5) { $texthelp.='...<br>'; break; }
-		}
-		$tmparray=$this->get_substitutionarray_thirdparty($dummy,$langs);
-		$nb=0;
-		foreach($tmparray as $key => $val)
-		{
-			$texthelp.='{'.$key.'}<br>';
-			$nb++;
-			if ($nb >= 5) { $texthelp.='...<br>'; break; }
-		}*/
-		$texthelp.=$langs->trans("FullListOnOnlineDocumentation");
-
-		$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help');
-		//var_dump($listofdir);
+ 		$texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation");    // This contains an url, we don't modify it
 
+		$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
 		$texte.= '<table><tr><td>';
 		$texte.= '<textarea class="flat" cols="60" name="value1">';
 		$texte.=$conf->global->FACTURE_ADDON_PDF_ODT_PATH;
diff --git a/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php b/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php
index 275a7aedebd..272b400539a 100755
--- a/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -25,7 +24,7 @@
  *	\ingroup    facture
  *	\brief      File of class to generate invoices from crab model
  *	\author	    Laurent Destailleur
- *	\version    $Id$
+ *	\version    $Id: pdf_crabe.modules.php,v 1.12 2011/07/31 23:28:15 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php");
diff --git a/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php b/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php
index 12cc1769374..50991f60be7 100755
--- a/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php
+++ b/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -26,7 +25,7 @@
  * 		\ingroup    facture
  * 		\brief      Fichier de la classe permettant de generer les factures au modele oursin
  * 		\author	    Sylvain SCATTOLINI base sur un modele de Laurent Destailleur
- * 		\version    $Id$
+ * 		\version    $Id: pdf_oursin.modules.php,v 1.11 2011/07/31 23:28:15 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
diff --git a/htdocs/includes/modules/facture/mod_facture_mercure.php b/htdocs/includes/modules/facture/mod_facture_mercure.php
index af57c9ff440..d5072345994 100644
--- a/htdocs/includes/modules/facture/mod_facture_mercure.php
+++ b/htdocs/includes/modules/facture/mod_facture_mercure.php
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -24,7 +23,7 @@
  *	\file       htdocs/includes/modules/facture/mod_facture_mercure.php
  *	\ingroup    facture
  *	\brief      File containing class for numbering module Mercure
- *	\version    $Id$
+ *	\version    $Id: mod_facture_mercure.php,v 1.7 2011/07/31 23:28:16 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php");
 
diff --git a/htdocs/includes/modules/facture/mod_facture_terre.php b/htdocs/includes/modules/facture/mod_facture_terre.php
index 61ffbd6beb3..ce1aa29283f 100644
--- a/htdocs/includes/modules/facture/mod_facture_terre.php
+++ b/htdocs/includes/modules/facture/mod_facture_terre.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +21,7 @@
  *	\file       htdocs/includes/modules/facture/mod_facture_terre.php
  *	\ingroup    facture
  *	\brief      File containing class for numbering module Terre
- *	\version    $Id$
+ *	\version    $Id: mod_facture_terre.php,v 1.7 2011/07/31 23:28:16 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php");
 
diff --git a/htdocs/includes/modules/facture/modules_facture.php b/htdocs/includes/modules/facture/modules_facture.php
index 9e1640010f4..d01c29a5a53 100644
--- a/htdocs/includes/modules/facture/modules_facture.php
+++ b/htdocs/includes/modules/facture/modules_facture.php
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -25,7 +24,7 @@
  *	\ingroup    facture
  *	\brief      Fichier contenant la classe mere de generation des factures en PDF
  * 				et la classe mere de numerotation des factures
- *	\version    $Id: modules_facture.php,v 1.92 2011/07/04 10:35:48 hregis Exp $
+ *	\version    $Id: modules_facture.php,v 1.93 2011/07/31 23:28:16 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
diff --git a/htdocs/includes/modules/fichinter/mod_arctic.php b/htdocs/includes/modules/fichinter/mod_arctic.php
index 8761d8e7743..4cdb6176fc7 100644
--- a/htdocs/includes/modules/fichinter/mod_arctic.php
+++ b/htdocs/includes/modules/fichinter/mod_arctic.php
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -24,7 +23,7 @@
  *	\file       htdocs/includes/modules/fichinter/mod_arctic.php
  *	\ingroup    fiche intervention
  *	\brief      File with Arctic numbering module for interventions
- *	\version    $Id: mod_arctic.php,v 1.18 2011/07/02 15:46:02 eldy Exp $
+ *	\version    $Id: mod_arctic.php,v 1.19 2011/07/31 23:28:15 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/fichinter/modules_fichinter.php");
 
diff --git a/htdocs/includes/modules/fichinter/mod_pacific.php b/htdocs/includes/modules/fichinter/mod_pacific.php
index adc5a872971..fc5ab868bb5 100644
--- a/htdocs/includes/modules/fichinter/mod_pacific.php
+++ b/htdocs/includes/modules/fichinter/mod_pacific.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +21,7 @@
  *  \file       htdocs/includes/modules/fichinter/mod_pacific.php
  *  \ingroup    fiche intervention
  *  \brief      File with Pacific numbering module for interventions
- *  \version    $Id: mod_pacific.php,v 1.12 2011/07/02 15:46:02 eldy Exp $
+ *  \version    $Id: mod_pacific.php,v 1.13 2011/07/31 23:28:15 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/fichinter/modules_fichinter.php");
 
diff --git a/htdocs/includes/modules/fichinter/modules_fichinter.php b/htdocs/includes/modules/fichinter/modules_fichinter.php
index d99dfabba9c..47ef39e8cba 100644
--- a/htdocs/includes/modules/fichinter/modules_fichinter.php
+++ b/htdocs/includes/modules/fichinter/modules_fichinter.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -24,7 +23,7 @@
  *  \ingroup    ficheinter
  *  \brief      Fichier contenant la classe mere de generation des fiches interventions en PDF
  *   et la classe mere de numerotation des fiches interventions
- *   \version    $Id: modules_fichinter.php,v 1.41 2011/07/10 13:48:25 eldy Exp $
+ *   \version    $Id: modules_fichinter.php,v 1.42 2011/07/31 23:28:15 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
index f58d2118dcc..73dbde338ed 100644
--- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
+++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +22,7 @@
  *	\file       htdocs/includes/modules/fichinter/pdf_soleil.modules.php
  *	\ingroup    ficheinter
  *	\brief      Fichier de la classe permettant de generer les fiches d'intervention au modele Soleil
- *	\version    $Id: pdf_soleil.modules.php,v 1.101 2011/07/13 14:09:35 eldy Exp $
+ *	\version    $Id: pdf_soleil.modules.php,v 1.102 2011/07/31 23:28:15 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
diff --git a/htdocs/includes/modules/import/import_csv.modules.php b/htdocs/includes/modules/import/import_csv.modules.php
index 4273f92e477..5a3532c54ff 100644
--- a/htdocs/includes/modules/import/import_csv.modules.php
+++ b/htdocs/includes/modules/import/import_csv.modules.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +22,7 @@
  *		\ingroup    import
  *		\brief      File to load import files with CSV format
  *		\author	    Laurent Destailleur
- *		\version    $Id$
+ *		\version    $Id: import_csv.modules.php,v 1.33 2011/07/31 23:28:17 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/import/modules_import.php");
@@ -72,7 +71,7 @@ class ImportCsv extends ModeleImports
 		$this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape);
 		$this->extension='csv';         // Extension for generated file by this driver
 		$this->picto='mime/other';		// Picto
-		$ver=explode(' ','$Revision$');
+		$ver=explode(' ','$Revision: 1.33 $');
 		$this->version=$ver[2];         // Driver version
 
 		// If driver use an external library, put its name here
diff --git a/htdocs/includes/modules/import/modules_import.php b/htdocs/includes/modules/import/modules_import.php
index 3db3aa1ff06..f1836e0eb8c 100644
--- a/htdocs/includes/modules/import/modules_import.php
+++ b/htdocs/includes/modules/import/modules_import.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +21,7 @@
  *	\file       htdocs/includes/modules/import/modules_import.php
  *	\ingroup    export
  *	\brief      File of parent class for import file readers
- *	\version    $Id$
+ *	\version    $Id: modules_import.php,v 1.9 2011/07/31 23:28:17 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php');
 
diff --git a/htdocs/includes/modules/livraison/mod_livraison_jade.php b/htdocs/includes/modules/livraison/mod_livraison_jade.php
index c7408fdae80..b7713a76d0d 100644
--- a/htdocs/includes/modules/livraison/mod_livraison_jade.php
+++ b/htdocs/includes/modules/livraison/mod_livraison_jade.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +22,7 @@
  *   \file       htdocs/includes/modules/livraison/mod_livraison_jade.php
  *   \ingroup    delivery
  *   \brief      Fichier contenant la classe du modele de numerotation de reference de bon de livraison Jade
- *   \version    $Id$
+ *   \version    $Id: mod_livraison_jade.php,v 1.9 2011/07/31 23:28:14 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/livraison/modules_livraison.php");
diff --git a/htdocs/includes/modules/livraison/mod_livraison_saphir.php b/htdocs/includes/modules/livraison/mod_livraison_saphir.php
index 6db8121bc00..f7fe6720a7f 100644
--- a/htdocs/includes/modules/livraison/mod_livraison_saphir.php
+++ b/htdocs/includes/modules/livraison/mod_livraison_saphir.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +22,7 @@
  *	\file       htdocs/includes/modules/livraison/mod_livraison_saphir.php
  *	\ingroup    expedition
  *	\brief      Fichier contenant la classe du modele de numerotation de reference de livraison Saphir
- *	\version    $Id$
+ *	\version    $Id: mod_livraison_saphir.php,v 1.8 2011/07/31 23:28:14 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/livraison/modules_livraison.php");
 
diff --git a/htdocs/includes/modules/livraison/modules_livraison.php b/htdocs/includes/modules/livraison/modules_livraison.php
index e669e45e321..cbd09447e3d 100644
--- a/htdocs/includes/modules/livraison/modules_livraison.php
+++ b/htdocs/includes/modules/livraison/modules_livraison.php
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -25,7 +24,7 @@
  *	\ingroup    expedition
  *	\brief      Fichier contenant la classe mere de generation de bon de livraison en PDF
  *				et la classe mere de numerotation des bons de livraisons
- *	\version    $Id$
+ *	\version    $Id: modules_livraison.php,v 1.18 2011/07/31 23:28:14 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
diff --git a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
index b6e724875f7..84ad4ed54e9 100644
--- a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
+++ b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -24,7 +23,7 @@
  *	\file       htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
  *	\ingroup    livraison
  *	\brief      Fichier de la classe permettant de generer les bons de livraison au mod�le Sirocco
- *	\version    $Id$
+ *	\version    $Id: pdf_sirocco.modules.php,v 1.77 2011/07/31 23:28:17 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/livraison/modules_livraison.php");
diff --git a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
index a7e5b91dfbc..fcbf9a52cb0 100644
--- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
+++ b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -25,7 +24,7 @@
  *	\ingroup    livraison
  *	\brief      Fichier de la classe permettant de generer les bons de livraison au modele Typhon
  *	\author	    Laurent Destailleur
- *	\version    $Id$
+ *	\version    $Id: pdf_typhon.modules.php,v 1.86 2011/07/31 23:28:17 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/livraison/modules_livraison.php");
diff --git a/htdocs/includes/modules/mailings/contacts1.modules.php b/htdocs/includes/modules/mailings/contacts1.modules.php
index 1cd59b616c2..cbb4ad1c1fa 100755
--- a/htdocs/includes/modules/mailings/contacts1.modules.php
+++ b/htdocs/includes/modules/mailings/contacts1.modules.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +22,7 @@
  *	\file       htdocs/includes/modules/mailings/contacts1.modules.php
  *	\ingroup    mailing
  *	\brief      File of class to offer a selector of emailing targets with Rule 'Poire'.
- *	\version    $Id$
+ *	\version    $Id: contacts1.modules.php,v 1.2 2011/07/31 23:28:15 eldy Exp $
  */
 
 include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php';
diff --git a/htdocs/includes/modules/mailings/contacts2.modules.php b/htdocs/includes/modules/mailings/contacts2.modules.php
index 4f8cb109714..857e432d5c5 100755
--- a/htdocs/includes/modules/mailings/contacts2.modules.php
+++ b/htdocs/includes/modules/mailings/contacts2.modules.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +20,7 @@
  *    	\file       htdocs/includes/modules/mailings/contacts2.modules.php
  *    	\ingroup    mailing
  *    	\brief      Provides a list of recipients for mailing module
- *    	\version    $Revision$
+ *    	\version    $Revision: 1.8 $
  */
 
 include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php';
diff --git a/htdocs/includes/modules/mailings/contacts3.modules.php b/htdocs/includes/modules/mailings/contacts3.modules.php
index 4e507e2fabb..b8ddb204c16 100755
--- a/htdocs/includes/modules/mailings/contacts3.modules.php
+++ b/htdocs/includes/modules/mailings/contacts3.modules.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +20,7 @@
  *     	\file       htdocs/includes/modules/mailings/contacts3.modules.php
  *     	\ingroup    mailing
  *     	\brief      Provides a list of recipients for mailing module
- *     	\version    $Revision$
+ *     	\version    $Revision: 1.4 $
  */
 
 include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php';
diff --git a/htdocs/includes/modules/mailings/fraise.modules.php b/htdocs/includes/modules/mailings/fraise.modules.php
index 1d373a00739..7eb23ef768e 100644
--- a/htdocs/includes/modules/mailings/fraise.modules.php
+++ b/htdocs/includes/modules/mailings/fraise.modules.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +21,7 @@
        	\file       htdocs/includes/modules/mailings/fraise.modules.php
 		\ingroup    mailing
 		\brief      File of class to generate target according to rule Fraise
-		\version    $Id$
+		\version    $Id: fraise.modules.php,v 1.27 2011/07/31 23:28:15 eldy Exp $
 */
 
 include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php';
diff --git a/htdocs/includes/modules/mailings/modules_mailings.php b/htdocs/includes/modules/mailings/modules_mailings.php
index 1d35b08cf13..626d45890da 100644
--- a/htdocs/includes/modules/mailings/modules_mailings.php
+++ b/htdocs/includes/modules/mailings/modules_mailings.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +22,7 @@
  *	    \file       htdocs/includes/modules/mailings/modules_mailings.php
  *		\ingroup    mailing
  *		\brief      File with parent class of emailing target selectors modules
- *		\version    $Id$
+ *		\version    $Id: modules_mailings.php,v 1.21 2011/07/31 23:28:15 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php');
 
diff --git a/htdocs/includes/modules/mailings/peche.modules.php b/htdocs/includes/modules/mailings/peche.modules.php
index d4761abde83..c64ddff71e7 100644
--- a/htdocs/includes/modules/mailings/peche.modules.php
+++ b/htdocs/includes/modules/mailings/peche.modules.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +20,7 @@
  *	\file       htdocs/includes/modules/mailings/peche.modules.php
  *	\ingroup    mailing
  *	\brief      File of class to offer a selector of emailing targets with Rule 'Peche'.
- *	\version    $Id$
+ *	\version    $Id: peche.modules.php,v 1.16 2011/07/31 23:28:15 eldy Exp $
  */
 include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php';
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
diff --git a/htdocs/includes/modules/mailings/pomme.modules.php b/htdocs/includes/modules/mailings/pomme.modules.php
index 9571e8399cf..bd5d32592ba 100644
--- a/htdocs/includes/modules/mailings/pomme.modules.php
+++ b/htdocs/includes/modules/mailings/pomme.modules.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +21,7 @@
  *	\file       htdocs/includes/modules/mailings/pomme.modules.php
  *	\ingroup    mailing
  *	\brief      File of class to offer a selector of emailing targets with Rule 'Pomme'.
- *	\version    $Id$
+ *	\version    $Id: pomme.modules.php,v 1.19 2011/07/31 23:28:15 eldy Exp $
  */
 include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php';
 
diff --git a/htdocs/includes/modules/member/cards/modules_cards.php b/htdocs/includes/modules/member/cards/modules_cards.php
index 8a3409f3030..f4be0c1e061 100644
--- a/htdocs/includes/modules/member/cards/modules_cards.php
+++ b/htdocs/includes/modules/member/cards/modules_cards.php
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -24,7 +23,7 @@
  *	\file       htdocs/includes/modules/member/cards/modules_cards.php
  *	\ingroup    member
  *	\brief      File of parent class of document generator for members cards.
- *	\version    $Id: modules_cards.php,v 1.10 2011/07/04 08:53:01 eldy Exp $
+ *	\version    $Id: modules_cards.php,v 1.11 2011/07/31 23:28:18 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
diff --git a/htdocs/includes/modules/member/cards/pdf_standard.class.php b/htdocs/includes/modules/member/cards/pdf_standard.class.php
index c25d94355f7..0f7007eb38e 100644
--- a/htdocs/includes/modules/member/cards/pdf_standard.class.php
+++ b/htdocs/includes/modules/member/cards/pdf_standard.class.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Inspire de PDF_Label
@@ -61,7 +60,7 @@
  *	\author	    Laurent Passebecq
  *	\author	    Rodolphe Quiedville
  *	\author	    Jean Louis Bergamo.
- *	\version    $Id$
+ *	\version    $Id: pdf_standard.class.php,v 1.22 2011/07/31 23:28:18 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
diff --git a/htdocs/includes/modules/member/labels/modules_labels.php b/htdocs/includes/modules/member/labels/modules_labels.php
index 773772d3823..c375ed8ac5c 100644
--- a/htdocs/includes/modules/member/labels/modules_labels.php
+++ b/htdocs/includes/modules/member/labels/modules_labels.php
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -24,7 +23,7 @@
  *	\file       htdocs/includes/modules/member/labels/modules_labels.php
  *	\ingroup    member
  *	\brief      File of parent class of document generator for members labels sheets.
- *	\version    $Id$
+ *	\version    $Id: modules_labels.php,v 1.2 2011/07/31 23:28:14 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
diff --git a/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php b/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php
index 46c7b063b18..40b0f4f23ad 100644
--- a/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php
+++ b/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Inspire de PDF_Label
@@ -61,7 +60,7 @@
  *	\author	    Laurent Passebecq
  *	\author	    Rodolphe Quiedville
  *	\author	    Jean Louis Bergamo.
- *	\version    $Id$
+ *	\version    $Id: pdf_standardlabel.class.php,v 1.13 2011/07/31 23:28:14 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
diff --git a/htdocs/includes/modules/modAdherent.class.php b/htdocs/includes/modules/modAdherent.class.php
index b17d5742b5d..1b82f89f67a 100644
--- a/htdocs/includes/modules/modAdherent.class.php
+++ b/htdocs/includes/modules/modAdherent.class.php
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -29,7 +28,7 @@
  *		\file       htdocs/includes/modules/modAdherent.class.php
  *      \ingroup    member
  *      \brief      File descriptor or module Member
- *		\version	$Id$
+ *		\version	$Id: modAdherent.class.php,v 1.87 2011/07/31 23:28:11 eldy Exp $
  */
 
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
diff --git a/htdocs/includes/modules/modAgenda.class.php b/htdocs/includes/modules/modAgenda.class.php
index 3a01b9f50da..b187f68a1c7 100644
--- a/htdocs/includes/modules/modAgenda.class.php
+++ b/htdocs/includes/modules/modAgenda.class.php
@@ -17,14 +17,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\defgroup   agenda     Module agenda
  *      \brief      Module pour gerer l'agenda et actions
- *		\brief		$Id$
+ *		\brief		$Id: modAgenda.class.php,v 1.39 2011/07/31 23:28:10 eldy Exp $
  */
 
 /**
diff --git a/htdocs/includes/modules/modBanque.class.php b/htdocs/includes/modules/modBanque.class.php
index 7cd88ca981d..261b5f3a48f 100644
--- a/htdocs/includes/modules/modBanque.class.php
+++ b/htdocs/includes/modules/modBanque.class.php
@@ -16,13 +16,12 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**     \defgroup   banque     Module bank
  *		\brief      Module pour gerer la tenue d'un compte bancaire et rapprochements
- *		\version	$Id$
+ *		\version	$Id: modBanque.class.php,v 1.65 2011/07/31 23:28:12 eldy Exp $
  */
 
 /**
diff --git a/htdocs/includes/modules/modBarcode.class.php b/htdocs/includes/modules/modBarcode.class.php
index 4a93925d7ff..216c4363a8a 100644
--- a/htdocs/includes/modules/modBarcode.class.php
+++ b/htdocs/includes/modules/modBarcode.class.php
@@ -14,14 +14,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\defgroup   barcode         Module barcode
  *	\brief      Module pour gerer les codes barres
- *	\version	$Id$
+ *	\version	$Id: modBarcode.class.php,v 1.28 2011/07/31 23:28:11 eldy Exp $
  */
 
 /**
diff --git a/htdocs/includes/modules/modBookmark.class.php b/htdocs/includes/modules/modBookmark.class.php
index d86b8f3a523..7c8fd6d1ec6 100644
--- a/htdocs/includes/modules/modBookmark.class.php
+++ b/htdocs/includes/modules/modBookmark.class.php
@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\defgroup   bookmark    Module bookmarks
  *	\brief      Module to manage Bookmarks
- *	\version	$Id$
+ *	\version	$Id: modBookmark.class.php,v 1.26 2011/07/31 23:28:12 eldy Exp $
  */
 
 /**
diff --git a/htdocs/includes/modules/modBoutique.class.php b/htdocs/includes/modules/modBoutique.class.php
index 6d7d40e9437..3acc326ecc5 100644
--- a/htdocs/includes/modules/modBoutique.class.php
+++ b/htdocs/includes/modules/modBoutique.class.php
@@ -15,14 +15,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**    
  * 	\defgroup   oscommerce     Module oscommerce
  *	\brief      Module pour gerer une boutique et interface avec OSCommerce
- *	\version	$Id$
+ *	\version	$Id: modBoutique.class.php,v 1.39 2011/07/31 23:28:12 eldy Exp $
  */
 
 /**
diff --git a/htdocs/includes/modules/modCashDesk.class.php b/htdocs/includes/modules/modCashDesk.class.php
index 57667425bde..73101b8ca7a 100644
--- a/htdocs/includes/modules/modCashDesk.class.php
+++ b/htdocs/includes/modules/modCashDesk.class.php
@@ -12,14 +12,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \defgroup   pos       Module points of sale
  *      \brief      Module to manage points of sale
- *		\version	$Id: modCashDesk.class.php,v 1.25 2011/06/29 22:41:49 eldy Exp $
+ *		\version	$Id: modCashDesk.class.php,v 1.26 2011/07/31 23:28:12 eldy Exp $
  */
 
 /**
@@ -55,7 +54,7 @@ class modCashDesk extends DolibarrModules
 		$this->name = preg_replace('/^mod/i','',get_class($this));
 		$this->description = "CashDesk module";
 
-		$this->revision = explode(' ','$Revision: 1.25 $');
+		$this->revision = explode(' ','$Revision: 1.26 $');
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
diff --git a/htdocs/includes/modules/modCategorie.class.php b/htdocs/includes/modules/modCategorie.class.php
index 5ead1e6b531..e808eec06a5 100644
--- a/htdocs/includes/modules/modCategorie.class.php
+++ b/htdocs/includes/modules/modCategorie.class.php
@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \defgroup   category       Module categories
  *      \brief      Module to manage categories
- *		\version	$Id$
+ *		\version	$Id: modCategorie.class.php,v 1.39 2011/07/31 23:28:09 eldy Exp $
  */
 
 /**
diff --git a/htdocs/includes/modules/modClickToDial.class.php b/htdocs/includes/modules/modClickToDial.class.php
index f0e340a36ec..2d695d630b2 100644
--- a/htdocs/includes/modules/modClickToDial.class.php
+++ b/htdocs/includes/modules/modClickToDial.class.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -26,7 +25,7 @@
  *	\file       htdocs/includes/modules/modClickToDial.class.php
  *	\ingroup    clicktodial
  *	\brief      Fichier de description et activation du module de click to Dial
- *	\version	$Id$
+ *	\version	$Id: modClickToDial.class.php,v 1.22 2011/07/31 23:28:10 eldy Exp $
  */
 
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
diff --git a/htdocs/includes/modules/modCommande.class.php b/htdocs/includes/modules/modCommande.class.php
index 64a70c435f9..3ea748fc423 100644
--- a/htdocs/includes/modules/modCommande.class.php
+++ b/htdocs/includes/modules/modCommande.class.php
@@ -17,14 +17,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\defgroup   commande     Module orders
  *		\brief      Module pour gerer le suivi des commandes
- *		\version	$Id$
+ *		\version	$Id: modCommande.class.php,v 1.81 2011/07/31 23:28:11 eldy Exp $
  */
 
 /**
diff --git a/htdocs/includes/modules/modComptabilite.class.php b/htdocs/includes/modules/modComptabilite.class.php
index b3c88311c7c..121fce7f7f9 100644
--- a/htdocs/includes/modules/modComptabilite.class.php
+++ b/htdocs/includes/modules/modComptabilite.class.php
@@ -15,13 +15,12 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**     \defgroup   comptabilite     Module comptabilite
         \brief      Module pour inclure des fonctions de comptabilite (gestion de comptes comptables et rapports)
-		\version	$Id$
+		\version	$Id: modComptabilite.class.php,v 1.57 2011/07/31 23:28:11 eldy Exp $
 */
 
 /**
diff --git a/htdocs/includes/modules/modContrat.class.php b/htdocs/includes/modules/modContrat.class.php
index 07a73d800a3..9c0ff9ccdf9 100644
--- a/htdocs/includes/modules/modContrat.class.php
+++ b/htdocs/includes/modules/modContrat.class.php
@@ -14,14 +14,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\defgroup   contrat     Module contract
  *	\brief      Module pour gerer la tenue de contrat de services
- *	\version	$Id$
+ *	\version	$Id: modContrat.class.php,v 1.41 2011/07/31 23:28:11 eldy Exp $
  */
 
 /**
diff --git a/htdocs/includes/modules/modDeplacement.class.php b/htdocs/includes/modules/modDeplacement.class.php
index d9972308ccb..da3d490edc4 100644
--- a/htdocs/includes/modules/modDeplacement.class.php
+++ b/htdocs/includes/modules/modDeplacement.class.php
@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\defgroup   deplacement     Module trips
  *	\brief      Module pour gerer les deplacements et notes de frais
- *	\version	$Id$
+ *	\version	$Id: modDeplacement.class.php,v 1.29 2011/07/31 23:28:12 eldy Exp $
  */
 
 /**
diff --git a/htdocs/includes/modules/modDon.class.php b/htdocs/includes/modules/modDon.class.php
index cfb2d71afe3..070b1b7c74b 100644
--- a/htdocs/includes/modules/modDon.class.php
+++ b/htdocs/includes/modules/modDon.class.php
@@ -14,14 +14,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\defgroup   don     Module donation
  *	\brief      Module pour gerer le suivi des dons
- *	\version	$Id$
+ *	\version	$Id: modDon.class.php,v 1.39 2011/07/31 23:28:11 eldy Exp $
  */
 
 /**
diff --git a/htdocs/includes/modules/modECM.class.php b/htdocs/includes/modules/modECM.class.php
index 371146989ec..979c02d5836 100644
--- a/htdocs/includes/modules/modECM.class.php
+++ b/htdocs/includes/modules/modECM.class.php
@@ -13,13 +13,12 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**     \defgroup   ecm		Module ecm
  *      \brief      Module for ECM (Electronic Content Management)
- *		\version	$Id$
+ *		\version	$Id: modECM.class.php,v 1.36 2011/07/31 23:28:12 eldy Exp $
 */
 
 /**
diff --git a/htdocs/includes/modules/modExport.class.php b/htdocs/includes/modules/modExport.class.php
index 523678eca7f..18b55fae9c2 100644
--- a/htdocs/includes/modules/modExport.class.php
+++ b/htdocs/includes/modules/modExport.class.php
@@ -13,13 +13,12 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**     \defgroup   export      Module export
  *		\brief      Module generique pour realiser des exports de donnees en base
- * 		\version	$Id$
+ * 		\version	$Id: modExport.class.php,v 1.17 2011/07/31 23:28:12 eldy Exp $
  */
 
 /**
diff --git a/htdocs/includes/modules/modExternalRss.class.php b/htdocs/includes/modules/modExternalRss.class.php
index a09ca28bfc5..2d11e7f7266 100644
--- a/htdocs/includes/modules/modExternalRss.class.php
+++ b/htdocs/includes/modules/modExternalRss.class.php
@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \defgroup   externalrss     Module externalrss
  *	\brief      Module pour inclure des informations externes RSS
- *	\version	$Id$
+ *	\version	$Id: modExternalRss.class.php,v 1.37 2011/07/31 23:28:12 eldy Exp $
  */
 
 /**
diff --git a/htdocs/includes/modules/modExternalSite.class.php b/htdocs/includes/modules/modExternalSite.class.php
index 6cc0e601952..0862d876777 100644
--- a/htdocs/includes/modules/modExternalSite.class.php
+++ b/htdocs/includes/modules/modExternalSite.class.php
@@ -14,13 +14,12 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**     \defgroup   externalsite     Module externalsite
         \brief      Module to include an external web site/tools into Dolibarr menu and into a frame page.
-		\version	$Id$
+		\version	$Id: modExternalSite.class.php,v 1.3 2011/07/31 23:28:10 eldy Exp $
 */
 
 /**
diff --git a/htdocs/includes/modules/modFTP.class.php b/htdocs/includes/modules/modFTP.class.php
index ea6236cda7b..e3c0127f1b1 100644
--- a/htdocs/includes/modules/modFTP.class.php
+++ b/htdocs/includes/modules/modFTP.class.php
@@ -13,13 +13,12 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**     \defgroup   ftp		Module FTP
  *      \brief      Module for FTP client module
- *		\version	$Id$
+ *		\version	$Id: modFTP.class.php,v 1.10 2011/07/31 23:28:11 eldy Exp $
  */
 
 /**
diff --git a/htdocs/includes/modules/modFacture.class.php b/htdocs/includes/modules/modFacture.class.php
index 51c17d203df..9eb1a11a5d3 100644
--- a/htdocs/includes/modules/modFacture.class.php
+++ b/htdocs/includes/modules/modFacture.class.php
@@ -16,14 +16,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  * 		\defgroup   facture     Module invoices
  *      \brief      Module pour gerer les factures clients et/ou fournisseurs
- *		\version	$Id$
+ *		\version	$Id: modFacture.class.php,v 1.115 2011/07/31 23:28:10 eldy Exp $
  */
 
 
diff --git a/htdocs/includes/modules/modFckeditor.class.php b/htdocs/includes/modules/modFckeditor.class.php
index 57d75a44351..0f3e7364a6a 100644
--- a/htdocs/includes/modules/modFckeditor.class.php
+++ b/htdocs/includes/modules/modFckeditor.class.php
@@ -14,14 +14,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \defgroup   fckeditor     Module fckeditor
  *  \brief      Module pour mettre en page les zones de saisie de texte
- *  \version	$Id$
+ *  \version	$Id: modFckeditor.class.php,v 1.21 2011/07/31 23:28:12 eldy Exp $
  */
 
 /**
diff --git a/htdocs/includes/modules/modFournisseur.class.php b/htdocs/includes/modules/modFournisseur.class.php
index 0ec7274044b..c4f254d9c4e 100644
--- a/htdocs/includes/modules/modFournisseur.class.php
+++ b/htdocs/includes/modules/modFournisseur.class.php
@@ -14,14 +14,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  * 		\defgroup   fournisseur     Module suppliers
  *		\brief      Module pour gerer des societes et contacts de type fournisseurs
- *		\version	$Id$
+ *		\version	$Id: modFournisseur.class.php,v 1.95 2011/07/31 23:28:11 eldy Exp $
  */
 
 /**
diff --git a/htdocs/includes/modules/modGeoIPMaxmind.class.php b/htdocs/includes/modules/modGeoIPMaxmind.class.php
index 7b8fb029d27..39d3059bd53 100644
--- a/htdocs/includes/modules/modGeoIPMaxmind.class.php
+++ b/htdocs/includes/modules/modGeoIPMaxmind.class.php
@@ -12,13 +12,12 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**     \defgroup   geoip      Module GeoIP
  *		\brief      Module to make geoip conversions
- *		\version	$Id$
+ *		\version	$Id: modGeoIPMaxmind.class.php,v 1.6 2011/07/31 23:28:12 eldy Exp $
  */
 
 /**
diff --git a/htdocs/includes/modules/modGravatar.class.php b/htdocs/includes/modules/modGravatar.class.php
index 8240e96e469..6902b3b0b16 100644
--- a/htdocs/includes/modules/modGravatar.class.php
+++ b/htdocs/includes/modules/modGravatar.class.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**     \defgroup   gravatar     Module gravatar
@@ -25,7 +24,7 @@
  *      \file       htdocs/includes/modules/modGravatar.class.php
  *      \ingroup    gravatar
  *      \brief      Description and activation file for module Gravatar
- *		\version	$Id$
+ *		\version	$Id: modGravatar.class.php,v 1.10 2011/07/31 23:28:12 eldy Exp $
  */
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
 
diff --git a/htdocs/includes/modules/modImport.class.php b/htdocs/includes/modules/modImport.class.php
index 2e51a01c807..dd9f8e3ad7d 100644
--- a/htdocs/includes/modules/modImport.class.php
+++ b/htdocs/includes/modules/modImport.class.php
@@ -13,13 +13,12 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**     \defgroup   import      Module import
  *		\brief      Module to make generic import of data into dolibarr database
- *		\version	$Id$
+ *		\version	$Id: modImport.class.php,v 1.21 2011/07/31 23:28:12 eldy Exp $
  */
 
 /**
diff --git a/htdocs/includes/modules/modLdap.class.php b/htdocs/includes/modules/modLdap.class.php
index a8158126919..a5b042af300 100644
--- a/htdocs/includes/modules/modLdap.class.php
+++ b/htdocs/includes/modules/modLdap.class.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -27,7 +26,7 @@
  *	\file       htdocs/includes/modules/modLdap.class.php
  *	\ingroup    ldap
  *	\brief      Fichier de description et activation du module Ldap
- *	\version	$Id$
+ *	\version	$Id: modLdap.class.php,v 1.35 2011/07/31 23:28:12 eldy Exp $
  */
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
 
diff --git a/htdocs/includes/modules/modMantis.class.php b/htdocs/includes/modules/modMantis.class.php
index 9895c2a9fc6..bcca85b6946 100644
--- a/htdocs/includes/modules/modMantis.class.php
+++ b/htdocs/includes/modules/modMantis.class.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**     \defgroup   mantis     Module mantis
@@ -25,7 +24,7 @@
         \file       htdocs/includes/modules/modMantis.class.php
         \ingroup    mantis
         \brief      Description and activation file for module Mantis
-		\version	$Id$
+		\version	$Id: modMantis.class.php,v 1.16 2011/07/31 23:28:10 eldy Exp $
 */
 
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
diff --git a/htdocs/includes/modules/modNotification.class.php b/htdocs/includes/modules/modNotification.class.php
index dc96477db54..f1f7a764541 100644
--- a/htdocs/includes/modules/modNotification.class.php
+++ b/htdocs/includes/modules/modNotification.class.php
@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\defgroup   notification	Module email notification
  *	\brief      Module pour gerer les notifications (par mail ou autre)
- *	\version	$Id$
+ *	\version	$Id: modNotification.class.php,v 1.15 2011/07/31 23:28:12 eldy Exp $
  */
 
 /**
diff --git a/htdocs/includes/modules/modPaybox.class.php b/htdocs/includes/modules/modPaybox.class.php
index ce586ac0177..f23934f6d5b 100644
--- a/htdocs/includes/modules/modPaybox.class.php
+++ b/htdocs/includes/modules/modPaybox.class.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**     \defgroup   paybox     Module paybox
@@ -25,7 +24,7 @@
  *      \file       htdocs/includes/modules/modPaybox.class.php
  *      \ingroup    paybox
  *      \brief      Description and activation file for module Paybox
- *		\version	$Id$
+ *		\version	$Id: modPaybox.class.php,v 1.20 2011/07/31 23:28:11 eldy Exp $
  */
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
 
diff --git a/htdocs/includes/modules/modPaypal.class.php b/htdocs/includes/modules/modPaypal.class.php
index 715886d2b50..79e748cec63 100644
--- a/htdocs/includes/modules/modPaypal.class.php
+++ b/htdocs/includes/modules/modPaypal.class.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**     \defgroup   paypal     Module paypal
@@ -26,7 +25,7 @@
  *      \file       htdocs/includes/modules/modPaypal.class.php
  *      \ingroup    paypal
  *      \brief      Description and activation file for module Paypal
- *		\version	$Id$
+ *		\version	$Id: modPaypal.class.php,v 1.12 2011/07/31 23:28:12 eldy Exp $
  */
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
 
diff --git a/htdocs/includes/modules/modPrelevement.class.php b/htdocs/includes/modules/modPrelevement.class.php
index 059c6ca4d80..cfa5caed448 100644
--- a/htdocs/includes/modules/modPrelevement.class.php
+++ b/htdocs/includes/modules/modPrelevement.class.php
@@ -15,14 +15,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\defgroup   	prelevement     Module prelevement
  *	\brief      	Module de gestion des prelevements bancaires
- *	\version		$Id$
+ *	\version		$Id: modPrelevement.class.php,v 1.42 2011/07/31 23:28:10 eldy Exp $
  */
 
 /**
diff --git a/htdocs/includes/modules/modProduct.class.php b/htdocs/includes/modules/modProduct.class.php
index 360e5a518c1..3c38ded4c84 100644
--- a/htdocs/includes/modules/modProduct.class.php
+++ b/htdocs/includes/modules/modProduct.class.php
@@ -16,14 +16,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\defgroup   produit     Module products
  *	\brief      Module pour gerer le suivi de produits predefinis
- *	\version	$Id$
+ *	\version	$Id: modProduct.class.php,v 1.13 2011/07/31 23:28:12 eldy Exp $
  */
 
 /**
diff --git a/htdocs/includes/modules/modProjet.class.php b/htdocs/includes/modules/modProjet.class.php
index 7da6f774870..d35814ac94c 100644
--- a/htdocs/includes/modules/modProjet.class.php
+++ b/htdocs/includes/modules/modProjet.class.php
@@ -16,14 +16,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \defgroup   projet     Module project
  *	\brief      Module to create projects/tasks/gantt diagram. Projects can them be affected to tasks.
- * 	\version	$Id$
+ * 	\version	$Id: modProjet.class.php,v 1.43 2011/07/31 23:28:10 eldy Exp $
  */
 
 /**
diff --git a/htdocs/includes/modules/modPropale.class.php b/htdocs/includes/modules/modPropale.class.php
index 698982e0622..9d93d70cb45 100644
--- a/htdocs/includes/modules/modPropale.class.php
+++ b/htdocs/includes/modules/modPropale.class.php
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -29,7 +28,7 @@
  *	\file       htdocs/includes/modules/modPropale.class.php
  *	\ingroup    propale
  *	\brief      Fichier de description et activation du module Propale
- * 	\version	$Id$
+ * 	\version	$Id: modPropale.class.php,v 1.78 2011/07/31 23:28:11 eldy Exp $
  */
 
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
diff --git a/htdocs/includes/modules/modService.class.php b/htdocs/includes/modules/modService.class.php
index 7a0a51ec6e8..18ef64894f1 100644
--- a/htdocs/includes/modules/modService.class.php
+++ b/htdocs/includes/modules/modService.class.php
@@ -16,10 +16,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: modService.class.php,v 1.51 2011/07/31 23:28:10 eldy Exp $
  */
 
 /**
diff --git a/htdocs/includes/modules/modSociete.class.php b/htdocs/includes/modules/modSociete.class.php
index 373b3ba3a5c..6adaa84391d 100644
--- a/htdocs/includes/modules/modSociete.class.php
+++ b/htdocs/includes/modules/modSociete.class.php
@@ -16,14 +16,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\defgroup   societe     Module societe
  *	\brief      Module to manage third parties (customers, prospects)
- *	\version	$Id: modSociete.class.php,v 1.118 2011/07/01 23:07:26 eldy Exp $
+ *	\version	$Id: modSociete.class.php,v 1.119 2011/07/31 23:28:10 eldy Exp $
  */
 
 /**
diff --git a/htdocs/includes/modules/modStock.class.php b/htdocs/includes/modules/modStock.class.php
index 2a6aff8a3f1..d8aab3caea5 100644
--- a/htdocs/includes/modules/modStock.class.php
+++ b/htdocs/includes/modules/modStock.class.php
@@ -14,14 +14,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\defgroup   	stock     Module stocks
  *	\brief      	Module pour gerer la tenue de stocks produits
- *	\version		$Id$
+ *	\version		$Id: modStock.class.php,v 1.36 2011/07/31 23:28:11 eldy Exp $
  */
 
 /**
diff --git a/htdocs/includes/modules/modSyslog.class.php b/htdocs/includes/modules/modSyslog.class.php
index 58322541dc6..f5445198513 100644
--- a/htdocs/includes/modules/modSyslog.class.php
+++ b/htdocs/includes/modules/modSyslog.class.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/includes/modules/modUser.class.php b/htdocs/includes/modules/modUser.class.php
index c7284b0697d..e3c055bc212 100644
--- a/htdocs/includes/modules/modUser.class.php
+++ b/htdocs/includes/modules/modUser.class.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/includes/modules/modWebServices.class.php b/htdocs/includes/modules/modWebServices.class.php
index 1b46f951ed4..14753f19a95 100644
--- a/htdocs/includes/modules/modWebServices.class.php
+++ b/htdocs/includes/modules/modWebServices.class.php
@@ -12,14 +12,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \defgroup   webservices     Module webservices
  *      \brief      Module to enable the Dolibarr server of web services
- *		\brief		$Id$
+ *		\brief		$Id: modWebServices.class.php,v 1.7 2011/07/31 23:28:10 eldy Exp $
 */
 
 /**
diff --git a/htdocs/includes/modules/modWorkflow.class.php b/htdocs/includes/modules/modWorkflow.class.php
index 7945634a1c9..42780551928 100644
--- a/htdocs/includes/modules/modWorkflow.class.php
+++ b/htdocs/includes/modules/modWorkflow.class.php
@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \defgroup   workflow     Module workflow
  *      \brief      Workflow management
- *      \version    $Id$
+ *      \version    $Id: modWorkflow.class.php,v 1.10 2011/07/31 23:28:10 eldy Exp $
  */
 
 /**
diff --git a/htdocs/includes/modules/project/mod_project_simple.php b/htdocs/includes/modules/project/mod_project_simple.php
index a5def662410..d701e142e4d 100644
--- a/htdocs/includes/modules/project/mod_project_simple.php
+++ b/htdocs/includes/modules/project/mod_project_simple.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +21,7 @@
  *	\file       htdocs/includes/modules/project/mod_project_simple.php
  *	\ingroup    project
  *	\brief      File with class to manage the numbering module Simple for project references
- *	\version    $Id$
+ *	\version    $Id: mod_project_simple.php,v 1.6 2011/07/31 23:28:09 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/project/modules_project.php");
diff --git a/htdocs/includes/modules/project/mod_project_universal.php b/htdocs/includes/modules/project/mod_project_universal.php
index 7df265565f2..1b79f0bdcc1 100644
--- a/htdocs/includes/modules/project/mod_project_universal.php
+++ b/htdocs/includes/modules/project/mod_project_universal.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +20,7 @@
  *	\file       htdocs/includes/modules/project/mod_project_universal.php
  *	\ingroup    project
  *	\brief      Fichier contenant la classe du modele de numerotation de reference de projet Universal
- *	\version    $Id$
+ *	\version    $Id: mod_project_universal.php,v 1.4 2011/07/31 23:28:09 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/project/modules_project.php");
diff --git a/htdocs/includes/modules/project/modules_project.php b/htdocs/includes/modules/project/modules_project.php
index 868ddf3a3f9..983418c0854 100644
--- a/htdocs/includes/modules/project/modules_project.php
+++ b/htdocs/includes/modules/project/modules_project.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +21,7 @@
  *      \ingroup    project
  *      \brief      File that contain parent class for projects models
  *                  and parent class for projects numbering models
- *      \version    $Id$
+ *      \version    $Id: modules_project.php,v 1.12 2011/07/31 23:28:09 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
 require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php');
diff --git a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php b/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php
index a8483b52240..fb253da1e8f 100644
--- a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php
+++ b/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +21,7 @@
  *	\ingroup    project
  *	\brief      Fichier de la classe permettant de generer les projets au modele Baleine
  *	\author	    Regis Houssin
- *	\version    $Id$
+ *	\version    $Id: pdf_baleine.modules.php,v 1.39 2011/07/31 23:28:18 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/project/modules_project.php");
diff --git a/htdocs/includes/modules/propale/mod_propale_marbre.php b/htdocs/includes/modules/propale/mod_propale_marbre.php
index 10064267c70..3e2ef70cb12 100644
--- a/htdocs/includes/modules/propale/mod_propale_marbre.php
+++ b/htdocs/includes/modules/propale/mod_propale_marbre.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +21,7 @@
  *    	\file       htdocs/includes/modules/propale/mod_propale_marbre.php
  *		\ingroup    propale
  *		\brief      File of class to manage commercial proposal numbering rules Marbre
- *		\version    $Id$
+ *		\version    $Id: mod_propale_marbre.php,v 1.28 2011/07/31 23:28:16 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/modules_propale.php");
diff --git a/htdocs/includes/modules/propale/mod_propale_saphir.php b/htdocs/includes/modules/propale/mod_propale_saphir.php
index 4c78a7134c9..957a57c0126 100644
--- a/htdocs/includes/modules/propale/mod_propale_saphir.php
+++ b/htdocs/includes/modules/propale/mod_propale_saphir.php
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -24,7 +23,7 @@
 	\file       htdocs/includes/modules/propale/mod_propale_saphir.php
 	\ingroup    propale
 	\brief      File that contains the numbering module rules Saphir
-	\version    $Id$
+	\version    $Id: mod_propale_saphir.php,v 1.28 2011/07/31 23:28:16 eldy Exp $
 */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/modules_propale.php");
diff --git a/htdocs/includes/modules/propale/modules_propale.php b/htdocs/includes/modules/propale/modules_propale.php
index b4572034c3a..972db7bd3e8 100644
--- a/htdocs/includes/modules/propale/modules_propale.php
+++ b/htdocs/includes/modules/propale/modules_propale.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -24,7 +23,7 @@
  *  \ingroup    propale
  *  \brief      Fichier contenant la classe mere de generation des propales en PDF
  *  			et la classe mere de numerotation des propales
- *	\version    $Id: modules_propale.php,v 1.62 2011/07/04 10:35:49 hregis Exp $
+ *	\version    $Id: modules_propale.php,v 1.63 2011/07/31 23:28:16 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
index c39973fd7a8..f0803e92621 100644
--- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -25,7 +24,7 @@
  *	\ingroup    propale
  *	\brief      Fichier de la classe permettant de generer les propales au modele Azur
  *	\author	    Laurent Destailleur
- *	\version    $Id$
+ *	\version    $Id: pdf_propale_azur.modules.php,v 1.243 2011/07/31 23:28:16 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.php");
 require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
index a00ed488846..4014979dae0 100644
--- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -24,7 +23,7 @@
  * 	\file       htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
  *	\ingroup    propale
  *	\brief      Fichier de la classe permettant de generer les propales au modele Jaune
- *	\version    $Id$
+ *	\version    $Id: pdf_propale_jaune.modules.php,v 1.117 2011/07/31 23:28:16 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/modules_propale.php");
diff --git a/htdocs/includes/modules/rapport/pdf_paiement.class.php b/htdocs/includes/modules/rapport/pdf_paiement.class.php
index 79bcae814e3..51fd1d8b23b 100644
--- a/htdocs/includes/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/includes/modules/rapport/pdf_paiement.class.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +21,7 @@
  *	\file       htdocs/includes/modules/rapport/pdf_paiement.class.php
  *	\ingroup    banque
  *	\brief      File to build payment reports
- *	\version    $Id$
+ *	\version    $Id: pdf_paiement.class.php,v 1.64 2011/07/31 23:28:13 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
 require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php');
diff --git a/htdocs/includes/modules/security/generate/modGeneratePassNone.class.php b/htdocs/includes/modules/security/generate/modGeneratePassNone.class.php
index e3a1d8acbcf..26e7cb02953 100644
--- a/htdocs/includes/modules/security/generate/modGeneratePassNone.class.php
+++ b/htdocs/includes/modules/security/generate/modGeneratePassNone.class.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +20,7 @@
  *      \file       htdocs/includes/modules/security/generate/modGeneratePassNone.class.php
  *      \ingroup    core
  *      \brief      File to manage no password generation.
- *		\version	$Id$
+ *		\version	$Id: modGeneratePassNone.class.php,v 1.7 2011/07/31 23:28:16 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/security/generate/modules_genpassword.php");
diff --git a/htdocs/includes/modules/security/generate/modGeneratePassStandard.class.php b/htdocs/includes/modules/security/generate/modGeneratePassStandard.class.php
index 6437181d229..292bc4ff19a 100644
--- a/htdocs/includes/modules/security/generate/modGeneratePassStandard.class.php
+++ b/htdocs/includes/modules/security/generate/modGeneratePassStandard.class.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +20,7 @@
  *      \file       htdocs/includes/modules/security/generate/modGeneratePassStandard.class.php
  *      \ingroup    core
  *		\brief      File to manage password generation according to standard rule
- *		\version	$Id$
+ *		\version	$Id: modGeneratePassStandard.class.php,v 1.10 2011/07/31 23:28:16 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/security/generate/modules_genpassword.php");
diff --git a/htdocs/includes/modules/security/generate/modules_genpassword.php b/htdocs/includes/modules/security/generate/modules_genpassword.php
index a326d8c40c0..c39d6e38d46 100644
--- a/htdocs/includes/modules/security/generate/modules_genpassword.php
+++ b/htdocs/includes/modules/security/generate/modules_genpassword.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +20,7 @@
  *		\file       htdocs/includes/modules/security/generate/modules_genpassword.php
  *		\ingroup    core
  *		\brief      File with parent class for password generating classes
- *		\version    $Id$
+ *		\version    $Id: modules_genpassword.php,v 1.7 2011/07/31 23:28:16 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php');
 
diff --git a/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php
index ed1a94bbe49..65e9a1ddd06 100644
--- a/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php
@@ -22,7 +22,7 @@
  *	\ingroup    societe
  *	\brief      File of class to build ODT documents for third parties
  *	\author	    Laurent Destailleur
- *	\version    $Id$
+ *	\version    $Id: doc_generic_odt.modules.php,v 1.32 2011/07/21 22:54:35 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php");
@@ -115,37 +115,9 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
 		// Add list of substitution keys
 		$texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
-        /*$dummy=new User($db);
-        $tmparray=$this->get_substitutionarray_user($dummy,$langs);
-        $nb=0;
-        foreach($tmparray as $key => $val)
-        {
-            $texthelp.='{'.$key.'}<br>';
-            $nb++;
-            if ($nb >= 5) { $texthelp.='...<br>'; break; }
-        }
-		$dummy=new Societe($db);
-		$tmparray=$this->get_substitutionarray_mysoc($dummy,$langs);
-		$nb=0;
-		foreach($tmparray as $key => $val)
-		{
-			$texthelp.='{'.$key.'}<br>';
-			$nb++;
-			if ($nb >= 5) { $texthelp.='...<br>'; break; }
-		}
-		$tmparray=$this->get_substitutionarray_thirdparty($dummy,$langs);
-		$nb=0;
-		foreach($tmparray as $key => $val)
-		{
-			$texthelp.='{'.$key.'}<br>';
-			$nb++;
-			if ($nb >= 5) { $texthelp.='...<br>'; break; }
-		}*/
-		$texthelp.=$langs->trans("FullListOnOnlineDocumentation");
-
-		$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help');
-		//var_dump($listofdir);
+		$texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation");    // This contains an url, we don't modify it
 
+		$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
         $texte.= '<table><tr><td>';
 		$texte.= '<textarea class="flat" cols="60" name="value1">';
 		$texte.=$conf->global->COMPANY_ADDON_PDF_ODT_PATH;
diff --git a/htdocs/includes/modules/societe/mod_codeclient_elephant.php b/htdocs/includes/modules/societe/mod_codeclient_elephant.php
index 103f791a6af..a000c4f4cb8 100644
--- a/htdocs/includes/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/includes/modules/societe/mod_codeclient_elephant.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +22,7 @@
  *       \file       htdocs/includes/modules/societe/mod_codeclient_elephant.php
  *       \ingroup    societe
  *       \brief      File of class to manage third party code with elephant rule
- *       \version    $Id$
+ *       \version    $Id: mod_codeclient_elephant.php,v 1.15 2011/07/31 23:28:14 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php");
diff --git a/htdocs/includes/modules/societe/mod_codeclient_leopard.php b/htdocs/includes/modules/societe/mod_codeclient_leopard.php
index 8a893403750..b0a22623423 100644
--- a/htdocs/includes/modules/societe/mod_codeclient_leopard.php
+++ b/htdocs/includes/modules/societe/mod_codeclient_leopard.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +21,7 @@
  *       \file       htdocs/includes/modules/societe/mod_codeclient_leopard.php
  *       \ingroup    societe
  *       \brief      Fichier de la classe des gestion leopard des codes clients
- *       \version    $Id$
+ *       \version    $Id: mod_codeclient_leopard.php,v 1.17 2011/07/31 23:28:14 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php");
diff --git a/htdocs/includes/modules/societe/mod_codeclient_monkey.php b/htdocs/includes/modules/societe/mod_codeclient_monkey.php
index 12bea62c76c..c5735dd63e0 100644
--- a/htdocs/includes/modules/societe/mod_codeclient_monkey.php
+++ b/htdocs/includes/modules/societe/mod_codeclient_monkey.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +21,7 @@
  *       \file       htdocs/includes/modules/societe/mod_codeclient_monkey.php
  *       \ingroup    societe
  *       \brief      Fichier de la classe des gestion lion des codes clients
- *       \version    $Id$
+ *       \version    $Id: mod_codeclient_monkey.php,v 1.11 2011/07/31 23:28:14 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php");
diff --git a/htdocs/includes/modules/societe/mod_codecompta_aquarium.php b/htdocs/includes/modules/societe/mod_codecompta_aquarium.php
index 26cc3507633..983a6835752 100644
--- a/htdocs/includes/modules/societe/mod_codecompta_aquarium.php
+++ b/htdocs/includes/modules/societe/mod_codecompta_aquarium.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +22,7 @@
  \file       htdocs/includes/modules/societe/mod_codecompta_aquarium.php
  \ingroup    societe
  \brief      Fichier de la classe des gestion aquarium des codes compta des societes clientes
- \version    $Id$
+ \version    $Id: mod_codecompta_aquarium.php,v 1.17 2011/07/31 23:28:14 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php");
diff --git a/htdocs/includes/modules/societe/mod_codecompta_digitaria.php b/htdocs/includes/modules/societe/mod_codecompta_digitaria.php
index bcd122b2268..b2a7b15a233 100644
--- a/htdocs/includes/modules/societe/mod_codecompta_digitaria.php
+++ b/htdocs/includes/modules/societe/mod_codecompta_digitaria.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +21,7 @@
  \file       htdocs/includes/modules/societe/mod_codecompta_digitaria.php
  \ingroup    societe
  \brief      Fichier de la classe des gestion digitaria des codes compta des societes clientes
- \version    $Id$
+ \version    $Id: mod_codecompta_digitaria.php,v 1.8 2011/07/31 23:28:14 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php");
diff --git a/htdocs/includes/modules/societe/mod_codecompta_panicum.php b/htdocs/includes/modules/societe/mod_codecompta_panicum.php
index 394d1b1333c..ea8a5ff5092 100644
--- a/htdocs/includes/modules/societe/mod_codecompta_panicum.php
+++ b/htdocs/includes/modules/societe/mod_codecompta_panicum.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +21,7 @@
  *      \file       htdocs/includes/modules/societe/mod_codecompta_panicum.php
  *      \ingroup    societe
  *      \brief      Fichier de la classe des gestion panicum des codes compta des societes clientes
- *      \version    $Id$
+ *      \version    $Id: mod_codecompta_panicum.php,v 1.8 2011/07/31 23:28:14 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php");
 
diff --git a/htdocs/includes/modules/societe/modules_societe.class.php b/htdocs/includes/modules/societe/modules_societe.class.php
index 02a0df5847b..4986daba8d2 100644
--- a/htdocs/includes/modules/societe/modules_societe.class.php
+++ b/htdocs/includes/modules/societe/modules_societe.class.php
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -24,7 +23,7 @@
  *	    \file       htdocs/includes/modules/societe/modules_societe.class.php
  *		\ingroup    societe
  *		\brief      Fichier contenant la classe mere de module de generation societes
- *		\version    $Id$
+ *		\version    $Id: modules_societe.class.php,v 1.28 2011/07/31 23:28:14 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php");
 
diff --git a/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php
index 9c78596cee1..2f9394d2c52 100755
--- a/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php
+++ b/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +20,7 @@
  *		\file       htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php
  *      \ingroup    facture fourniseur
  *      \brief      File that contain parent class for supplier invoices models
- *      \version    $Id$
+ *      \version    $Id: modules_facturefournisseur.php,v 1.9 2011/07/31 23:28:18 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
 require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php');
diff --git a/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php
index 3fdb683e06f..91e94490f7c 100755
--- a/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php
+++ b/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +21,7 @@
  *	\file       htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php
  *	\ingroup    fournisseur
  *	\brief      Class file to generate the supplier invoices with the canelle model
- *	\version    $Id$
+ *	\version    $Id: pdf_canelle.modules.php,v 1.35 2011/07/31 23:28:18 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/supplier_invoice/modules_facturefournisseur.php");
diff --git a/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_muguet.php b/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_muguet.php
index f9f4a16db5e..cb8af845411 100644
--- a/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_muguet.php
+++ b/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_muguet.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +21,7 @@
  *    	\file       htdocs/includes/modules/supplier_order/mod_commande_fournisseur_muguet.php
  *		\ingroup    commande
  *		\brief      Fichier contenant la classe du modele de numerotation de reference de commande fournisseur Muguet
- *		\version    $Id$
+ *		\version    $Id: mod_commande_fournisseur_muguet.php,v 1.8 2011/07/31 23:28:17 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/supplier_order/modules_commandefournisseur.php");
diff --git a/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php b/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php
index 7a5e68670dc..c0d09c2ca29 100644
--- a/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php
+++ b/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +22,7 @@
  *	\file       htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php
  *	\ingroup    commande
  *	\brief      Fichier contenant la classe du modele de numerotation de reference de commande fournisseur Orchidee
- *	\version    $Id$
+ *	\version    $Id: mod_commande_fournisseur_orchidee.php,v 1.9 2011/07/31 23:28:17 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/supplier_order/modules_commandefournisseur.php");
diff --git a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php b/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php
index 5bace6adcdb..a4e39b8a906 100644
--- a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php
+++ b/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -27,7 +26,7 @@
  *      \ingroup    commande
  *      \brief      File that contain parent class for supplier orders models
  *                  and parent class for supplier orders numbering models
- *      \version    $Id$
+ *      \version    $Id: modules_commandefournisseur.php,v 1.22 2011/07/31 23:28:17 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
 require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php');
diff --git a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
index ed520033d75..d856f6eb4d8 100644
--- a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -24,7 +23,7 @@
  *	\file       htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
  *	\ingroup    fournisseur
  *	\brief      Fichier de la classe permettant de generer les commandes fournisseurs au modele Muscadet
- *	\version    $Id$
+ *	\version    $Id: pdf_muscadet.modules.php,v 1.87 2011/07/31 23:28:13 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/supplier_order/modules_commandefournisseur.php");
diff --git a/htdocs/includes/triggers/interface_all_Demo.class.php-NORUN b/htdocs/includes/triggers/interface_all_Demo.class.php-NORUN
index 9ebf230b874..998fa45b7a0 100644
--- a/htdocs/includes/triggers/interface_all_Demo.class.php-NORUN
+++ b/htdocs/includes/triggers/interface_all_Demo.class.php-NORUN
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -28,7 +27,7 @@
  *                  - Le nom de la classe doit etre InterfaceMytrigger
  *                  - Le nom de la methode constructeur doit etre InterfaceMytrigger
  *                  - Le nom de la propriete name doit etre Mytrigger
- *		\version	$Id: interface_all_Demo.class.php-NORUN,v 1.29 2011/07/18 01:06:52 eldy Exp $
+ *		\version	$Id: interface_all_Demo.class.php-NORUN,v 1.30 2011/07/31 23:29:46 eldy Exp $
  */
 
 
diff --git a/htdocs/includes/triggers/interface_all_Logevents.class.php b/htdocs/includes/triggers/interface_all_Logevents.class.php
index f6b93f30b91..c0050318cb2 100644
--- a/htdocs/includes/triggers/interface_all_Logevents.class.php
+++ b/htdocs/includes/triggers/interface_all_Logevents.class.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/includes/triggers/interface_all_Logevents.class.php
  *      \ingroup    core
  *      \brief      Trigger file for
- *		\version	$Id: interface_all_Logevents.class.php,v 1.22 2011/07/18 01:06:52 eldy Exp $
+ *		\version	$Id: interface_all_Logevents.class.php,v 1.23 2011/07/31 23:29:45 eldy Exp $
  */
 
 
diff --git a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php b/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
index 5dced7f834f..de668c26a2a 100644
--- a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
+++ b/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
  *  \ingroup    agenda
  *  \brief      Trigger file for agenda module
- *	\version	$Id: interface_modAgenda_ActionsAuto.class.php,v 1.35 2011/07/18 01:06:52 eldy Exp $
+ *	\version	$Id: interface_modAgenda_ActionsAuto.class.php,v 1.36 2011/07/31 23:29:46 eldy Exp $
  */
 
 
diff --git a/htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php b/htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php
index 2eddf0743b5..db210aa2e33 100644
--- a/htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php
+++ b/htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php
  *      \ingroup    core
  *      \brief      Fichier de gestion des triggers LDAP
- *		\version	$Id: interface_modLdap_Ldapsynchro.class.php,v 1.19 2011/07/18 01:06:52 eldy Exp $
+ *		\version	$Id: interface_modLdap_Ldapsynchro.class.php,v 1.20 2011/07/31 23:29:46 eldy Exp $
  */
 require_once (DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
 
diff --git a/htdocs/includes/triggers/interface_modNotification_Notification.class.php b/htdocs/includes/triggers/interface_modNotification_Notification.class.php
index 1beddcdd750..175bee38fed 100644
--- a/htdocs/includes/triggers/interface_modNotification_Notification.class.php
+++ b/htdocs/includes/triggers/interface_modNotification_Notification.class.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/includes/triggers/interface_modNotification_Notification.class.php
  *      \ingroup    notification
  *      \brief      File of class of triggers for notification module
- *		\version	$Id: interface_modNotification_Notification.class.php,v 1.25 2011/07/18 01:06:52 eldy Exp $
+ *		\version	$Id: interface_modNotification_Notification.class.php,v 1.26 2011/07/31 23:29:45 eldy Exp $
  */
 
 
diff --git a/htdocs/includes/triggers/interface_modPaypal_PaypalWorkflow.class.php b/htdocs/includes/triggers/interface_modPaypal_PaypalWorkflow.class.php
index 5df064f29d1..65091bd3338 100644
--- a/htdocs/includes/triggers/interface_modPaypal_PaypalWorkflow.class.php
+++ b/htdocs/includes/triggers/interface_modPaypal_PaypalWorkflow.class.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       /htdocs/includes/triggers/interface_modPaypal_PaypalWorkflow.class.php
  *      \ingroup    paypal
  *      \brief      Trigger file for paypal workflow
- *      \version	$Id: interface_modPaypal_PaypalWorkflow.class.php,v 1.7 2011/07/08 15:43:54 eldy Exp $
+ *      \version	$Id: interface_modPaypal_PaypalWorkflow.class.php,v 1.8 2011/07/31 23:29:46 eldy Exp $
  */
 
 
diff --git a/htdocs/includes/triggers/interface_modWorkflow_WorkflowManager.class.php b/htdocs/includes/triggers/interface_modWorkflow_WorkflowManager.class.php
index c9adba34d05..61b21f3b761 100755
--- a/htdocs/includes/triggers/interface_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/includes/triggers/interface_modWorkflow_WorkflowManager.class.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/includes/triggers/interface_modWorkflow_WorkflowManager.class.php
  *      \ingroup    core
  *      \brief      Trigger file for workflows
- *      \version	$Id: interface_modWorkflow_WorkflowManager.class.php,v 1.7 2011/07/18 01:06:52 eldy Exp $
+ *      \version	$Id: interface_modWorkflow_WorkflowManager.class.php,v 1.8 2011/07/31 23:29:45 eldy Exp $
  */
 
 
diff --git a/htdocs/index.php b/htdocs/index.php
index 5d371704e6b..5998094d362 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -21,7 +21,7 @@
 /**
  *	\file       htdocs/index.php
  *	\brief      Dolibarr home page
- *	\version    $Id: index.php,v 1.198 2011/07/08 15:35:08 eldy Exp $
+ *	\version    $Id: index.php,v 1.199 2011/07/30 10:23:24 eldy Exp $
  */
 
 define('NOCSRFCHECK',1);	// This is login page. We must be able to go on it from another web site.
@@ -555,7 +555,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING))
     }
 
     // Conf files must be in read only mode
-    if (is_writable(DOL_DOCUMENT_ROOT.'/conf/conf.php'))
+    if (is_writable($conffile))
     {
         $langs->load("errors");
         $langs->load("other");
@@ -574,7 +574,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING))
 
 $db->close();
 
-llxFooter('$Date: 2011/07/08 15:35:08 $ - $Revision: 1.198 $');
+llxFooter('$Date: 2011/07/30 10:23:24 $ - $Revision: 1.199 $');
 
 
 /**
diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 9de8cdf662d..3724ef23d95 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -23,7 +23,7 @@
  *	\file       htdocs/install/check.php
  *	\ingroup    install
  *	\brief      Test if file conf can be modified and if does not exists, test if install process can create it
- *	\version    $Id: check.php,v 1.84 2011/07/12 20:52:41 eldy Exp $
+ *	\version    $Id: check.php,v 1.86 2011/07/30 14:56:43 eldy Exp $
  */
 include_once("./inc.php");
 
@@ -39,7 +39,9 @@ $langs->load("install");
 
 // Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard.
 if (! isset($force_install_dolibarrlogin))     $force_install_dolibarrlogin='';
-if (file_exists("./install.forced.php")) include_once("./install.forced.php");
+$useforcedwizard=false;
+if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); }
+else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); }
 
 dolibarr_install_syslog("Dolibarr install/upgrade process started");
 
@@ -214,10 +216,9 @@ else
 // Si fichier absent et n'a pu etre cree
 if (! file_exists($conffile))
 {
-	//print '<img src="../theme/eldy/img/error.png" alt="Error"> '.$langs->trans("ConfFileDoesNotExistsAndCouldNotBeCreated",$conffile);
-	print '<img src="../theme/eldy/img/error.png" alt="Error"> '.$langs->trans("ConfFileDoesNotExistsAndCouldNotBeCreated",'conf.php');
+	print '<img src="../theme/eldy/img/error.png" alt="Error"> '.$langs->trans("ConfFileDoesNotExistsAndCouldNotBeCreated",$conffiletoshow);
 	print "<br><br>";
-	print $langs->trans("YouMustCreateWithPermission",'htdocs/conf/conf.php');
+	print $langs->trans("YouMustCreateWithPermission",$conffiletoshow);
 	print "<br><br>";
 
 	print $langs->trans("CorrectProblemAndReloadPage",$_SERVER['PHP_SELF'].'?testget=ok');
@@ -230,14 +231,14 @@ else
 	{
 		if ($confexists)
 		{
-			print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileExists",'conf.php');
+			print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileExists",$conffiletoshow);
 		}
 		else
 		{
-			print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileCouldBeCreated",'conf.php');
+			print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileCouldBeCreated",$conffiletoshow);
 		}
 		print "<br>";
-		print '<img src="../theme/eldy/img/tick.png" alt="Warning"> '.$langs->trans("ConfFileIsNotWritable",'htdocs/conf/conf.php');
+		print '<img src="../theme/eldy/img/tick.png" alt="Warning"> '.$langs->trans("ConfFileIsNotWritable",$conffiletoshow);
 		print "<br>\n";
 
 		$allowinstall=0;
@@ -247,14 +248,14 @@ else
 	{
 		if ($confexists)
 		{
-			print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileExists",'conf.php');
+			print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileExists",$conffiletoshow);
 		}
 		else
 		{
-			print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileCouldBeCreated",'conf.php');
+			print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileCouldBeCreated",$conffiletoshow);
 		}
 		print "<br>";
-		print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileIsWritable",'conf.php');
+		print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileIsWritable",$conffiletoshow);
 		print "<br>\n";
 
 		$allowinstall=1;
@@ -274,8 +275,8 @@ else
 			{
 				if (! file_exists($dolibarr_main_document_root."/lib/admin.lib.php"))
 				{
-				    print '<font class="error">A conf.php file exists with a dolibarr_main_document_root to '.$dolibarr_main_document_root.' that seems wrong. Try to fix or remove the conf.php file.</font><br>'."\n";
-				    dol_syslog("A conf.php file exists with a dolibarr_main_document_root to ".$dolibarr_main_document_root." that seems wrong. Try to fix or remove the conf.php file.", LOG_WARNING);
+				    print '<font class="error">A '.$conffiletoshow.' file exists with a dolibarr_main_document_root to '.$dolibarr_main_document_root.' that seems wrong. Try to fix or remove the '.$conffiletoshow.' file.</font><br>'."\n";
+				    dol_syslog("A '.$conffiletoshow.' file exists with a dolibarr_main_document_root to ".$dolibarr_main_document_root." that seems wrong. Try to fix or remove the '.$conffiletoshow.' file.", LOG_WARNING);
 				}
 				else
 				{
diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php
index 9988ca42ab2..20ef1080e85 100644
--- a/htdocs/install/etape0.php
+++ b/htdocs/install/etape0.php
@@ -22,7 +22,7 @@
  *	\file       htdocs/install/etape0.php
  *	\ingroup	install
  *	\brief      Show and ask charset for database
- *	\version    $Id$
+ *	\version    $Id: etape0.php,v 1.41 2011/07/30 14:56:43 eldy Exp $
  */
 
 define('DONOTLOADCONF',1);	// To avoid loading conf by file inc.php
@@ -49,7 +49,9 @@ $passroot=isset($_POST["db_pass_root"])?$_POST["db_pass_root"]:"";
 $main_dir=isset($_POST["main_dir"])?trim($_POST["main_dir"]):'';
 
 // Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard.
-if (file_exists("./install.forced.php")) include_once("./install.forced.php");
+$useforcedwizard=false;
+if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); }
+else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); }
 
 dolibarr_install_syslog("--- etape0: Entering etape0.php page");
 
@@ -63,7 +65,7 @@ pHeader($langs->trans("ConfigurationFile"),"etape1");
 // Test if we can run a first install process
 if (! is_writable($conffile))
 {
-    print $langs->trans("ConfFileIsNotWritable",'htdocs/conf/conf.php');
+    print $langs->trans("ConfFileIsNotWritable",$conffiletoshow);
     pFooter(1,$setuplang,'jscheckparam');
     exit;
 }
diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php
index fcde2204145..5d7fca530f2 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/etape1.php
@@ -24,7 +24,7 @@
  *		\file       htdocs/install/etape1.php
  *		\ingroup	install
  *		\brief      Build conf file on disk
- *		\version    $Id$
+ *		\version    $Id: etape1.php,v 1.135 2011/07/30 14:56:42 eldy Exp $
  */
 
 define('DONOTLOADCONF',1);	// To avoid loading conf by file inc.php
@@ -39,7 +39,9 @@ $langs->load("admin");
 $langs->load("install");
 
 // Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard.
-if (file_exists("./install.forced.php")) include_once("./install.forced.php");
+$useforcedwizard=false;
+if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); }
+else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); }
 
 dolibarr_install_syslog("--- etape1: Entering etape1.php page");
 
@@ -53,7 +55,7 @@ pHeader($langs->trans("ConfigurationFile"),"etape2");
 // Test if we can run a first install process
 if (! is_writable($conffile))
 {
-    print $langs->trans("ConfFileIsNotWritable",'htdocs/conf/conf.php');
+    print $langs->trans("ConfFileIsNotWritable",$conffiletoshow);
     pFooter(1,$setuplang,'jscheckparam');
     exit;
 }
@@ -526,6 +528,7 @@ function write_conf_file($conffile)
 	global $dolibarr_main_url_root,$dolibarr_main_document_root,$dolibarr_main_data_root,$dolibarr_main_db_host;
 	global $dolibarr_main_db_port,$dolibarr_main_db_name,$dolibarr_main_db_user,$dolibarr_main_db_pass;
 	global $dolibarr_main_db_type,$dolibarr_main_db_character_set,$dolibarr_main_db_collation,$dolibarr_main_authentication;
+    global $conffile,$conffiletoshow,$conffiletoshowshort;
 
 	$error=0;
 
@@ -542,7 +545,7 @@ function write_conf_file($conffile)
 		fputs($fp,"# File generated by Dolibarr installer ".DOL_VERSION." on ".dol_print_date(dol_now(),''));
 		fputs($fp,"\n");
 		fputs($fp,"#\n");
-		fputs($fp,"# Take a look at conf.php.example file for an example of conf.php file\n");
+		fputs($fp,"# Take a look at conf.php.example file for an example of ".$conffiletoshowshort." file\n");
 		fputs($fp,"# and explanations for all possibles parameters.\n");
 		fputs($fp,"#\n");
 
diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php
index c7db541859f..d7df4ac6929 100644
--- a/htdocs/install/etape2.php
+++ b/htdocs/install/etape2.php
@@ -21,7 +21,7 @@
  *      \file       htdocs/install/etape2.php
  *		\ingroup	install
  *      \brief      Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data
- *      \version    $Id$
+ *      \version    $Id: etape2.php,v 1.105 2011/07/30 14:56:43 eldy Exp $
  */
 
 include("./inc.php");
@@ -54,7 +54,9 @@ if ($dolibarr_main_db_type == "pgsql")  $choix=2;
 if ($dolibarr_main_db_type == "mssql")  $choix=3;
 
 // Init "forced values" to nothing. "forced values" are used after a Doliwamp install wizard.
-if (file_exists("./install.forced.php")) include_once("./install.forced.php");
+$useforcedwizard=false;
+if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); }
+else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); }
 
 dolibarr_install_syslog("--- etape2: Entering etape2.php page");
 
@@ -68,7 +70,7 @@ pHeader($langs->trans("CreateDatabaseObjects"),"etape4");
 // Test if we can run a first install process
 if (! is_writable($conffile))
 {
-    print $langs->trans("ConfFileIsNotWritable",'htdocs/conf/conf.php');
+    print $langs->trans("ConfFileIsNotWritable",$conffiletoshow);
     pFooter(1,$setuplang,'jscheckparam');
     exit;
 }
diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php
index 0ca30ba2bfc..9a0dd0fcc43 100644
--- a/htdocs/install/etape4.php
+++ b/htdocs/install/etape4.php
@@ -23,7 +23,7 @@
  *	\file       htdocs/install/etape4.php
  *	\ingroup	install
  *	\brief      Ask login and password of Dolibarr admin user
- *	\version    $Id$
+ *	\version    $Id: etape4.php,v 1.37 2011/07/30 14:56:43 eldy Exp $
  */
 
 
@@ -41,7 +41,9 @@ $langs->load("install");
 
 // Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard.
 if (! isset($force_install_dolibarrlogin))     $force_install_dolibarrlogin='';
-if (file_exists("./install.forced.php")) include_once("./install.forced.php");
+$useforcedwizard=false;
+if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); }
+else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); }
 
 dolibarr_install_syslog("--- etape4: Entering etape4.php page");
 
@@ -59,7 +61,7 @@ pHeader($langs->trans("AdminAccountCreation"),"etape5");
 // Test if we can run a first install process
 if (! is_writable($conffile))
 {
-    print $langs->trans("ConfFileIsNotWritable",'htdocs/conf/conf.php');
+    print $langs->trans("ConfFileIsNotWritable",$conffiletoshow);
     pFooter(1,$setuplang,'jscheckparam');
     exit;
 }
diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php
index 3c8d66f9472..0037190af06 100644
--- a/htdocs/install/etape5.php
+++ b/htdocs/install/etape5.php
@@ -24,7 +24,7 @@
  *       \file      htdocs/install/etape5.php
  *	 	 \ingroup	install
  *       \brief     Last page of upgrade or install process
- *       \version   $Id: etape5.php,v 1.102 2011/07/17 18:13:44 eldy Exp $
+ *       \version   $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $
  */
 
 include_once("./inc.php");
@@ -63,12 +63,9 @@ if (! isset($force_install_databasepass))      $force_install_databasepass='';
 if (! isset($force_install_databaserootlogin)) $force_install_databaserootlogin='';
 if (! isset($force_install_databaserootpass))  $force_install_databaserootpass='';
 if (! isset($force_install_lockinstall))       $force_install_lockinstall='';
-$usedoliwamp=false;
-if (file_exists("./install.forced.php"))
-{
-	$usedoliwamp=true;
-	include_once("./install.forced.php");
-}
+$useforcedwizard=false;
+if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); }
+else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); }
 
 dolibarr_install_syslog("--- etape5: Entering etape5.php page", LOG_INFO);
 
@@ -105,11 +102,12 @@ if ($action == "set")
  */
 
 pHeader($langs->trans("SetupEnd"),"etape5");
+print '<br>';
 
 // Test if we can run a first install process
 if (! GETPOST("versionfrom") && ! GETPOST("versionto") && ! is_writable($conffile))
 {
-    print $langs->trans("ConfFileIsNotWritable",'htdocs/conf/conf.php');
+    print $langs->trans("ConfFileIsNotWritable",$conffiletoshow);
     pFooter(1,$setuplang,'jscheckparam');
     exit;
 }
@@ -208,7 +206,7 @@ if ($action == "set" || preg_match('/upgrade/i',$action))
 				if (! $resql) dol_print_error($db,'Error in setup program');
 				$conf->global->MAIN_VERSION_LAST_INSTALL=$targetversion;
 
-				if ($usedoliwamp)
+				if ($useforcedwizard)
 				{
 					dolibarr_install_syslog('install/etape5.php set MAIN_REMOVE_INSTALL_WARNING const to 1', LOG_DEBUG);
 					$resql=$db->query("DELETE FROM llx_const WHERE ".$db->decrypt('name')."='MAIN_REMOVE_INSTALL_WARNING'");
@@ -317,7 +315,6 @@ if ($action == "set")
 		if (! empty($force_install_lockinstall))
 		{
 			// Install is finished, we create the lock file
-			$lockfile="../../install.lock";
 			$fp = @fopen($lockfile, "w");
 			if ($fp)
 			{
@@ -367,7 +364,6 @@ elseif (preg_match('/upgrade/i',$action))
 		if (! empty($force_install_lockinstall))
 		{
 			// Upgrade is finished, we create the lock file
-			$lockfile="../../install.lock";
 			$fp = @fopen($lockfile, "w");
 			if ($fp)
 			{
@@ -380,7 +376,7 @@ elseif (preg_match('/upgrade/i',$action))
 		}
 		if (empty($createlock))
 		{
-			print '<div class="warning">'.$langs->trans("WarningRemoveInstallDir")."</div>";
+			print '<br><div class="warning">'.$langs->trans("WarningRemoveInstallDir")."</div>";
 		}
 
 		print "<br>";
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 204960aa824..6d19b01e197 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -25,7 +25,7 @@
  *       \file       htdocs/install/fileconf.php
  *       \ingroup    install
  *       \brief      Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page)
- *       \version    $Id: fileconf.php,v 1.91 2011/06/26 01:52:59 eldy Exp $
+ *       \version    $Id: fileconf.php,v 1.93 2011/07/30 14:56:43 eldy Exp $
  */
 include_once("./inc.php");
 
@@ -39,8 +39,8 @@ $langs->load("install");
 $langs->load("errors");
 
 // You can force preselected values of the config step of Dolibarr by adding a file
-// install.forced.php into directory htdocs/install (This is the case with some installer
-// lile DoliWamp, DoliMamp or DoliBuntu.
+// install.forced.php into directory htdocs/install (This is the case with some wizard
+// installer like DoliWamp, DoliMamp or DoliBuntu).
 // We first init "forced values" to nothing.
 if (! isset($force_install_noedit))            $force_install_noedit='';
 if (! isset($force_install_type))              $force_install_type='';
@@ -53,7 +53,9 @@ if (! isset($force_install_databasepass))      $force_install_databasepass='';
 if (! isset($force_install_databaserootlogin)) $force_install_databaserootlogin='';
 if (! isset($force_install_databaserootpass))  $force_install_databaserootpass='';
 // Now we load forced value from install.forced.php file.
-if (file_exists("./install.forced.php")) include_once("./install.forced.php");
+$useforcedwizard=false;
+if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); }
+else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); }
 
 dolibarr_install_syslog("Fileconf: Entering fileconf.php page");
 
@@ -69,7 +71,7 @@ pHeader($langs->trans("ConfigurationFile"),"etape0");
 // Test if we can run a first install process
 if (! is_writable($conffile))
 {
-    print $langs->trans("ConfFileIsNotWritable",'htdocs/conf/conf.php');
+    print $langs->trans("ConfFileIsNotWritable",$conffiletoshow);
     pFooter(1,$setuplang,'jscheckparam');
     exit;
 }
@@ -159,7 +161,10 @@ if (! empty($force_install_message))
 		}
 		?>
 		<td class="label" valign="top">
-		<input type="text" size="60" value="<?php print $dolibarr_main_data_root; ?>"<?php print (empty($todoforce_install_main_data_root)?'':' disabled="true"'); ?>  name="main_data_dir">
+		<?php
+		if ($force_install_noedit == 2) print '<input type="hidden" value="'.$dolibarr_main_data_root.'" name="main_data_dir">';
+		print '<input type="text" size="60" value="'.$dolibarr_main_data_root.'"'.(($force_install_noedit != 2)?'':' disabled="true"').' name="main_data_dir'.(($force_install_noedit != 2)?'':'_bis').'">';
+		?>
 		</td>
 		<td class="comment"><?php
 		print $langs->trans("WithNoSlashAtTheEnd")."<br>";
@@ -167,7 +172,7 @@ if (! empty($force_install_message))
 		print $langs->trans("Examples").":<br>";
 		?>
 		<ul>
-			<li>/var/dolibarr_documents</li>
+			<li>/var/lib/dolibarr/documents</li>
 			<li>C:/My Documents/dolibarr/</li>
 		</ul>
 		</td>
@@ -195,17 +200,20 @@ if (empty($dolibarr_main_url_root))
         $dolibarr_main_url_root=$proto."://".$serverport.$_SERVER["SCRIPT_NAME"];
     }
     # Clean proposed URL
-    $dolibarr_main_url_root = preg_replace('/\/fileconf\.php$/','',$dolibarr_main_url_root);    # Supprime le /fileconf.php
-    $dolibarr_main_url_root = preg_replace('/\/$/','',$dolibarr_main_url_root);             # Supprime le /
-    $dolibarr_main_url_root = preg_replace('/\/index\.php$/','',$dolibarr_main_url_root);       # Supprime le /index.php
-    $dolibarr_main_url_root = preg_replace('/\/install$/','',$dolibarr_main_url_root);      # Supprime le /install
+    $dolibarr_main_url_root = preg_replace('/\/fileconf\.php$/','',$dolibarr_main_url_root);    # Remove the /fileconf.php
+    $dolibarr_main_url_root = preg_replace('/\/$/','',$dolibarr_main_url_root);             # Remove the /
+    $dolibarr_main_url_root = preg_replace('/\/index\.php$/','',$dolibarr_main_url_root);       # Remove the /index.php
+    $dolibarr_main_url_root = preg_replace('/\/install$/','',$dolibarr_main_url_root);      # Remove the /install
 }
 ?>
 	<tr>
 		<td valign="top" class="label"><b> <?php echo $langs->trans("URLRoot"); ?></b>
 		</td>
 		<td valign="top" class="label">
-		<input type="text" size="60" name="main_url"<?php print (empty($todoforce_install_main_data_root)?'':' disabled="true"'); ?> value="<?php print $dolibarr_main_url_root; ?>">
+		<?php
+		if ($force_install_noedit == 2) print '<input type="hidden" value="'.$dolibarr_main_url_root.'" name="main_url">';
+		print '<input type="text" size="60" value="'.$dolibarr_main_url_root.'"'.(($force_install_noedit != 2)?'':' disabled="true"').' name="main_url'.(($force_install_noedit != 2)?'':'_bis').'">';
+		?>
 		</td>
 		<td class="comment"><?php print $langs->trans("Examples").":<br>"; ?>
 		<ul>
@@ -304,9 +312,9 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') {   // Enabled if t
         if ($force_install_noedit && $force_install_type) print '<input id="db_type" type="hidden" value="'.$force_install_type.'" name="db_type">';
         print '<select id="db_type" name="db_type'.(empty($force_install_noedit) || empty($force_install_type)?'':'_bis').'"'.($force_install_noedit && $force_install_type?' disabled="true"':'').'>';
 		print $option;
-		print '</select> &nbsp;</td>';
+		print '</select>';
 
-		?>
+		?></td>
 		<td class="comment"><?php echo $langs->trans("DatabaseType"); ?></td>
 
 	</tr>
@@ -339,7 +347,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') {   // Enabled if t
 	<tr>
 		<td class="label" valign="top"><b> <?php echo $langs->trans("DatabaseName"); ?>	</b></td>
 
-		<td class="label" valign="top"><input type="text" name="db_name"
+		<td class="label" valign="top"><input type="text" id="db_name" name="db_name"
 			value="<?php echo (! empty($dolibarr_main_db_name))?$dolibarr_main_db_name:$force_install_database; ?>"></td>
 		<td class="comment"><?php echo $langs->trans("DatabaseName"); ?></td>
 	</tr>
@@ -358,7 +366,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') {   // Enabled if t
 	<tr>
 		<td class="label" valign="top"><b><?php echo $langs->trans("Login"); ?></b>
 		</td>
-		<td class="label" valign="top"><input type="text" name="db_user"
+		<td class="label" valign="top"><input type="text" id="db_user" name="db_user"
 			value="<?php print (! empty($dolibarr_main_db_user))?$dolibarr_main_db_user:$force_install_databaselogin; ?>"></td>
 		<td class="comment"><?php echo $langs->trans("AdminLogin"); ?></td>
 	</tr>
@@ -366,7 +374,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') {   // Enabled if t
 	<tr>
 		<td class="label" valign="top"><b><?php echo $langs->trans("Password"); ?></b>
 		</td>
-		<td class="label" valign="top"><input type="password" name="db_pass"
+		<td class="label" valign="top"><input type="password" id="db_pass" name="db_pass"
 			value="<?php print (! empty($dolibarr_main_db_pass))?$dolibarr_main_db_pass:$force_install_databasepass; ?>"></td>
 		<td class="comment"><?php echo $langs->trans("AdminPassword"); ?></td>
 	</tr>
@@ -375,8 +383,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') {   // Enabled if t
 		<td class="label" valign="top"><?php echo $langs->trans("CreateUser"); ?>
 		</td>
 
-		<td class="label" valign="top"><input type="checkbox"
-			id="db_create_user" name="db_create_user"
+		<td class="label" valign="top"><input type="checkbox" id="db_create_user" name="db_create_user"
 			<?php if (! empty($force_install_createuser)) print ' checked="on"'; ?>></td>
 		<td class="comment"><?php echo $langs->trans("CheckToCreateUser"); ?>
 		</td>
@@ -393,7 +400,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') {   // Enabled if t
 
 	<tr>
 		<td class="label" valign="top"><?php echo $langs->trans("Login"); ?></td>
-		<td class="label" valign="top"><input type="text" name="db_user_root" class="needroot"
+		<td class="label" valign="top"><input type="text" id="db_user_root" name="db_user_root" class="needroot"
 			value="<?php print (! empty($db_user_root))?$db_user_root:$force_install_databaserootlogin; ?>"></td>
 		<td class="label">
 		<div class="comment"><?php echo $langs->trans("DatabaseRootLoginDescription"); ?>
@@ -404,8 +411,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') {   // Enabled if t
 	<tr>
 		<td class="label" valign="top"><?php echo $langs->trans("Password"); ?>
 		</td>
-		<td class="label" valign="top"><input type="password" class="needroot"
-			name="db_pass_root"
+		<td class="label" valign="top"><input type="password" id="db_pass_root" name="db_pass_root" class="needroot"
 			value="<?php print (! empty($db_pass_root))?$db_pass_root:$force_install_databaserootpass; ?>"></td>
 		<td class="label">
 		<div class="comment"><?php echo $langs->trans("KeepEmptyIfNoPassword"); ?>
@@ -436,6 +442,9 @@ jQuery(document).ready(function() {
 	jQuery("#db_create_user").click(function() {
 		init_needroot();
 	});
+	<?php if ($force_install_noedit) { ?>
+	jQuery("#db_pass").focus();
+	<?php } ?>
 });
 
 function checkDatabaseName(databasename) {
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index bb49200a208..3050d37833c 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -22,7 +22,7 @@
 /**	    \file       htdocs/install/inc.php
  * 		\ingroup	core
  *		\brief      File that define environment for install pages
- *		\version    $Id: inc.php,v 1.135 2011/07/13 21:19:58 eldy Exp $
+ *		\version    $Id: inc.php,v 1.136 2011/07/30 10:23:25 eldy Exp $
  */
 
 define('DOL_VERSION','3.1.0-beta');	// Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z)
@@ -69,7 +69,16 @@ else
 }
 
 $includeconferror='';
+
+
+$conffiletoshowshort = "conf.php";
+# Define localization of conf file
 $conffile = "../conf/conf.php";
+$conffiletoshow = "htdocs/conf/conf.php";
+# For debian like systems
+#$conffile = "/etc/dolibarr/conf.php";
+#$conffiletoshow = "/etc/dolibarr/conf.php";
+
 
 if (! defined('DONOTLOADCONF') && file_exists($conffile))
 {
diff --git a/htdocs/install/index.php b/htdocs/install/index.php
index 8153812b284..024da4b7c0e 100644
--- a/htdocs/install/index.php
+++ b/htdocs/install/index.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -22,7 +21,7 @@
  *       \ingroup    install
  *       \brief      Affichage page selection langue si premiere install.
  *					 Si reinstall, passe directement a la page check.php
- *       \version    $Id$
+ *       \version    $Id: index.php,v 1.36 2011/07/31 23:26:19 eldy Exp $
  */
 include_once("./inc.php");
 include_once("../core/class/html.form.class.php");
diff --git a/htdocs/install/licence.php b/htdocs/install/licence.php
index 62a8c7653a3..c786f91346c 100644
--- a/htdocs/install/licence.php
+++ b/htdocs/install/licence.php
@@ -21,7 +21,7 @@
  *	 \file       htdocs/install/licence.php
  *   \ingroup    install
  *	 \brief      Page to show licence (Removed from install process to save time)
- *	 \version    $Id$
+ *	 \version    $Id: licence.php,v 1.20 2011/07/30 14:56:42 eldy Exp $
  */
 
 include_once("./inc.php");
@@ -33,7 +33,9 @@ $langs->setDefaultLang($setuplang);
 $langs->load("install");
 
 // Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard.
-if (file_exists("./install.forced.php")) include_once("./install.forced.php");
+$useforcedwizard=false;
+if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); }
+else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); }
 
 dolibarr_install_syslog("Licence: Entering licence.php page");
 
@@ -47,7 +49,7 @@ pHeader($langs->trans("License"),"fileconf");
 // Test if we can run a first install process
 if (! is_writable($conffile))
 {
-    print $langs->trans("ConfFileIsNotWritable",'htdocs/conf/conf.php');
+    print $langs->trans("ConfFileIsNotWritable",$conffiletoshow);
     pFooter(1,$setuplang,'jscheckparam');
     exit;
 }
diff --git a/htdocs/install/mysql/Makefile b/htdocs/install/mysql/Makefile
deleted file mode 100644
index 4bdfcc2dc2f..00000000000
--- a/htdocs/install/mysql/Makefile
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-# Copyright (C) 2005      Laurent Destailleur  <eldy@users.sourceforge.net>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# $Id$
-# $Source$
-#
-# **********************************************************************
-# Ce makefile permet d'initialiser la base de donnée de dolibarr en manuel.
-# Il n'est utile que si vous n'utilisez pas l'installateur automatique
-# accessible à http://localhost/dolibarr/install/
-#
-# Pour une installation manuelle, créer la base dolibarr puis faire:
-# make mysql.sql
-# mysql dolibarr < mysql.sql
-#
-# Le script mysql.sql cotient tous le ordres sql pour créer la base
-# Tables + Index et Clés + Données
-#
-# **********************************************************************
-
-SQL=mysql
-BASE=dolibarr
-OPTIONS=
-
-FIND=find
-#FIND="c:/Program files/cygwin/bin/find"
-
-
-TABLES=$(shell $(FIND) tables/ -name "*sql")
-
-
-all:
-	cat README
-
-load:
-	$(SQL) $(OPTIONS) $(BASE) < data/data.sql
-
-dev:
-	cd data \
-	&& make dev BASE=$(BASE) OPTIONS=$(OPTIONS)
-
-
-
-dropall: dropdb droppriv
-
-droppriv:
-	$(SQL) $(OPTIONS) $(SQL) -e "delete from db where Db='$(BASE)' ; "
-
-dropdb:
-	$(SQL) $(OPTIONS) $(SQL) -f -e "drop database if exists $(BASE) ; "
-
-
-
-create: createdb createpriv
-
-createdb:
-	$(SQL) $(OPTIONS) mysql -e "create database $(BASE) ; "
-
-createpriv:
-	$(SQL) $(OPTIONS) mysql -e "insert into db (Host, Db) values ('localhost', '$(BASE)') ; "
-	$(SQL) $(OPTIONS) mysql -e "update db set select_priv     = 'Y'  where db='$(BASE)' ; "
-	$(SQL) $(OPTIONS) mysql -e "update db set insert_priv     = 'Y'  where db='$(BASE)' ; "
-	$(SQL) $(OPTIONS) mysql -e "update db set update_priv     = 'Y'  where db='$(BASE)' ; "
-	$(SQL) $(OPTIONS) mysql -e "update db set delete_priv     = 'Y'  where db='$(BASE)' ; "
-	$(SQL) $(OPTIONS) mysql -e "update db set create_priv     = 'Y'  where db='$(BASE)' ; "
-	$(SQL) $(OPTIONS) mysql -e "update db set drop_priv       = 'Y'  where db='$(BASE)' ; "
-	$(SQL) $(OPTIONS) mysql -e "update db set grant_priv      = 'Y'  where db='$(BASE)' ; "
-	$(SQL) $(OPTIONS) mysql -e "update db set references_priv = 'Y'  where db='$(BASE)' ; "
-	$(SQL) $(OPTIONS) mysql -e "update db set index_priv      = 'Y'  where db='$(BASE)' ; "
-	$(SQL) $(OPTIONS) mysql -e "update db set alter_priv      = 'Y'  where db='$(BASE)' ; "
-	$(SQL) $(OPTIONS) mysql -e "flush privileges ; "
-
-
-
-mysql.sql: $(TABLES) data/data.sql Makefile
-	echo "-- Fichier généré par make mysql.sql" > mysql.sql
-	echo "-- Contient les ordres de creation des tables + les clés + les données" >> mysql.sql
-	echo "-- ;" >> mysql.sql
-	$(FIND) tables/ -name "*sql" | grep -v "key.sql" | xargs cat | grep -v "^--" | cut -d "-" -f 1 >> mysql.sql
-	$(FIND) tables/ -name "*sql" | grep "key.sql" | xargs cat | grep -v "^--" | cut -d "-" -f 1 >> mysql.sql
-	cat data/data.sql | grep -v ^-- >> mysql.sql
diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql
index 34d5ba212a2..1f046a29bc4 100644
--- a/htdocs/install/mysql/data/llx_10_c_regions.sql
+++ b/htdocs/install/mysql/data/llx_10_c_regions.sql
@@ -21,7 +21,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- $Id$
+-- $Id: llx_10_c_regions.sql,v 1.13 2011/07/31 12:31:00 eldy Exp $
 --
 
 --
@@ -35,7 +35,7 @@
 
 insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1,0,0,'0',0,'-');
 
--- Regions France (id pays=1)
+-- Regions France (id country=1)
 insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 101, 1,   1,'97105',3,'Guadeloupe');
 insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 102, 1,   2,'97209',3,'Martinique');
 insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 103, 1,   3,'97302',3,'Guyane');
@@ -63,12 +63,12 @@ insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (
 insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 125, 1,  93,'13055',0,'Provence-Alpes-Côte d''Azur');
 insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 126, 1,  94,'2A004',0,'Corse');
 
--- Regions Belgium (id pays=2)
+-- Regions Belgium (id country=2)
 insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 201, 2, 201,     '',1,'Flandre');
 insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 202, 2, 202,     '',2,'Wallonie');
 insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 203, 2, 203,     '',3,'Bruxelles-Capitale');
 
--- Regions Italy (id pays=3)
+-- Regions Italy (id country=3)
 insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (301, 3, 301, NULL, 1, 'Abruzzo');
 insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (302, 3, 302, NULL, 1, 'Basilicata');
 insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (303, 3, 303, NULL, 1, 'Calabria');
@@ -90,7 +90,7 @@ insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (
 insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (319, 3, 319, NULL, 1, 'Valle d Aosta');
 insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (320, 3, 320, NULL, 1, 'Veneto');
 
--- Regions Spain (id pays=4)
+-- Regions Spain (id country=4)
 INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (401,  4, 401, '', 0, 'Andalucia', 1);
 INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (402,  4, 402, '', 0, 'Aragón', 1);
 INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (403,  4, 403, '', 0, 'Castilla y León', 1);
@@ -112,10 +112,10 @@ INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, act
 INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (419,  4, 419, '', 0, 'Pais Vasco', 1);
 INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (420,  4, 420, '', 0, 'Otros', 1);
 
--- Regions Switzerland (id pays=6) 
+-- Regions Switzerland (id country=6) 
 INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (601, 6, 601, '', 1, 'Cantons', 1); 
 
--- Regions Tunisia (id pays=10)
+-- Regions Tunisia (id country=10)
 insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1001,10,1001, '',0,'Ariana');
 insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1002,10,1002, '',0,'Béja');
 insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1003,10,1003, '',0,'Ben Arous');
@@ -141,51 +141,51 @@ insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (
 insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1023,10,1023, '',0,'Tunis');
 insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1024,10,1024, '',0,'Zaghouan');
 
--- Region US (id pays=11)
+-- Region US (id country=11)
 INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (1101, 11, 1101, '', 0, 'United-States', 1);
 
--- Regions Argentina (id pays=23)
+-- Regions Argentina (id country=23)
 INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2301, 23, 2301, '', 0, 'Norte', 1);
 INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2302, 23, 2302, '', 0, 'Litoral', 1);
 INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2303, 23, 2303, '', 0, 'Cuyana', 1);
 INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2304, 23, 2304, '', 0, 'Central', 1);
 INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2305, 23, 2305, '', 0, 'Patagonia', 1);
 
--- Regions Australia (id pays=28)
+-- Regions Australia (id country=28)
 insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (2801, 28, 2801, '', 0, 'Australia', 1);
 
--- Regions Colombie (id pays=70)
+-- Regions Colombie (id country=70)
 insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (7001,  70, 7001, '', 0, 'Colombie', 1);
 
--- Regions Chile (id pays=67)
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 01, 67, NULL, NULL, 'Tarapacá', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 02, 67, NULL, NULL, 'Antofagasta', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 03, 67, NULL, NULL, 'Atacama', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 04, 67, NULL, NULL, 'Coquimbo', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 05, 67, NULL, NULL, 'Valparaíso', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 06, 67, NULL, NULL, 'General Bernardo O Higgins', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 07, 67, NULL, NULL, 'Maule', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 08, 67, NULL, NULL, 'Biobío', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 09, 67, NULL, NULL, 'Raucanía', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 10, 67, NULL, NULL, 'Los Lagos', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 11, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 12, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 13, 67, NULL, NULL, 'Metropolitana de Santiago', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 14, 67, NULL, NULL, 'Los Ríos', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 15, 67, NULL, NULL, 'Arica y Parinacota', 1);
+-- Regions Chile (id country=67)
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 6701, 67, NULL, NULL, 'Tarapacá', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 6702, 67, NULL, NULL, 'Antofagasta', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 6703, 67, NULL, NULL, 'Atacama', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 6704, 67, NULL, NULL, 'Coquimbo', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 6705, 67, NULL, NULL, 'Valparaíso', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 6706, 67, NULL, NULL, 'General Bernardo O Higgins', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 6707, 67, NULL, NULL, 'Maule', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 6708, 67, NULL, NULL, 'Biobío', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 6709, 67, NULL, NULL, 'Raucanía', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 6710, 67, NULL, NULL, 'Los Lagos', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 6711, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 6712, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 6713, 67, NULL, NULL, 'Metropolitana de Santiago', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 6714, 67, NULL, NULL, 'Los Ríos', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 6715, 67, NULL, NULL, 'Arica y Parinacota', 1);
 
--- Regions San Salvador (id pays=86)
+-- Regions San Salvador (id country=86)
 INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8601, 8601, 86, NULL, NULL, 'Central', 1);
 INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8602, 8602, 86, NULL, NULL, 'Oriental', 1);
 INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8603, 8603, 86, NULL, NULL, 'Occidental', 1);
 
--- Regions Honduras (id pays=114)
+-- Regions Honduras (id country=114)
 insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (11401,  114, 11401, '', 0, 'Honduras', 1);
 
--- Regions India (id pays=117)
+-- Regions India (id country=117)
 insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (11701,  117, 11701, '', 0, 'India', 1);
 
--- Regions Mauritius (id pays=152)
+-- Regions Mauritius (id country=152)
 INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15201,  152, 15201, '', 0, 'Rivière Noire', 1);
 INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15202,  152, 15202, '', 0, 'Flacq', 1);
 INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15203,  152, 15203, '', 0, 'Grand Port', 1);
@@ -199,5 +199,9 @@ INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, act
 INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15211,  152, 15211, '', 0, 'Les îles Agaléga', 1);
 INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15212,  152, 15212, '', 0, 'Les écueils des Cargados Carajos', 1);
 
--- Regions Mexique (id pays=154)
-insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (15401,  154, 15401, '', 0, 'Mexique', 1);
\ No newline at end of file
+-- Regions Mexique (id country=154)
+insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (15401,  154, 15401, '', 0, 'Mexique', 1);
+
+
+-- Regions Barbados (id country=46)
+INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (4601,  46, 4601, '', 0, 'Barbados', 1);
diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql
index 804775024e6..9a109ab3fdc 100644
--- a/htdocs/install/mysql/data/llx_20_c_departements.sql
+++ b/htdocs/install/mysql/data/llx_20_c_departements.sql
@@ -21,7 +21,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- $Id$
+-- $Id: llx_20_c_departements.sql,v 1.15 2011/07/31 12:31:00 eldy Exp $
 --
 
 --
@@ -35,7 +35,7 @@
 
 insert into llx_c_departements (rowid, fk_region, code_departement,cheflieu,tncc,ncc,nom) values (0,0,'0','0',0,'-','-');
 
--- Departements France
+-- Departements France (id country=1)
 insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (82,'01','01053',5,'AIN','Ain');
 insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (22,'02','02408',5,'AISNE','Aisne');
 insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (83,'03','03190',5,'ALLIER','Allier');
@@ -137,7 +137,7 @@ insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,no
 insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values ( 3,'973','97302',3,'GUYANE','Guyane');
 insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values ( 4,'974','97411',3,'REUNION','Réunion');
 
--- Provinces Belgium
+-- Provinces Belgium (id country=2)
 insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (201,'01','',1,'ANVERS','Anvers');
 insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (203,'02','',3,'BRUXELLES-CAPITALE','Bruxelles-Capitale');
 insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (202,'03','',2,'BRABANT-WALLON','Brabant-Wallon');
@@ -262,7 +262,7 @@ insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom
 insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('VI',320,NULL,NULL,NULL,'VICENZA');
 insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('VT',307,NULL,NULL,NULL,'VITERBO');
 
--- Provinces Australia (id=28)
+-- Provinces Australia (id country=28)
 insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'NSW','',1,'','New South Wales');
 insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'VIC','',1,'','Victoria');
 insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'QLD','',1,'','Queensland');
@@ -272,7 +272,7 @@ insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,no
 insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'WA' ,'',1,'','Western Australia');
 insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'NT' ,'',1,'','Northern Territory');
 
--- Provinces Spain (id=4)
+-- Provinces Spain (id country=4)
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('01', 419, '', 19, 'PAIS VASCO', 'País Vasco', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('02', 404, '', 4, 'ALBACETE', 'Albacete', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('03', 411, '', 11, 'ALICANTE', 'Alicante', 1);
@@ -327,7 +327,7 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('52', 409, '', 9, 'MELILLA', 'Melilla', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('53', 420, '', 20, 'OTROS', 'Otros', 1);
 
--- Cantons Switzerland (id=6)
+-- Cantons Switzerland (id country=6)
 INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'AG','ARGOVIE','Argovie',1); 
 INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'AI','APPENZELL RHODES INTERIEURES','Appenzell Rhodes intérieures',1); 
 INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'AR','APPENZELL RHODES EXTERIEURES','Appenzell Rhodes extérieures',1); 
@@ -355,7 +355,7 @@ INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) V
 INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'ZG','ZUG','Zug',1); 
 INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'ZH','ZURICH','Zürich',1);
 
--- Provinces US (id=11)
+-- Provinces US (id country=11)
 insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('AL', 1101, '', 0, 'ALABAMA', 'Alabama', 1);
 insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('AK', 1101, '', 0, 'ALASKA', 'Alaska', 1);
 insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('AZ', 1101, '', 0, 'ARIZONA', 'Arizona', 1);
@@ -407,7 +407,7 @@ insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
 insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('WI', 1101, '', 0, 'WISCONSIN', 'Wisconsin', 1);
 insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('WY', 1101, '', 0, 'WYOMING', 'Wyoming', 1);
 
--- San Salvador (id=86)
+-- San Salvador (id country=86)
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SS', 8601, NULL, NULL, NULL, 'San Salvador', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SA', 8603, NULL, NULL, NULL, 'Santa Ana', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('AH', 8603, NULL, NULL, NULL, 'Ahuachapan', 1);
@@ -423,7 +423,7 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SV', 8601, NULL, NULL, NULL, 'San Vicente', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('CU', 8601, NULL, NULL, NULL, 'Cuscatlan', 1);
 
--- Provinces Argentina (id=23)
+-- Provinces Argentina (id country=23)
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2301', 2301, '', 0, 'CATAMARCA', 'Catamarca', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2302', 2301, '', 0, 'YUJUY', 'Yujuy', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2303', 2301, '', 0, 'TUCAMAN', 'Tucamán', 1);
@@ -450,7 +450,7 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2324', 2305, '', 0, 'ISLAS MALVINAS', 'Islas Malvinas', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2325', 2305, '', 0, 'ANTARTIDA', 'Antártida', 1);
 
--- Provinces chile (id=67)
+-- Provinces chile (id country=67)
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('151', 6715, '', 0, '151', 'Arica', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('152', 6715, '', 0, '152', 'Parinacota', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('011', 6701, '', 0, '011', 'Iquique', 1);
@@ -506,7 +506,7 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('135', 6713, '', 0, '135', 'Melipilla', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('136', 6713, '', 0, '136', 'Talagante', 1);
 
--- Provinces India (id=117)
+-- Provinces India (id country=117)
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('AN', 11701, NULL, 0, 'AN', 'Andaman & Nicobar', 1);    
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('AP', 11701, NULL, 0, 'AP', 'Andhra Pradesh', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('AR', 11701, NULL, 0, 'AR', 'Arunachal Pradesh', 1);     
@@ -543,7 +543,7 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('UP', 11701, NULL, 0, 'UP', 'Uttar Pradesh', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('WB', 11701, NULL, 0, 'WB', 'West Bengal', 1);
 
--- Provinces Mexique (id=154)
+-- Provinces Mexique (id country=154)
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('DIF', 15401, '', 0, 'DIF', 'Distrito Federal', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('AGS', 15401, '', 0, 'AGS', 'Aguascalientes', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('BCN', 15401, '', 0, 'BCN', 'Baja California Norte', 1);
@@ -566,7 +566,6 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('OAX', 15401, '', 0, 'OAX', 'Oaxaca', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PUE', 15401, '', 0, 'PUE', 'Puebla', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('QRO', 15401, '', 0, 'QRO', 'Querétaro', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('HGO', 15401, '', 0, 'HGO', 'Hidalgo', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ROO', 15401, '', 0, 'ROO', 'Quintana Roo', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SLP', 15401, '', 0, 'SLP', 'San Luis Potosí', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SIN', 15401, '', 0, 'SIN', 'Sinaloa', 1);
@@ -579,7 +578,7 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ZAC', 15401, '', 0, 'ZAC', 'Zacatecas', 1);
 
 
--- Provinces Colombie (id=70)
+-- Provinces Colombie (id country=70)
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ANT', 7001, '', 0, 'ANT', 'Antioquia', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('BOL', 7001, '', 0, 'BOL', 'Bolívar', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('BOY', 7001, '', 0, 'BOY', 'Boyacá', 1);
@@ -614,7 +613,7 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('CES', 7001, '', 0, 'CES', 'Cesar', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('MAG', 7001, '', 0, 'MAG', 'Magdalena', 1);
 
--- Provinces Honduras (id=114)
+-- Provinces Honduras (id country=114)
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('AT', 11401, '', 0, 'AT', 'Atlántida', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('CH', 11401, '', 0, 'CH', 'Choluteca', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('CL', 11401, '', 0, 'CL', 'Colón', 1);
@@ -633,4 +632,17 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SB', 11401, '', 0, 'SB', 'Santa Bárbara', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('VL', 11401, '', 0, 'VL', 'Valle', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('YO', 11401, '', 0, 'YO', 'Yoro', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('DC', 11401, '', 0, 'DC', 'Distrito Central', 1);
\ No newline at end of file
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('DC', 11401, '', 0, 'DC', 'Distrito Central', 1);
+
+-- Parish Barbados (id country=46)
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('CC', 4601, 'Oistins', 0, 'CC', 'Christ Church', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SA', 4601, 'Greenland', 0, 'SA', 'Saint Andrew', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SG', 4601, 'Bulkeley', 0, 'SG', 'Saint George', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('JA', 4601, 'Holetown', 0, 'JA', 'Saint James', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SJ', 4601, 'Four Roads', 0, 'SJ', 'Saint John', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SB', 4601, 'Bathsheba', 0, 'SB', 'Saint Joseph', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SL', 4601, 'Crab Hill', 0, 'SL', 'Saint Lucy', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SM', 4601, 'Bridgetown', 0, 'SM', 'Saint Michael', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SP', 4601, 'Speightstown', 0, 'SP', 'Saint Peter', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SC', 4601, 'Crane', 0, 'SC', 'Saint Philip', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ST', 4601, 'Hillaby', 0, 'ST', 'Saint Thomas', 1);
diff --git a/htdocs/install/mysql/data/llx_c_currencies.sql b/htdocs/install/mysql/data/llx_c_currencies.sql
index b6bdc8587f5..ad7c175fcc4 100644
--- a/htdocs/install/mysql/data/llx_c_currencies.sql
+++ b/htdocs/install/mysql/data/llx_c_currencies.sql
@@ -20,7 +20,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- $Id$
+-- $Id: llx_c_currencies.sql,v 1.7 2011/07/28 18:34:46 eldy Exp $
 --
 
 --
@@ -32,6 +32,7 @@
 -- Devises (code secondaire - code ISO4217 - libelle fr)
 --
 
+INSERT INTO llx_c_currencies ( code, code_iso, active, label ) VALUES ( 'BD', 'BBD', 1, 'Barbadian or Bajan Dollar');
 insert into llx_c_currencies ( code, code_iso, active, label ) values ( 'BT', 'THB', 1, 'Bath thailandais'); 
 insert into llx_c_currencies ( code, code_iso, active, label ) values ( 'CD', 'DKK', 1, 'Couronnes dannoises'); 
 insert into llx_c_currencies ( code, code_iso, active, label ) values ( 'CN', 'NOK', 1, 'Couronnes norvegiennes'); 
@@ -88,3 +89,4 @@ insert into llx_c_currencies ( code, code_iso, active, label ) values ( 'LK', 'L
 insert into llx_c_currencies ( code, code_iso, active, label ) values ( 'MU', 'MUR', 1, 'Roupies mauritiennes');
 insert into llx_c_currencies ( code, code_iso, active, label ) values ( 'SR', 'SAR', 1, 'Saudi riyal');
 INSERT INTO llx_c_currencies ( code, code_iso, active, label ) VALUES ( 'MX', 'MXP', 1, 'Pesos Mexicans');
+
diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql
index 4910faef45d..07fa2abaa83 100644
--- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql
+++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql
@@ -5,7 +5,7 @@
 -- Copyright (C) 2004      Guillaume Delecourt  <guillaume.delecourt@opensides.be>
 -- Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
 -- Copyright (C) 2007 	   Patrick Raguin       <patrick.raguin@gmail.com>
--- Copyright (C) 2010 	   Juanjo Menent        <jmenent@2byte.es>
+-- Copyright (C) 2010-2011 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
@@ -21,7 +21,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- $Id$
+-- $Id: llx_c_forme_juridique.sql,v 1.5 2011/07/28 15:09:53 simnandez Exp $
 --
 
 --
@@ -204,3 +204,11 @@ INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152,
 INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15208', 'Mauritius Limited Partnership', 1);
 INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15209', 'Mauritius Sole Proprietorship', 1);
 INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15210', 'Mauritius Trusts', 1);
+
+-- Mexique
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15401', 'Sociedad en nombre colectivo', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15402', 'Sociedad en comandita simple', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15403', 'Sociedad de responsabilidad limitada', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15404', 'Sociedad anónima', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15405', 'Sociedad en comandita por acciones', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15406', 'Sociedad cooperativa', 1);
\ No newline at end of file
diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index 851682108b5..056dbdbdb6e 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -21,7 +21,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- $Id$
+-- $Id: llx_c_tva.sql,v 1.26 2011/07/28 18:34:46 eldy Exp $
 --
 
 --
@@ -36,50 +36,50 @@
 
 delete from llx_c_tva;
 
--- ARGENTINA (id 23)
+-- ARGENTINA (id country=23)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (231, 23,  '21','0','IVA standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (232, 23,'10.5','0','IVA reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (233, 23,   '0','0','IVA Rate 0', 1);
 
--- AUSTRALIA (id 28)
+-- AUSTRALIA (id country=28)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (281, 28,  '10','0','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (282, 28,   '0','0','VAT Rate 0', 1);
 
--- AUSTRIA (id 41)
+-- AUSTRIA (id country=41)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (411, 41,  '20','0','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (412, 41,  '10','0','VAT reduced rate', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (413, 41,   '0','0','VAT Rate 0',1);
 
--- BULGARIA (id 59)
+-- BULGARIA (id country=59)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (591, 59,  '20','0','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (592, 59,   '7','0','VAT reduced rate', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (593, 59,   '0','0','VAT Rate 0',1);
 
--- BELGIUM (id 2)
+-- BELGIUM (id country=2)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 21,  2,  '21','0','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 22,  2,   '6','0','VAT reduced rate', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 23,  2,   '0','0','VAT Rate 0 ou non applicable',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 24,  2,  '12','0','VAT reduced rate', 1);
 
--- CANADA (id 14)
+-- CANADA (id country=14)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (141, 14,   '7','0','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (142, 14,   '0','0','VAT Rate 0',1);
 
--- CHILE (id 67)
+-- CHILE (id country=67)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (671, 67,  '19','0','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (672, 67,   '0','0','VAT Rate 0',1);
 
--- CHINA (id 9)
+-- CHINA (id country=9)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 91, 9,   '17','0','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 92, 9,   '13','0','VAT reduced rate 0',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 93, 9,    '3','0','VAT super reduced rate 0',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 94, 9,    '0','0','VAT Rate 0',1);
 
--- DANMERK (id 80)
+-- DANMERK (id country=80)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (801,80,   '25','0','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (802,80,    '0','0','VAT Rate 0',1);
 
--- FRANCE (id 1)
+-- FRANCE (id country=1)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 11,  1,'19.6','0','VAT standard rate (France hors DOM-TOM)',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 12,  1, '8.5','0','VAT standard rate (DOM sauf Guyane et Saint-Martin)',0);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 13,  1, '8.5','1','VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0);
@@ -87,112 +87,112 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 1
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 15,  1,   '0','0','VAT Rate 0 ou non applicable',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 16,  1, '2.1','0','VAT super-reduced rate',1);
 
--- GERMANY (id 5)
+-- GERMANY (id country=5)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 51,  5,  '19','0','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 52,  5,   '7','0','VAT reduced rate', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 53,  5,   '0','0','VAT Rate 0', 1);
 
--- ICELAND (id 116)
+-- ICELAND (id country=116)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1161, 116,'25.5','0','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1162, 116,   '7','0','VAT reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1163, 116,   '0','0','VAT rate 0',1);
 
--- ITALY (id 3)
+-- ITALY (id country=3)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 31,  3,  '20','0','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 32,  3,  '10','0','VAT reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 33,  3,   '4','0','VAT super-reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 34,  3,   '0','0','VAT Rate 0',1);
 
--- INDIA (id 117)
+-- INDIA (id country=117)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1171, 117,  '12.5','0','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1172, 117,  '4','0','VAT reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1173, 117,  '1','0','VAT super-reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1174, 117,  '0','0','VAT Rate 0',1);
 
--- JAPAN (id 123)
+-- JAPAN (id country=123)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1231, 123, '0','0','VAT Rate 0',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1232, 123, '5','0','VAT Rate 5',1);
 
--- LUXEMBOURG (id 140)
+-- LUXEMBOURG (id country=140)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1401, 140, '15','0','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1402, 140, '12','0','VAT reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1403, 140,  '6','0','VAT reduced rate', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1404, 140,  '3','0','VAT super-reduced rate', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1405, 140,  '0','0','VAT Rate 0', 1);
 
--- MAROCO (id 12)
+-- MAROCO (id country=12)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (121,  12, '20','0','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (122,  12, '14','0','VAT reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (123,  12, '10','0','VAT reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (124,  12,  '7','0','VAT super-reduced rate', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (125,  12,  '0','0','VAT Rate 0', 1);
 
--- NEDERLAND (id 17)
+-- NEDERLAND (id country=17)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (171, 17,  '19','0','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (172, 17,   '6','0','VAT reduced rate', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (173, 17,   '0','0','VAT Rate 0', 1);
 
--- NEW ZEALAND (id 166)
+-- NEW ZEALAND (id country=166)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1662, 166,  '15','0','VAT standard rate', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1663, 166,   '0','0','VAT Rate 0', 1);
 
--- NORWAY (id 173)
+-- NORWAY (id country=173)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1731, 173,  '25','0','VAT standard rate', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1732, 173,   '14','0','VAT reduced rate', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1733, 173,    '8','0','VAT reduced rate', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1734, 173,    '0','0','VAT Rate 0', 1);
 
--- POLAND (id 184)
+-- POLAND (id country=184)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1841, 184,  '20','0','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1842, 184,   '7','0','VAT reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1843, 184,   '3','0','VAT reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1844, 184,   '0','0','VAT Rate 0', 1);
 
--- PORTUGAL (id 25)
+-- PORTUGAL (id country=25)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (251, 25,  '20','0','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (252, 25,  '12','0','VAT reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (253, 25,   '0','0','VAT Rate 0', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (254, 25,   '5','0','VAT reduced rate',1);
 
--- ROMANIA (id 188)
+-- ROMANIA (id country=188)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1881,188,  '24','0','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1882,188,   '9','0','VAT reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1884,188,   '5','0','VAT reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1883,188,   '0','0','VAT Rate 0', 1);
 
--- SAN SALVADOR (id 86)
+-- SAN SALVADOR (id country=86)
 INSERT INTO llx_c_tva(rowid, fk_pays, taux, recuperableonly, note, active) VALUES (861, 86, '13', '0', 'IVA 13', 1);
 INSERT INTO llx_c_tva(rowid, fk_pays, taux, recuperableonly, note, active) VALUES (862, 86, '0', '0', 'SIN IVA', 1);
 
--- SLOVAKIA (id 201)
+-- SLOVAKIA (id country=201)
 INSERT INTO llx_c_tva(rowid, fk_pays, taux, recuperableonly, note, active) VALUES (2011, 201, '19', '0', 'VAT standard rate', 1);
 INSERT INTO llx_c_tva(rowid, fk_pays, taux, recuperableonly, note, active) VALUES (2012, 201, '10', '0', 'VAT reduced rate', 1);
 INSERT INTO llx_c_tva(rowid, fk_pays, taux, recuperableonly, note, active) VALUES (2013, 201,  '0', '0', 'VAT Rate 0', 1);
 
--- SLOVENIA (id 202)
+-- SLOVENIA (id country=202)
 INSERT INTO llx_c_tva(rowid, fk_pays, taux, recuperableonly, note, active) VALUES (2021, 202, '20', '0', 'VAT standard rate', 1);
 INSERT INTO llx_c_tva(rowid, fk_pays, taux, recuperableonly, note, active) VALUES (2022, 202,'8.5', '0', 'VAT reduced rate', 1);
 INSERT INTO llx_c_tva(rowid, fk_pays, taux, recuperableonly, note, active) VALUES (2023, 202,  '0', '0', 'VAT Rate 0', 1);
 
--- SPAIN (id 4)
+-- SPAIN (id country=4)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,note,active) values ( 41, 4,  '18','0','4','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,note,active) values ( 42, 4,   '8','0','1','VAT reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,note,active) values ( 43, 4,   '4','0','0.5','VAT super-reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active)           values ( 44, 4,   '0','0','VAT Rate 0',1);
 
--- SWEDEN (id 20)
+-- SWEDEN (id country=20)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (201,20,  '25','0','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (202,20,  '12','0','VAT reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (203,20,   '6','0','VAT super-reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (204,20,   '0','0','VAT Rate 0',  1);
 
--- SWITZERLAND (id 6)
+-- SWITZERLAND (id country=6)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 61, 6, '7.6','0','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 62, 6, '3.6','0','VAT reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 63, 6, '2.4','0','VAT super-reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 64, 6,   '0','0','VAT Rate 0',  1);
 
--- TUNISIA (id 10)
+-- TUNISIA (id country=10)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (101,10,    '6','0','VAT 6%', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (102,10,   '12','0','VAT 12%',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (103,10,   '18','0','VAT 18%',1);
@@ -201,13 +201,13 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (10
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (106,10, '22.5','0','VAT 18% Majoré à 25% (22.5%)',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (107,10,    '0','0','VAT Rate 0',  1);
 
--- UNITED OF KINGDOM (id 7)
+-- UNITED OF KINGDOM (id country=7)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 71, 7,  	 '20','0','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 72, 7,  '17.5','0','VAT standard rate before 2011',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 73, 7,     '5','0','VAT reduced rate',   1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 74, 7,     '0','0','VAT Rate 0',   1);
 
--- UNITED STATES (id 11)
+-- UNITED STATES (id country=11)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (111,11,     '0','0','No Sales Tax',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (112,11,     '4','0','Sales Tax 4%',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (113,11,     '6','0','Sales Tax 6%',1);
@@ -215,21 +215,28 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (11
 
 -- Pour les DOM-TOM, il faut utiliser le pays FRANCE (Sinon pb avec regles de TVA et autres regles propres aux pays et europe)
 
--- SAINT PIERRE ET MIQUELON
+-- SAINT PIERRE ET MIQUELON (id country=19)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1931,193,  '0','0','No VAT in SPM',1);
 
--- SAINT MARTIN
+-- SAINT MARTIN (id country=24)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2461,246,  '0','0','VAT Rate 0',1);
 
--- MAURITIUS
+
+-- MAURITIUS (id country=15)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1521,152,  '0','0','VAT Rate 0',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1522,152,  '15','0','VAT Rate 15',1);
 
--- HONDURAS (id 114)
+-- HONDURAS (id country=114)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1141,114,     '0','0','No ISV',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1142,114,     '12','0','ISV 12%',1);
 
--- MEXIQUE (id 154)
+-- MEXIQUE (id country=154)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1541,154,     '0','0','No VAT',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1542,154,     '16','0','VAT 16%',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1543,154,     '10','0','VAT Frontero',1);
\ No newline at end of file
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1543,154,     '10','0','VAT Frontero',1);
+
+-- BARBADOS (id country=46)
+INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (461,46,     '0','0','No VAT',1);
+INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (462,46,     '15','0','VAT 15%',1);
+INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (463,46,     '7.5','0','VAT 7.5%',1);
+
diff --git a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql
index bad27534494..e32055ea452 100755
--- a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql
+++ b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql
@@ -1,5 +1,5 @@
 --
--- $Id: 3.0.0-3.1.0.sql,v 1.79 2011/07/12 22:12:12 eldy Exp $
+-- $Id: 3.0.0-3.1.0.sql,v 1.84 2011/07/29 19:59:10 eldy Exp $
 --
 -- Be carefull to requests order.
 -- This file must be loaded by calling /install/index.php page
@@ -25,8 +25,10 @@ ALTER TABLE llx_c_ziptown MODIFY fk_county integer NULL;
 
 ALTER TABLE llx_c_actioncomm ADD COLUMN position integer NOT NULL DEFAULT 0;
 ALTER TABLE llx_propal ADD COLUMN fk_demand_reason integer NULL DEFAULT 0;
-ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_cond_reglement integer NULL DEFAULT 0;
-ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_mode_reglement integer NULL DEFAULT 0;
+ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_cond_reglement integer NULL DEFAULT 0 after model_pdf;
+ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_mode_reglement integer NULL DEFAULT 0 after fk_cond_reglement;
+ALTER TABLE llx_commande_fournisseur ADD COLUMN import_key varchar(14);
+
 --ALTER TABLE llx_c_currencies ADD COLUMN symbole varchar(3) NOT NULL default '';
 
 ALTER TABLE llx_commande_fournisseur MODIFY model_pdf varchar(255);
@@ -124,9 +126,14 @@ ALTER TABLE llx_usergroup_user DROP INDEX fk_user;
 ALTER TABLE llx_usergroup_user DROP INDEX uk_user_group_entity;
 ALTER TABLE llx_usergroup_user ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER rowid;
 ALTER TABLE llx_usergroup_user ADD UNIQUE INDEX uk_usergroup_user (entity,fk_user,fk_usergroup);
+-- V4.1 DELETE FROM llx_usergroup_user WHERE fk_user NOT IN (SELECT rowid from llx_user);
 ALTER TABLE llx_usergroup_user ADD CONSTRAINT fk_usergroup_user_fk_user      FOREIGN KEY (fk_user)         REFERENCES llx_user (rowid);
+-- V4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
 ALTER TABLE llx_usergroup_user ADD CONSTRAINT fk_usergroup_user_fk_usergroup FOREIGN KEY (fk_usergroup)    REFERENCES llx_usergroup (rowid);
 
+-- V4.1 DELETE FROM llx_product_fournisseur where fk_product NOT IN (SELECT rowid from llx_product);
+ALTER TABLE llx_product_fournisseur ADD CONSTRAINT fk_product_fournisseur_fk_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid);
+
 ALTER TABLE llx_commande ADD COLUMN ref_int	varchar(30) AFTER ref_ext;
 ALTER TABLE llx_facture ADD COLUMN ref_int varchar(30) AFTER ref_ext;
 ALTER TABLE llx_societe ADD COLUMN ref_int varchar(60) AFTER ref_ext;
@@ -145,6 +152,12 @@ ALTER TABLE llx_actioncomm ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER id
 ALTER TABLE llx_actioncomm ADD COLUMN fk_element integer DEFAULT NULL AFTER note;
 ALTER TABLE llx_actioncomm ADD COLUMN elementtype varchar(16) DEFAULT NULL AFTER fk_element;
 
+
+ALTER TABLE llx_c_regions MODIFY COLUMN cheflieu    varchar(50);
+ALTER TABLE llx_c_departements MODIFY COLUMN cheflieu    varchar(50);
+
+
+-- Table c_action_trigger
 DROP table llx_c_action_trigger;
 create table llx_c_action_trigger
 (
@@ -156,7 +169,6 @@ create table llx_c_action_trigger
   rang			integer		DEFAULT 0
   
 )ENGINE=innodb;
-
 ALTER TABLE llx_c_action_trigger ADD UNIQUE INDEX uk_action_trigger_code (code);
 
 INSERT INTO llx_c_action_trigger (rowid,code,label,description,elementtype,rang) VALUES (1,'FICHEINTER_VALIDATE','Validation fiche intervention','Executed when a intervention is validated','ficheinter',18);
@@ -299,6 +311,13 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('VER', 15401, '', 0, 'VER', 'Veracruz', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('YUC', 15401, '', 0, 'YUC', 'Yucatán', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ZAC', 15401, '', 0, 'ZAC', 'Zacatecas', 1);
+-- Formes juridiques Mexique
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15401', 'Sociedad en nombre colectivo', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15402', 'Sociedad en comandita simple', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15403', 'Sociedad de responsabilidad limitada', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15404', 'Sociedad anónima', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15405', 'Sociedad en comandita por acciones', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15406', 'Sociedad cooperativa', 1);
 
 --Add Colombie data (id pays=70)
 -- Regions Colombie 
@@ -374,6 +393,28 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (15
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1543,154,     '10','0','VAT Frontero',1);
 
 
+--Add Barbados data (id pays=46)
+-- Region Barbados 
+INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (4601,  46, 4601, 'Bridgetown', 0, 'Barbados', 1);
+-- Parish Barbados
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('CC', 4601, 'Oistins', 0, 'CC', 'Christ Church', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SA', 4601, 'Greenland', 0, 'SA', 'Saint Andrew', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SG', 4601, 'Bulkeley', 0, 'SG', 'Saint George', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('JA', 4601, 'Holetown', 0, 'JA', 'Saint James', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SJ', 4601, 'Four Roads', 0, 'SJ', 'Saint John', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SB', 4601, 'Bathsheba', 0, 'SB', 'Saint Joseph', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SL', 4601, 'Crab Hill', 0, 'SL', 'Saint Lucy', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SM', 4601, 'Bridgetown', 0, 'SM', 'Saint Michael', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SP', 4601, 'Speightstown', 0, 'SP', 'Saint Peter', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SC', 4601, 'Crane', 0, 'SC', 'Saint Philip', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ST', 4601, 'Hillaby', 0, 'ST', 'Saint Thomas', 1);
+-- Currency Barbados
+INSERT INTO llx_c_currencies ( code, code_iso, active, label ) VALUES ( 'BD', 'BBD', 1, 'Barbadian or Bajan Dollar');
+-- VAT Barbados
+INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (461,46,     '0','0','No VAT',1);
+INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (462,46,     '15','0','VAT 15%',1);
+INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (463,46,     '7.5','0','VAT 7.5%',1);
+
 update llx_actioncomm set elementtype='invoice' where elementtype='facture';
 update llx_actioncomm set elementtype='order' where elementtype='commande';
 update llx_actioncomm set elementtype='contract' where elementtype='contrat';
@@ -442,3 +483,4 @@ ALTER TABLE llx_don ADD   phone_mobile    varchar(24) after email;
 ALTER TABLE llx_don ADD   phone           varchar(24) after email;
 
 ALTER TABLE llx_user ADD civilite varchar(6) after entity;
+
diff --git a/htdocs/install/mysql/tables/llx_c_departements.sql b/htdocs/install/mysql/tables/llx_c_departements.sql
index 13cb2520aa7..ab0ea5dc0c3 100644
--- a/htdocs/install/mysql/tables/llx_c_departements.sql
+++ b/htdocs/install/mysql/tables/llx_c_departements.sql
@@ -16,7 +16,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- $Id$
+-- $Id: llx_c_departements.sql,v 1.3 2011/07/28 18:34:45 eldy Exp $
 -- ========================================================================
 
 create table llx_c_departements
@@ -24,7 +24,7 @@ create table llx_c_departements
   rowid            integer    AUTO_INCREMENT PRIMARY KEY,
   code_departement varchar(6) NOT NULL,
   fk_region        integer,
-  cheflieu         varchar(7),
+  cheflieu         varchar(50),
   tncc             integer,
   ncc              varchar(50),
   nom              varchar(50),
diff --git a/htdocs/install/mysql/tables/llx_c_regions.sql b/htdocs/install/mysql/tables/llx_c_regions.sql
index 4c3a49a0c37..d9d0f2d1b0c 100644
--- a/htdocs/install/mysql/tables/llx_c_regions.sql
+++ b/htdocs/install/mysql/tables/llx_c_regions.sql
@@ -16,7 +16,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- $Id$
+-- $Id: llx_c_regions.sql,v 1.3 2011/07/28 18:34:45 eldy Exp $
 -- ========================================================================
 
 create table llx_c_regions
@@ -24,7 +24,7 @@ create table llx_c_regions
   rowid       integer AUTO_INCREMENT PRIMARY KEY,
   code_region integer UNIQUE NOT NULL,
   fk_pays     integer NOT NULL,
-  cheflieu    varchar(7),
+  cheflieu    varchar(50),
   tncc        integer,
   nom         varchar(50),
   active      tinyint DEFAULT 1 NOT NULL
diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql
index e247e2f154d..9c6e2a065f8 100644
--- a/htdocs/install/mysql/tables/llx_commande.sql
+++ b/htdocs/install/mysql/tables/llx_commande.sql
@@ -17,7 +17,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- $Id: llx_commande.sql,v 1.12 2011/07/17 21:35:12 hregis Exp $
+-- $Id: llx_commande.sql,v 1.13 2011/07/28 22:22:31 eldy Exp $
 -- ===================================================================
 
 create table llx_commande
@@ -61,7 +61,7 @@ create table llx_commande
   fk_mode_reglement     integer,                       -- mode de reglement
   date_livraison 	    date 	  default NULL,
   fk_availability 		integer NULL,
-  fk_demand_reason		integer,
+  fk_demand_reason		integer,					   -- should be named fk_input_reason
   fk_adresse_livraison  integer,                       -- delivery address (deprecated)
   import_key            varchar(14)
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
index 4045afce371..3ef51d6ae21 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
@@ -17,7 +17,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- $Id$
+-- $Id: llx_commande_fournisseur.sql,v 1.7 2011/07/28 22:22:31 eldy Exp $
 -- ===================================================================
 
 create table llx_commande_fournisseur
@@ -54,7 +54,11 @@ create table llx_commande_fournisseur
   note                text,
   note_public         text,
   model_pdf           varchar(255),
-  fk_methode_commande integer default 0
+  
+  fk_cond_reglement   integer,                       -- condition de reglement
+  fk_mode_reglement   integer,                       -- mode de reglement
+  fk_methode_commande integer default 0,			 -- should be named fk_input_method
+  import_key          varchar(14)
 )ENGINE=innodb;
 
 -- 
diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql
index 4acae941f90..612755ce349 100644
--- a/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql
+++ b/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql
@@ -1,6 +1,6 @@
 -- ============================================================================
 -- Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
--- Copyright (C) 2004-2005 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
 -- Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
 --
 -- This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- $Id$
+-- $Id: llx_product_fournisseur.key.sql,v 1.3 2011/07/29 19:59:33 eldy Exp $
 -- ============================================================================
 
 
@@ -25,3 +25,5 @@ ALTER TABLE llx_product_fournisseur ADD UNIQUE INDEX uk_product_fournisseur_ref
 
 ALTER TABLE llx_product_fournisseur ADD INDEX idx_product_fourn_fk_product (fk_product, entity);
 ALTER TABLE llx_product_fournisseur ADD INDEX idx_product_fourn_fk_soc (fk_soc, entity);
+
+ALTER TABLE llx_product_fournisseur ADD CONSTRAINT fk_product_fournisseur_fk_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid);
diff --git a/htdocs/install/phpinfo.php b/htdocs/install/phpinfo.php
index 731c2361f63..dbf19ec25ae 100644
--- a/htdocs/install/phpinfo.php
+++ b/htdocs/install/phpinfo.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
         \file       htdocs/install/phpinfo.php
         \ingroup    install
         \brief      Affichage page phpinfo
-        \version    $Id$
+        \version    $Id: phpinfo.php,v 1.4 2011/07/31 23:26:18 eldy Exp $
 */
 
 phpinfo();
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index 15513fa782a..7d3e0e5c73a 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -14,14 +14,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\file       htdocs/install/repair.php
  *      \brief      Run repair script
- *      \version    $Id$
+ *      \version    $Id: repair.php,v 1.11 2011/07/31 23:26:24 eldy Exp $
  */
 
 include_once("./inc.php");
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index 2c68f71604a..58e0bf1bc0f 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -14,14 +14,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\file       htdocs/install/upgrade.php
  *      \brief      Run migration script
- *      \version    $Id$
+ *      \version    $Id: upgrade.php,v 1.74 2011/07/31 23:26:22 eldy Exp $
  */
 
 include_once("./inc.php");
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 9fa2e1bc089..b588fe56702 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -22,7 +22,7 @@
 /**
  *	\file       htdocs/install/upgrade2.php
  *	\brief      Upgrade some data
- *	\version    $Id$
+ *	\version    $Id: upgrade2.php,v 1.186 2011/07/28 15:30:27 eldy Exp $
  */
 
 include_once('./inc.php');
@@ -306,7 +306,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
             // Reload menus
             migrate_reload_menu($db,$langs,$conf,$versionto);
 
-            print $langs->trans("MigrationFinished");
+	    print '<tr><td colspan="4"><br>'.$langs->trans("MigrationFinished").'</td></tr>';
         }
 
         // Script for VX (X<3.1) -> V3.1
@@ -324,7 +324,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
             // Reload menus
             migrate_reload_menu($db,$langs,$conf,$versionto);
 
-            print $langs->trans("MigrationFinished");
+            print '<tr><td colspan="4"><br>'.$langs->trans("MigrationFinished").'</td></tr>';
         }
 
         // On commit dans tous les cas.
@@ -3158,7 +3158,7 @@ function migrate_directories($db,$langs,$conf,$oldname,$newname)
 
 
 /*
- * Supprime fichiers obsoletes
+ * Delete depracted files
  */
 function migrate_delete_old_files($db,$langs,$conf)
 {
@@ -3172,15 +3172,22 @@ function migrate_delete_old_files($db,$langs,$conf)
     DOL_DOCUMENT_ROOT.'/includes/menus/barre_left/default.php',
     DOL_DOCUMENT_ROOT.'/includes/menus/barre_top/default.php',
     DOL_DOCUMENT_ROOT.'/includes/modules/modComptabiliteExpert.class.php',
+    DOL_DOCUMENT_ROOT.'/includes/modules/modCommercial.class.php',
     DOL_DOCUMENT_ROOT.'/includes/modules/modProduit.class.php',
     DOL_DOCUMENT_ROOT.'/phenix/inc/triggers/interface_modPhenix_Phenixsynchro.class.php',
     DOL_DOCUMENT_ROOT.'/webcalendar/inc/triggers/interface_modWebcalendar_webcalsynchro.class.php',
+    DOL_DOCUMENT_ROOT.'/includes/triggers/interface_modWebcalendar_Webcalsynchro.class.php',
     DOL_DOCUMENT_ROOT.'/includes/triggers/interface_modCommande_Ecotax.class.php',
     DOL_DOCUMENT_ROOT.'/includes/triggers/interface_modCommande_fraisport.class.php',
     DOL_DOCUMENT_ROOT.'/includes/triggers/interface_modPropale_PropalWorkflow.class.php',
+    DOL_DOCUMENT_ROOT.'/includes/menus/smartphone/iphone.lib.php',
+    DOL_DOCUMENT_ROOT.'/includes/menus/smartphone/iphone_backoffice.php',
+    DOL_DOCUMENT_ROOT.'/includes/menus/smartphone/iphone_frontoffice.php',
     DOL_DOCUMENT_ROOT.'/includes/modules/mailings/dolibarr_services_expired.modules.php',
     DOL_DOCUMENT_ROOT.'/includes/modules/mailings/poire.modules.php',
-    DOL_DOCUMENT_ROOT.'/includes/modules/mailings/kiwi.modules.php'
+    DOL_DOCUMENT_ROOT.'/includes/modules/mailings/kiwi.modules.php',
+    DOL_DOCUMENT_ROOT.'/includes/modules/facture/pdf_crabe.modules.php',
+    DOL_DOCUMENT_ROOT.'/includes/modules/facture/pdf_oursin.modules.php'
     );
 
     foreach ($filetodeletearray as $filetodelete)
@@ -3461,4 +3468,4 @@ update llx_facture set paye=1, fk_statut=2 where close_code is null
 and rowid in (...)
 */
 
-?>
\ No newline at end of file
+?>
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 40ea7f6e150..24252ef481f 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -109,8 +109,8 @@ PHPServerOffsetWithGreenwich=Offset amb Greenwich (segons)
 ClientOffsetWithGreenwich=Offset client/navegador amb Greenwich (segons)
 DaylingSavingTime=Horari d'estiu (usuari)
 CurrentHour=Hora PHP (servidor)
-CompanyTZ=Zona Horària empresa (casa mare)
-CompanyHour=Hora empresa (casa mare)
+CompanyTZ=Zona Horària empresa (seu central)
+CompanyHour=Hora empresa (seu central)
 CurrentSessionTimeOut=Time out sessió actual
 OSEnv=Entorn SO
 Box=Panell
@@ -854,6 +854,7 @@ MAIN_PROXY_USER=Login del servidor proxy
 MAIN_PROXY_PASS=Contrasenya del servidor proxy
 DefineHereComplementaryAttributes=Definiu aquí la llista d'atributs addicionals, no disponibles a estàndard, i que vol gestionar per %s.
 ExtraFields=Atributs addicionals
+SendmailOptionNotComplete=Atenció, en alguns sistemes Linux, amb aquest mètode d'enviament, per poder enviar mails en nom seu, la configuració de sendmail ha de contenir l'opció <b>-ba</b> (paràmetre <b>mail.force_extra_parameters</b> a l'arxiu <b>php.ini</b>). Si alguns dels seus destinataris no reben els seus missatges, proveu de modificar aquest paràmetre PHP amb <b>mail.force_extra_parameters =-ba </b>.
 
 ##### Module password generation
 PasswordGenerationStandard=Retorna una contrasenya generada per l'algoritme intern Dolibarr: 8 caràcters, números i caràcters en minúscules barrejades.
@@ -1245,9 +1246,9 @@ ClickToDialDesc=Aquest mòdul permet afegir una icona després del número de te
 CashDesk=TPV
 CashDeskSetup=Mòdul de configuració Terminal Punt de Venda
 CashDeskThirdPartyForSell=Tercer genéric a utilitzar per a les vendes
-CashDeskBankAccountForSell=Compte a utilitzar per als cobraments en efectiu (caixa)
-CashDeskBankAccountForCheque=Compte a utilitzar per als cobraments amb xecs
-CashDeskBankAccountForCB=Compte a utilitzar per als cobraments amb targeta de crèdit
+CashDeskBankAccountForSell=Compte per defecte a utilitzar per als cobraments en efectiu (caixa)
+CashDeskBankAccountForCheque=Compte per defecte a utilitzar per als cobraments amb xecs
+CashDeskBankAccountForCB=Compte per defecte a utilitzar per als cobraments amb targeta de crèdit
 CashDeskIdWareHouse=Magatzem a ultilitzar per a les vendes
 ##### Bookmark #####
 BookmarkSetup=Configuració del mòdul Bookmark
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index 98cfb09575f..0a26289390e 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -355,7 +355,7 @@ ShowUnpaidAll=Mostrar tots els pendents
 ShowUnpaidLateOnly=Mostrar els pendents en retard només
 PaymentInvoiceRef=Pagament factura %s
 ValidateInvoice=Validar factura
-Cash=Líquid
+Cash=Efectiu
 Reported=Ajornat
 InvoiceDeposit=Factura de bestreta
 InvoiceDepositAsk=Factura de bestreta
diff --git a/htdocs/langs/ca_ES/cashdesk.lang b/htdocs/langs/ca_ES/cashdesk.lang
index 699cd6221d6..961d8193949 100755
--- a/htdocs/langs/ca_ES/cashdesk.lang
+++ b/htdocs/langs/ca_ES/cashdesk.lang
@@ -31,4 +31,7 @@ TotalTicket=Total ticket
 NoVAT=Sense IVA per aquesta venda
 Change=Canvi
 CalTip=Feu clic per veure el calendari
-CashDeskSetupStock=La configuració decrementa l'estoc en la creació de factures, però no ha indicat magatzem.<br>Canvieu la configuració del mòdul estoc, o esculli un magatzem
\ No newline at end of file
+CashDeskSetupStock=La configuració decrementa l'estoc en la creació de factures, però no ha indicat magatzem.<br>Canvieu la configuració del mòdul estoc, o esculli un magatzem
+BankToPay=Compte de cobrament
+ShowCompany=Veure empresa
+ShowStock=Veure magatzem
\ No newline at end of file
diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang
index 77e2e4adb78..df7dbb0ab90 100644
--- a/htdocs/langs/ca_ES/companies.lang
+++ b/htdocs/langs/ca_ES/companies.lang
@@ -48,7 +48,7 @@ Individual=Particular
 ToCreateContactWithSameName=Crearà automàticament un contacte físic amb la mateixa informació
 ReportByCustomers=Informe per client
 ReportByQuarter=Informe per tasa
-ParentCompany=Casa mare
+ParentCompany=Seu Central
 Subsidiary=Filial
 Subsidiaries=Filials
 NoSubsidiary=Cap filial
diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang
index 47edc1ef6f5..92d39d84769 100644
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@@ -13,6 +13,8 @@ OptionModeVirtualDesc=En aquest mètode, el balanç es calcula sobre la base de
 FeatureIsSupportedInInOutModeOnly=Funció disponible només en el mode comptes CREDITS-DEUTES (Veure la configuració del mòdul comptes)
 VATReportBuildWithOptionDefinedInModule=Els imports obtinguts es calculen segons la configuració del mòdul Impostos.
 Param=Parametrizaje
+RemainingAmountPayment=Import restant del pagament :
+AmountToBeCharged=Import total a pagar :
 AccountsGeneral=Comptes generals
 Account=Compte
 Accounts=Comptes
diff --git a/htdocs/langs/ca_ES/deliveries.lang b/htdocs/langs/ca_ES/deliveries.lang
index 391711d7f05..1df1b5efec9 100644
--- a/htdocs/langs/ca_ES/deliveries.lang
+++ b/htdocs/langs/ca_ES/deliveries.lang
@@ -5,11 +5,11 @@ Deliveries=Enviaments
 DeliveryCard=Fitxa recepció
 DeliveryOrder=Nota de recepció
 DeliveryOrders=Notes de recepció
-DeliveryDate=Data d'enviament
-DeliveryDateShort=Data d'enviament
+DeliveryDate=Data de lliurament
+DeliveryDateShort=Data lliurament
 CreateDeliveryOrder=Generar nota de recepció
 QtyDelivered=Cant. enviada
-SetDeliveryDate=Indicar la data d'enviament
+SetDeliveryDate=Indicar la data de lliurament
 ValidateDeliveryReceipt=Validar la nota de lliurament
 ValidateDeliveryReceiptConfirm=Esteu segur que voleu validar aquest lliurament?
 DeleteDeliveryReceipt=Eliminar la nota de lliurament
diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
index ec537ca9b5e..52820dfc902 100755
--- a/htdocs/langs/el_GR/other.lang
+++ b/htdocs/langs/el_GR/other.lang
@@ -1,21 +1,6 @@
 # Dolibarr language file - el_GR - other
 CHARSET=UTF-8
-ErrorPasswordDiffers=Passwords differs, please type them again.
-ErrorForbidden=Access denied.<br>You try to access to a page, area or feature without being in an authenticated session or that is not allowed to your user.
-ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s.
-ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...).
-ErrorNoImagickReadimage=Function imagick_readimage is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display.
-ErrorRecordAlreadyExists=Record already exists
-ErrorCantReadFile=Failed to read file '%s'
-ErrorCantReadDir=Failed to read directory '%s'
-ErrorFailedToFindEntity=Failed to read entity '%s'
-ErrorBadLoginPassword=Bad value for login or password
-ErrorLoginDisabled=Your account has been disabled
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
 ErrorFailedToChangePassword=Αποτυχία αλλαγής συνθηματικού
-ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
-ErrorLoginHasNoEmail=This user has no email address. Process aborted.
-ErrorBadValueForCode=Bad value types for code. Try again with a new value...
 SecurityCode=Κωδικός ασφαλείας
 Calendar=Ημερολόγιο
 AddTrip=Προσθήκη ταξιδιού
@@ -41,25 +26,7 @@ AttachANewFile=Επισύναψη νέου αρχείου/εγγράφου
 LinkedObject=Συνδεδεμένα αντικείμενα
 Miscellanous=Διάφορα
 NbOfActiveNotifications=Πλήθος ειδοποιήσεων
-WarningInstallDirExists=Warning, install directory (<b>htdocs/install</b>) still exists. This is a serious security hole. You should removed it as soon as possible.
-WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other setup).
 PredefinedMailTest=Δοκιμαστικο mail.\nΟι δύο γραμμές είναι χωρισμένες με carriage return.
-PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.
-PredefinedMailContentSendInvoice=You will find here the invoice __FACREF__\n\nSincerely\n\n
-PredefinedMailContentSendInvoiceReminder=We would like to warn you that the invoice  __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\nSincerely\n\n
-PredefinedMailContentSendProposal=You will find here the commercial propoal __PROPREF__\n\nSincerely\n\n
-PredefinedMailContentSendOrder=You will find here the order __ORDERREF__\n\nSincerely\n\n
-PredefinedMailContentSendSupplierOrder=You will find here our order __ORDERREF__\n\nSincerely\n\n
-PredefinedMailContentSendSupplierInvoice=You will find here the invoice __FACREF__\n\nSincerely\n\n
-DemoDesc=Dolibarr is a compact ERP/CRM composed by several functional modules. A demo that includes all modules does not mean anything as this never occurs. So, several demo profiles are available.
-ChooseYourDemoProfil=Choose the demo profil that match your activity...
-DemoFundation=Manage members of a foundation
-DemoFundation2=Manage members and bank account of a foundation
-DemoCompanyServiceOnly=Manage a freelance activity selling service only
-DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
-DemoCompanyProductAndStocks=Manage a small or medium company selling products
-DemoCompanyAll=Manage a small or medium company with multiple activities (all main modules)
-GoToDemo=Go to demo
 CreatedBy=Δημιουργήθηκε από %s
 ModifiedBy=Τροποποίηθηκε από %s
 ValidatedBy=Επικυρώθηκε από  %s
@@ -68,10 +35,7 @@ ClosedBy=Έκλεισε από  %s
 FileWasRemoved=File %s was removed
 DirWasRemoved=Directory %s was removed
 FeatureNotYetAvailableShort=Διαθέσιμο σε μία επόμενη έκδοση
-FeatureNotYetAvailable=Feature not yet available in this version
-FeatureExperimental=Experimental feature. Not stable in this version
-FeatureDevelopment=Development feature. Not stable in this version
-FeaturesSupported=Features supported
+FeatureNotYetAvailable=Διαθέσιμο σε μία επόμενη έκδοση
 Width=Πλάτος
 Height=Ύψος
 Depth=Βάθος
@@ -110,47 +74,15 @@ SizeUnitcm=cm
 SizeUnitmm=mm
 SizeUnitinch=ίντσα
 SizeUnitfoot=πόδι
-BugTracker=Bug tracker
-SendNewPasswordDesc=This form allows you to request a new password. It will be send to your email address.<br>Change will be effective only after clicking on confirmation link inside this email.<br>Check your email reader software.
 BackToLoginPage=Επιστροφή στην σελίδα εισόδου
-AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br>In this mode, Dolibarr can't know nor change your password.<br>Contact your system administrator if you want to change your password.
-EnableGDLibraryDesc=Install or enable GD library with your PHP for use this option.
-EnablePhpAVModuleDesc=You need to install a module compatible with your anti-virus. (Clamav : php4-clamavlib ou php5-clamavlib)
-ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>. 
-DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics in number of products/services units
-StatsByNumberOfEntities=Statistics in number of referring entities
-NumberOfProposals=Number of proposals on last 12 month
-NumberOfCustomerOrders=Number of customer orders on last 12 month
-NumberOfCustomerInvoices=Number of customer invoices on last 12 month
-NumberOfSupplierInvoices=Number of supplier invoices on last 12 month
-NumberOfUnitsProposals=Number of units on proposals on last 12 month
-NumberOfUnitsCustomerOrders=Number of units on customer orders on last 12 month
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices on last 12 month
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices on last 12 month
-EMailTextInterventionValidated=The intervention %s has been validated.
-EMailTextInvoiceValidated=The invoice %s has been validated.
-EMailTextProposalValidated=The proposal %s has been validated.
-EMailTextOrderValidated=The order %s has been validated.
-EMailTextOrderApproved=The order %s has been approved.
-EMailTextOrderApprovedBy=The order %s has been approved by %s.
-EMailTextOrderRefused=The order %s has been refused.
-EMailTextOrderRefusedBy=The order %s has been refused by %s.
-ImportedWithSet=Importation data set
 DolibarrNotification=Αυτόματη ειδοποίηση
-ResizeDesc=Enter new width <b>OR</b> new height. Ratio will be kept during resizing...
 NewLength=Νέο βάρος
 NewHeight=Νέο ύψος
 NewSizeAfterCropping=Νέο μέγεθος μετά το ψαλίδισμα
-DefineNewAreaToPick=Define new area on image to pick (left click on image then drag until you reach the opposite corner)
-CurrentInformationOnImage=This tool was designed to help you to resize or crop an image. This is informations on current edited image
 ImageEditor=Επεξεργαστής εικόνας
-YouReceiveMailBecauseOfNotification=You receive this message because your email has been added to list of targets to be informed of particular events into %s software of %s.
 YouReceiveMailBecauseOfNotification2=Το γεγονός είναι το ακόλουθο:
-ThisIsListOfModules=This is a list of modules preselected by this demo profile (only most common modules are visible in this demo). Edit this to have a more personalized demo and click on "Start".
 ClickHere=Πατήστε εδώ
-UseAdvancedPerms=Use the advanced rights permissions in modules
-=
+
 ##### Bookmark #####
 Bookmark=Σελιδοδείκτης
 Bookmarks=Σελιδοδείκτες
@@ -170,11 +102,6 @@ UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external http URL or a relati
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if a page opened by link must appear on current or new window
 BookmarksManagement=Διαχείριση σελιδοδεικτών
 ListOfBookmarks=Λίστα σελιδοδεικτών
-##### Webcal #####
-LoginWebcal=Login for Webcalendar
-ErrorWebcalLoginNotDefined=The Webcalendar login associated to your Dolibarr login <b>%s</b> is not defined.
-##### Phenix #####
-ErrorPhenixLoginNotDefined=The Phenix login associated to your Dolibarr login <b>%s</b> is not defined.
 ##### Calendar common #####
 AddCalendarEntry=Προσθήκη εγγραφής στο ημερολόγιο %s
 NewCompanyToDolibarr=Η εταιρία %s προστέθηκε στο Dolibarr
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 4c319a88739..80a5580d383 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1236,9 +1236,9 @@ ClickToDialDesc=This module allows to add an icon after phone numbers. A click o
 CashDesk=Point of sales
 CashDeskSetup=Point of sales module setup
 CashDeskThirdPartyForSell=Generic third party to use for sells
-CashDeskBankAccountForSell=Account to use to receive cash payments
-CashDeskBankAccountForCheque= Account to use to receive payments by cheque
-CashDeskBankAccountForCB= Account to use to receive cash payments by credit cards
+CashDeskBankAccountForSell=Default account to use to receive cash payments
+CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
+CashDeskBankAccountForCB= Default account to use to receive cash payments by credit cards
 CashDeskIdWareHouse=Warehouse to use for sells
 ##### Bookmark #####
 BookmarkSetup=Bookmark module setup
diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index 2641772aa47..e335b0f7941 100755
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -31,4 +31,7 @@ TotalTicket=Total ticket
 NoVAT=No VAT for this sale
 Change=Excess received
 CalTip=Click to view the calendar
-CashDeskSetupStock=You ask to decrease stock on invoice creation but warehouse for this is was not defined<br>Change stock module setup, or choose a warehouse
\ No newline at end of file
+CashDeskSetupStock=You ask to decrease stock on invoice creation but warehouse for this is was not defined<br>Change stock module setup, or choose a warehouse
+BankToPay=Charge Account
+ShowCompany=Show company
+ShowStock=Show warehouse
\ No newline at end of file
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 50c3f887959..b1e399af7ef 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -13,6 +13,8 @@ OptionModeVirtualDesc=In this context, the turnover is calculated over invoices
 FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration)
 VATReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Tax module setup.
 Param=Setup
+RemainingAmountPayment=Amount payment remaining :
+AmountToBeCharged=Total amount to pay :
 AccountsGeneral=Accounts
 Account=Account
 Accounts=Accounts
diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang
index 25bb3b518fe..02bb95324bf 100644
--- a/htdocs/langs/en_US/exports.lang
+++ b/htdocs/langs/en_US/exports.lang
@@ -96,6 +96,7 @@ TooMuchErrors=There is still <b>%s</b> other source lines with errors but output
 TooMuchWarnings=There is still <b>%s</b> other source lines with warnings but output has been limited.
 EmptyLine=Empty line (will be discarded)
 CorrectErrorBeforeRunningImport=You must first correct all errors before running definitive import.
+FileWasImported=File was imported with number <b>%s</b>. 
 YouCanUseImportIdToFindRecord=You can find all imported records in your database by filtering on field <b>import_key='%s'</b>.
 NbOfLinesOK=Number of lines with no errors and no warnings: <b>%s</b>.
 NbOfLinesImported=Number of lines successfully imported: <b>%s</b>.
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 2a40f944abf..3c909792a01 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -156,7 +156,7 @@ YouReceiveMailBecauseOfNotification=You receive this message because your email
 YouReceiveMailBecauseOfNotification2=This event is the following:
 ThisIsListOfModules=This is a list of modules preselected by this demo profile (only most common modules are visible in this demo). Edit this to have a more personalized demo and click on "Start".
 ClickHere=Click here
-UseAdvancedPerms=Use the advanced rights permissions in modules
+UseAdvancedPerms=Use the advanced permissions of some modules
 FileFormat=File format
 SelectAColor=Choose a color
 AddFiles=Add Files
@@ -183,11 +183,6 @@ UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external http URL or a relati
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if a page opened by link must appear on current or new window
 BookmarksManagement=Bookmarks management
 ListOfBookmarks=List of bookmarks
-##### Webcal #####
-LoginWebcal=Login for Webcalendar
-ErrorWebcalLoginNotDefined=The Webcalendar login associated to your Dolibarr login <b>%s</b> is not defined.
-##### Phenix #####
-ErrorPhenixLoginNotDefined=The Phenix login associated to your Dolibarr login <b>%s</b> is not defined.
 ##### Calendar common #####
 AddCalendarEntry=Add entry in calendar %s
 NewCompanyToDolibarr=Company %s added into Dolibarr
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 77b9515000b..c4ea6eac339 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -109,8 +109,8 @@ PHPServerOffsetWithGreenwich=Offset servidor con Greenwich (segundos)
 ClientOffsetWithGreenwich=Offset cliente/navegador con Greenwich (segundos)
 DaylingSavingTime=Horario de verano (usuario)
 CurrentHour=Hora PHP (servidor)
-CompanyTZ=Zona Horaria empresa (casa madre)
-CompanyHour=Hora empresa (casa madre)
+CompanyTZ=Zona Horaria empresa (sede central)
+CompanyHour=Hora empresa (sede central)
 CurrentSessionTimeOut=Time out sesión actual
 OSEnv=Entorno SO
 Box=Panel
@@ -854,7 +854,8 @@ MAIN_PROXY_USER=Login del servidor proxy
 MAIN_PROXY_PASS=Contraseña del servidor proxy
 DefineHereComplementaryAttributes=Defina aquí la lista de atributos adicionales, no disponibles en estándar, y que desea gestionar para %s.
 ExtraFields=Atributos adicionales
-
+SendmailOptionNotComplete=Atención, en algunos sistemas Linux, con este método de envio, para poder enviar mails en su nombre, la configuración de sendmail debe contener la opción <b>-ba</b> (parámetro <b>mail.force_extra_parameters</b> en el archivo <b>php.ini</b>). Si algunos de sus destinatarios no reciben sus mensajes, pruebe a modificar este parámetro PHP con <b>mail.force_extra_parameters = -ba</b>.
+	 
 ##### Module password generation
 PasswordGenerationStandard=Devuelve una contraseña generada por el algoritmo interno Dolibarr: 8 caracteres, números y caracteres en minúsculas mezcladas.
 PasswordGenerationNone=No ofrece contraseñas. La contraseña se introduce manualmente.
@@ -1245,9 +1246,9 @@ ClickToDialDesc=Este módulo permite agregar un icono después del número de te
 CashDesk=TPV
 CashDeskSetup=Configuración del módulo Terminal Punto de Venta
 CashDeskThirdPartyForSell=Tercero genérico a usar para la venta
-CashDeskBankAccountForSell=Cuenta a utilizar para los cobros en efectivo (caja)
-CashDeskBankAccountForCheque=Cuenta a utilizar para los cobros con cheques
-CashDeskBankAccountForCB=Cuenta a utilizar para los cobros con tarjeta de crédito
+CashDeskBankAccountForSell=Cuenta por defecto a utilizar para los cobros en efectivo (caja)
+CashDeskBankAccountForCheque=Cuenta por defecto a utilizar para los cobros con cheques
+CashDeskBankAccountForCB=Cuenta por defecto a utilizar para los cobros con tarjeta de crédito
 CashDeskIdWareHouse=Almacén a utilizar para las ventas
 ##### Bookmark #####
 BookmarkSetup=Configuración del módulo Marcadores
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index 290e00bc679..1e12a3d19ac 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -355,7 +355,7 @@ ShowUnpaidAll=Mostrar todos los pendientes
 ShowUnpaidLateOnly=Mostrar los pendientes en retraso solamente
 PaymentInvoiceRef=Pago factura %s
 ValidateInvoice=Validar factura
-Cash=Líquido
+Cash=Efectivo
 Reported=Aplazado
 InvoiceDeposit=Factura de anticipo
 InvoiceDepositAsk=Factura de anticipo
diff --git a/htdocs/langs/es_ES/cashdesk.lang b/htdocs/langs/es_ES/cashdesk.lang
index d849444ec87..0e2d2bcf390 100755
--- a/htdocs/langs/es_ES/cashdesk.lang
+++ b/htdocs/langs/es_ES/cashdesk.lang
@@ -31,4 +31,7 @@ TotalTicket=Total ticket
 NoVAT=Sin IVA en esta venta
 Change=Cambio
 CalTip=Haga clic para ver el calendario
-CashDeskSetupStock=La configuración decrementa el stock en la creación de facturas, pero no ha indicado almacén.<br>Cambie la configuración del módulo stock, o escoja un almacén
\ No newline at end of file
+CashDeskSetupStock=La configuración decrementa el stock en la creación de facturas, pero no ha indicado almacén.<br>Cambie la configuración del módulo stock, o escoja un almacén
+BankToPay=Cuenta de cobro
+ShowCompany=Ver empresa
+ShowStock=Ver almacén
\ No newline at end of file
diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang
index 23d49bba0a2..7f2e6f9fdf4 100644
--- a/htdocs/langs/es_ES/companies.lang
+++ b/htdocs/langs/es_ES/companies.lang
@@ -48,7 +48,7 @@ Individual=Particular
 ToCreateContactWithSameName=Creará automáticamente un contacto físico con la misma información
 ReportByCustomers=Informe por cliente
 ReportByQuarter=Informe por tasa
-ParentCompany=Casa madre
+ParentCompany=Sede central
 Subsidiary=Filial
 Subsidiaries=Filiales
 NoSubsidiary=Ninguna filial
diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
index 94b82b26dc7..8d7575fb961 100644
--- a/htdocs/langs/es_ES/compta.lang
+++ b/htdocs/langs/es_ES/compta.lang
@@ -13,6 +13,8 @@ OptionModeVirtualDesc=En este método, el balance se calcula sobre la base de la
 FeatureIsSupportedInInOutModeOnly=Función disponible solamente en el modo cuentas CREDITOS-DEUDAS (Véase la configuración del módulo cuentas)
 VATReportBuildWithOptionDefinedInModule=Los importes obtenidos se calculan según la configuración del módulo Impuestos.
 Param=Parametrizaje
+RemainingAmountPayment=Importe restante del pago :
+AmountToBeCharged=Importe total a pagar :
 AccountsGeneral=Cuentas generales
 Account=Cuenta
 Accounts=Cuentas
diff --git a/htdocs/langs/es_ES/deliveries.lang b/htdocs/langs/es_ES/deliveries.lang
index 563cc9c8315..bedba410da4 100644
--- a/htdocs/langs/es_ES/deliveries.lang
+++ b/htdocs/langs/es_ES/deliveries.lang
@@ -5,11 +5,11 @@ Deliveries=Envíos
 DeliveryCard=Ficha recepción
 DeliveryOrder=Nota de recepción
 DeliveryOrders=Notas de recepción
-DeliveryDate=Fecha de envío
-DeliveryDateShort=Fecha envío
+DeliveryDate=Fecha de entrega
+DeliveryDateShort=Fecha entrega
 CreateDeliveryOrder=Generar nota de recepción
 QtyDelivered=Cant. enviada
-SetDeliveryDate=Indicar la fecha de envío
+SetDeliveryDate=Indicar la fecha de entrega
 ValidateDeliveryReceipt=Validar la nota de entrega
 ValidateDeliveryReceiptConfirm=¿Está seguro de que desea validar esta entrega?
 DeleteDeliveryReceipt=Eliminar la nota de entrega
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index df3a3521b84..bc58c85a93c 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -1248,9 +1248,9 @@ ClickToDialDesc= Ce module permet d'ajouter un petit picto à côté des numéro
 CashDesk=Caisse enregistreuse
 CashDeskSetup= Configuration du module Point de vente/caisse enregistreuse
 CashDeskThirdPartyForSell= Tiers générique à utiliser pour les ventes
-CashDeskBankAccountForSell= Compte à utiliser pour l'encaissement en liquide (cash)
-CashDeskBankAccountForCheque= Compte à utiliser pour l'encaissement en chèque
-CashDeskBankAccountForCB= Compte à utiliser pour l'encaissement par carte de crédit
+CashDeskBankAccountForSell= Compte par défaut à utiliser pour l'encaissement en liquide (cash)
+CashDeskBankAccountForCheque= Compte par défaut à utiliser pour l'encaissement en chèque
+CashDeskBankAccountForCB= Compte par défaut à utiliser pour l'encaissement par carte de crédit
 CashDeskIdWareHouse= Entrepôt à utiliser pour les ventes
 ##### Bookmark #####
 BookmarkSetup= Configuration du module Bookmark
diff --git a/htdocs/langs/fr_FR/cashdesk.lang b/htdocs/langs/fr_FR/cashdesk.lang
index e8d4cc0ee84..6e03cc886eb 100755
--- a/htdocs/langs/fr_FR/cashdesk.lang
+++ b/htdocs/langs/fr_FR/cashdesk.lang
@@ -31,4 +31,7 @@ TotalTicket=Total ticket
 NoVAT=Pas de TVA pour cette vente
 Change=Rendu
 CalTip=Cliquez pour afficher le calendrier
-CashDeskSetupStock=La configuration du module stock demande une réduction du stock sur facturation, mais vous n'avez pas spécifiez d'entrepôt. Vous devez modifier la configuration du module stock ou choisir un entrepôt.
\ No newline at end of file
+CashDeskSetupStock=La configuration du module stock demande une réduction du stock sur facturation, mais vous n'avez pas spécifiez d'entrepôt. Vous devez modifier la configuration du module stock ou choisir un entrepôt.
+BankToPay=Compte à créditer
+ShowCompany=Voir société
+ShowStock=Voir entrepôt
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index f2d91f35f70..1bd9a474680 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -13,6 +13,8 @@ OptionModeVirtualDesc=Dans ce mode, le CA est calculé sur la base des factures
 FeatureIsSupportedInInOutModeOnly=Fonction disponible uniquement en mode compta CREANCES-DETTES (Voir configuration du module compta)
 VATReportBuildWithOptionDefinedInModule=Les montants obtenus sont ceux calculés à partir des règles de calcul paramétrées pour le module Taxes.
 Param=Paramétrage
+RemainingAmountPayment=Montant restant du paiement :
+AmountToBeCharged=Montant total à payer :
 AccountsGeneral=Comptes généraux
 Account=Compte
 Accounts=Comptes
diff --git a/htdocs/externalsite/langs/fr_FR/externalsite.lang b/htdocs/langs/fr_FR/externalsite.lang
old mode 100644
new mode 100755
similarity index 100%
rename from htdocs/externalsite/langs/fr_FR/externalsite.lang
rename to htdocs/langs/fr_FR/externalsite.lang
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 53195d78899..7266bedcf38 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -183,11 +183,6 @@ UseAnExternalHttpLinkOrRelativeDolibarrLink=Saisir une URL http externe ou une U
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choisir si le raccourci doit ouvrir la page dans une nouvelle fenêtre ou fenêtre courante
 BookmarksManagement=Gestion des marque-pages
 ListOfBookmarks=Liste des marque-pages
-##### Webcal #####
-LoginWebcal=Login Webcalendar
-ErrorWebcalLoginNotDefined=Le login Webcalendar associé à votre login Dolibarr <b>%s</b> n'est pas défini.
-##### Phenix #####
-ErrorPhenixLoginNotDefined=Le login Phenix associé à votre login Dolibarr <b>%s</b> n'est pas défini.
 ##### Calendar common #####
 AddCalendarEntry=Ajouter entrée dans le calendrier %s
 NewCompanyToDolibarr=Société %s ajoutée dans Dolibarr
diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php
index 8dda1a9d93b..eedf4ec7d87 100644
--- a/htdocs/lib/CMailFile.class.php
+++ b/htdocs/lib/CMailFile.class.php
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  *
  * Lots of code inspired from Dan Potter's CMailFile class
@@ -25,7 +24,7 @@
 /**
  *      \file       htdocs/lib/CMailFile.class.php
  *      \brief      File of class to send emails (with attachments or not)
- *		\version    $Id: CMailFile.class.php,v 1.147 2011/07/20 13:01:03 eldy Exp $
+ *		\version    $Id: CMailFile.class.php,v 1.148 2011/07/31 23:25:43 eldy Exp $
  *      \author     Dan Potter.
  *      \author	    Eric Seigne
  *      \author	    Laurent Destailleur.
diff --git a/htdocs/lib/CSMSFile.class.php b/htdocs/lib/CSMSFile.class.php
index 4a78dcddf72..1ac2edcb54a 100755
--- a/htdocs/lib/CSMSFile.class.php
+++ b/htdocs/lib/CSMSFile.class.php
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  *
  * Lots of code inspired from Dan Potter's CSMSFile class
@@ -25,7 +24,7 @@
 /**
  *      \file       htdocs/lib/CSMSFile.class.php
  *      \brief      File of class to send sms
- *		\version    $Id: CSMSFile.class.php,v 1.5 2011/07/07 22:17:21 eldy Exp $
+ *		\version    $Id: CSMSFile.class.php,v 1.6 2011/07/31 23:25:22 eldy Exp $
  *      \author	    Laurent Destailleur.
  */
 
diff --git a/htdocs/lib/accountancy.lib.php b/htdocs/lib/accountancy.lib.php
index 6ef49c8af6a..17ebf316f9a 100644
--- a/htdocs/lib/accountancy.lib.php
+++ b/htdocs/lib/accountancy.lib.php
@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file			htdocs/lib/accountancy.lib.php
  *  \brief			Library of accountancy functions
- * 	\version		$Id: accountancy.lib.php,v 1.2 2011/07/04 10:30:01 eldy Exp $
+ * 	\version		$Id: accountancy.lib.php,v 1.3 2011/07/31 23:25:31 eldy Exp $
  */
 
 /**
diff --git a/htdocs/lib/admin.lib.php b/htdocs/lib/admin.lib.php
index ff6f9d92e55..4092c55ff2d 100644
--- a/htdocs/lib/admin.lib.php
+++ b/htdocs/lib/admin.lib.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2008-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2011 Regis Houssin        <regis@dolibarr.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
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
 /**
  *	\file			htdocs/lib/admin.lib.php
  *  \brief			Library of admin functions
- *  \version		$Id: admin.lib.php,v 1.97 2011/07/17 18:13:44 eldy Exp $
+ *  \version		$Id: admin.lib.php,v 1.99 2011/08/01 12:53:37 hregis Exp $
  */
 
 
@@ -468,7 +467,7 @@ function dolibarr_set_const($db, $name, $value, $type='chaine', $visible=0, $not
 /**
  *  \brief      	Define head array for tabs of security setup pages
  *  \return			Array of head
- *  \version    	$Id: admin.lib.php,v 1.97 2011/07/17 18:13:44 eldy Exp $
+ *  \version    	$Id: admin.lib.php,v 1.99 2011/08/01 12:53:37 hregis Exp $
  */
 function security_prepare_head()
 {
@@ -616,16 +615,41 @@ function Activate($value,$withdeps=1)
     // Activate module
     if ($modName)
     {
-        $file = $modName . ".class.php";
+        $modFile = $modName . ".class.php";
 
         // Loop on each directory
         $found=false;
-        foreach ($conf->file->dol_document_root as $dol_document_root)
+    	foreach ($conf->file->dol_document_root as $type => $dirroot)
         {
-            $dir = $dol_document_root."/includes/modules/";
+            $modulesdir[] = $dirroot."/includes/modules/";
+            
+            if ($type == 'alt')
+			{	
+				$handle=@opendir($dirroot);
+				if (is_resource($handle))
+				{
+					while (($file = readdir($handle))!==false)
+					{
+					    if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
+					    {
+					    	if (is_dir($dirroot . '/' . $file . '/includes/modules/'))
+					    	{
+					    		$modulesdir[] = $dirroot . '/' . $file . '/includes/modules/';
+					    	}
+					    }
+					}
+					closedir($handle);
+				}
+			}
+        }
 
-        	$found=@include_once($dir.$file);
-            if ($found) break;
+        foreach ($modulesdir as $dir)
+        {
+        	if (file_exists($dir.$modFile))
+        	{
+        		$found=@include_once($dir.$modFile);
+        		if ($found) break;
+        	}
         }
 
         $objMod = new $modName($db);
@@ -701,20 +725,46 @@ function UnActivate($value,$requiredby=1)
     $modName = $value;
 
     $ret='';
+    $modulesdir=array();
 
     // Desactivation du module
     if ($modName)
     {
-        $file = $modName . ".class.php";
+        $modFile = $modName . ".class.php";
 
         // Loop on each directory
 		$found=false;
-        foreach ($conf->file->dol_document_root as $dol_document_root)
+        foreach ($conf->file->dol_document_root as $type => $dirroot)
         {
-            $dir = $dol_document_root."/includes/modules/";
+            $modulesdir[] = $dirroot."/includes/modules/";
+            
+            if ($type == 'alt')
+			{	
+				$handle=@opendir($dirroot);
+				if (is_resource($handle))
+				{
+					while (($file = readdir($handle))!==false)
+					{
+					    if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
+					    {
+					    	if (is_dir($dirroot . '/' . $file . '/includes/modules/'))
+					    	{
+					    		$modulesdir[] = $dirroot . '/' . $file . '/includes/modules/';
+					    	}
+					    }
+					}
+					closedir($handle);
+				}
+			}
+        }
 
-        	$found=@include_once($dir.$file);
-            if ($found) break;
+        foreach ($modulesdir as $dir)
+        {
+        	if (file_exists($dir.$modFile))
+        	{
+        		$found=@include_once($dir.$modFile);
+        		if ($found) break;
+        	}
         }
 
         if ($found)
diff --git a/htdocs/lib/agenda.lib.php b/htdocs/lib/agenda.lib.php
index 91a96d0e6e2..d47b327541d 100644
--- a/htdocs/lib/agenda.lib.php
+++ b/htdocs/lib/agenda.lib.php
@@ -22,7 +22,7 @@
 /**
  *  \file		htdocs/lib/agenda.lib.php
  *  \brief		Set of function for the agenda module
- *  \version	$Id$
+ *  \version	$Id: agenda.lib.php,v 1.42 2011/07/22 06:51:30 simnandez Exp $
  */
 
 
@@ -324,13 +324,11 @@ function agenda_prepare_head()
 	$head[$h][2] = 'xcal';
 	$h++;
 
-	if ($conf->global->MAIN_FEATURES_LEVEL >= 2)   // In dev version only for the moment
-	{
-    	$head[$h][0] = DOL_URL_ROOT."/admin/agenda_extsites.php";
-    	$head[$h][1] = $langs->trans("ExtSites");
-    	$head[$h][2] = 'extsites';
-    	$h++;
-	}
+	$head[$h][0] = DOL_URL_ROOT."/admin/agenda_extsites.php";
+	$head[$h][1] = $langs->trans("ExtSites");
+	$head[$h][2] = 'extsites';
+	$h++;
+
 
 	return $head;
 }
diff --git a/htdocs/lib/ajax.lib.php b/htdocs/lib/ajax.lib.php
index 1d6c000c6a1..7db1908bc49 100644
--- a/htdocs/lib/ajax.lib.php
+++ b/htdocs/lib/ajax.lib.php
@@ -21,7 +21,7 @@
 /**
  *  \file		htdocs/lib/ajax.lib.php
  *  \brief		Page called by Ajax request for produts
- *  \version	$Id: ajax.lib.php,v 1.58 2011/07/10 18:24:18 hregis Exp $
+ *  \version	$Id: ajax.lib.php,v 1.59 2011/07/28 18:57:23 eldy Exp $
  */
 
 
@@ -201,7 +201,10 @@ function ajax_dialog($title,$message,$w=350,$h=150)
 }
 
 /**
- * 	Convert combox
+ * 	Convert a select html field into an ajax combobox
+ *
+ * 	@param		htmlname		Name of html field
+ *  @return		string			Return html string to convert a select field into a combo
  */
 function ajax_combobox($htmlname)
 {
@@ -218,6 +221,7 @@ function ajax_combobox($htmlname)
 
 /**
  * 	On/off button for constant
+ *
  * 	@param		code	Name of constant
  * 	@param		input	Input element
  * 	TODO add different method for other input (show/hide, disable, ..)
@@ -229,7 +233,7 @@ function ajax_constantonoff($code,$input=array())
 	$out= '<script type="text/javascript">
 		$(function() {
 			var input='.json_encode($input).';
-			
+
 			// Set constant
 			$( "#set_'.$code.'" ).click(function() {
 				$.get( "'.DOL_URL_ROOT.'/core/ajaxconstantonoff.php", {
@@ -244,10 +248,10 @@ function ajax_constantonoff($code,$input=array())
 						$.each(input, function(key,value) {
 							$( "#" + value).removeAttr("disabled");
 						});
-					}		
+					}
 				});
 			});
-			
+
 			// Del constant
 			$( "#del_'.$code.'" ).click(function() {
 				$.get( "'.DOL_URL_ROOT.'/core/ajaxconstantonoff.php", {
diff --git a/htdocs/lib/antispamimage.php b/htdocs/lib/antispamimage.php
index dbf736fd561..73d12265ab2 100644
--- a/htdocs/lib/antispamimage.php
+++ b/htdocs/lib/antispamimage.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
 /**
  *		\file       htdocs/lib/antispamimage.php
  *		\brief      Return antispam image
- *		\version    $Id$
+ *		\version    $Id: antispamimage.php,v 1.16 2011/07/31 23:25:15 eldy Exp $
  */
 
 define('NOLOGIN',1);
diff --git a/htdocs/lib/antivir.class.php b/htdocs/lib/antivir.class.php
index 692591582b8..f0a19cd0a9f 100644
--- a/htdocs/lib/antivir.class.php
+++ b/htdocs/lib/antivir.class.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
 /**
  *      \file       htdocs/lib/antivir.class.php
  *      \brief      File of class to scan viruses
- *		\version    $Id$
+ *		\version    $Id: antivir.class.php,v 1.8 2011/07/31 23:25:40 eldy Exp $
  *      \author	    Laurent Destailleur.
  */
 
diff --git a/htdocs/lib/bank.lib.php b/htdocs/lib/bank.lib.php
index 5374d9b964b..b98da9b9e98 100644
--- a/htdocs/lib/bank.lib.php
+++ b/htdocs/lib/bank.lib.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +20,7 @@
 	    \file       htdocs/lib/bank.lib.php
 		\brief      Ensemble de fonctions de base pour le module banque
         \ingroup    banque
-        \version    $Id$
+        \version    $Id: bank.lib.php,v 1.14 2011/07/31 23:25:13 eldy Exp $
 
 		Ensemble de fonctions de base de dolibarr sous forme d'include
 */
diff --git a/htdocs/lib/bookmark.lib.php b/htdocs/lib/bookmark.lib.php
index 710dad92b21..fa60813c577 100644
--- a/htdocs/lib/bookmark.lib.php
+++ b/htdocs/lib/bookmark.lib.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
 /**
  *	    \file       htdocs/lib/bookmark.lib.php
  *		\brief      List of functions for bookmark module
- *		\version    $Id$
+ *		\version    $Id: bookmark.lib.php,v 1.6 2011/07/31 23:25:41 eldy Exp $
  *
  *		Ensemble de fonctions de base de dolibarr sous forme d'include
  */
diff --git a/htdocs/lib/categories.lib.php b/htdocs/lib/categories.lib.php
index e3d99f899b6..e5b99b328d7 100644
--- a/htdocs/lib/categories.lib.php
+++ b/htdocs/lib/categories.lib.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +20,7 @@
  *	\file       htdocs/lib/categories.lib.php
  *	\brief      Ensemble de fonctions de base pour le module categorie
  *	\ingroup    categorie
- *	\version    $Id$
+ *	\version    $Id: categories.lib.php,v 1.2 2011/07/31 23:26:02 eldy Exp $
  *
  * 	Ensemble de fonctions de base de dolibarr sous forme d'include
  */
diff --git a/htdocs/lib/company.lib.php b/htdocs/lib/company.lib.php
index 91fe7bfcfad..08da9d4e6ec 100644
--- a/htdocs/lib/company.lib.php
+++ b/htdocs/lib/company.lib.php
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -24,7 +23,7 @@
  *	\file       htdocs/lib/company.lib.php
  *	\brief      Ensemble de fonctions de base pour le module societe
  *	\ingroup    societe
- *	\version    $Id: company.lib.php,v 1.122 2011/07/04 08:38:51 eldy Exp $
+ *	\version    $Id: company.lib.php,v 1.123 2011/07/31 23:25:41 eldy Exp $
  */
 
 /**
diff --git a/htdocs/lib/contact.lib.php b/htdocs/lib/contact.lib.php
index 5f711e11a97..41b8a344540 100644
--- a/htdocs/lib/contact.lib.php
+++ b/htdocs/lib/contact.lib.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
 /**
  *	    \file       htdocs/lib/contact.lib.php
  *		\brief      Ensemble de fonctions de base pour les contacts
- *		\version    $Id$
+ *		\version    $Id: contact.lib.php,v 1.10 2011/07/31 23:25:22 eldy Exp $
  *
  *		Ensemble de fonctions de base de dolibarr sous forme d'include
  */
diff --git a/htdocs/lib/contract.lib.php b/htdocs/lib/contract.lib.php
index 023e28b4303..88d45e2305e 100644
--- a/htdocs/lib/contract.lib.php
+++ b/htdocs/lib/contract.lib.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
 /**
 	    \file       htdocs/lib/contract.lib.php
 		\brief      Ensemble de fonctions de base pour le module contrat
-		\version    $Id$
+		\version    $Id: contract.lib.php,v 1.9 2011/07/31 23:25:21 eldy Exp $
 */
 
 function contract_prepare_head($object)
diff --git a/htdocs/lib/databases/index.php b/htdocs/lib/databases/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/lib/databases/index.php
+++ b/htdocs/lib/databases/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/lib/databases/mssql.lib.php b/htdocs/lib/databases/mssql.lib.php
index 3bc42a1fa4a..9328e2cb852 100644
--- a/htdocs/lib/databases/mssql.lib.php
+++ b/htdocs/lib/databases/mssql.lib.php
@@ -15,14 +15,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       	htdocs/lib/databases/mssql.lib.php
  *	\brief			Fichier de la classe permettant de gerer une base mssql
- *	\version		$Id$
+ *	\version		$Id: mssql.lib.php,v 1.86 2011/07/31 23:26:03 eldy Exp $
  */
 
 // Pour compatibilite lors de l'upgrade
diff --git a/htdocs/lib/databases/mysql.lib.php b/htdocs/lib/databases/mysql.lib.php
index 66f7c8e7661..bccac28c77e 100644
--- a/htdocs/lib/databases/mysql.lib.php
+++ b/htdocs/lib/databases/mysql.lib.php
@@ -16,14 +16,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       	htdocs/lib/databases/mysql.lib.php
  *	\brief      	Class file to manage Dolibarr database access for a Mysql database
- *	\version		$Id$
+ *	\version		$Id: mysql.lib.php,v 1.119 2011/07/31 23:26:03 eldy Exp $
  */
 // For compatibility during upgrade
 if (! defined('DOL_DOCUMENT_ROOT'))	 define('DOL_DOCUMENT_ROOT', '../..');
diff --git a/htdocs/lib/databases/mysqli.lib.php b/htdocs/lib/databases/mysqli.lib.php
index 36ab4c73646..7aaba18459e 100644
--- a/htdocs/lib/databases/mysqli.lib.php
+++ b/htdocs/lib/databases/mysqli.lib.php
@@ -16,14 +16,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/lib/databases/mysqli.lib.php
  *	\brief      Class file to manage Dolibarr database access for a Mysql database
- *	\version	$Id$
+ *	\version	$Id: mysqli.lib.php,v 1.113 2011/07/31 23:26:03 eldy Exp $
  */
 
 // For compatibility during upgrade
diff --git a/htdocs/lib/databases/pgsql.lib.php b/htdocs/lib/databases/pgsql.lib.php
index 4a6e7947683..4e1a249b429 100644
--- a/htdocs/lib/databases/pgsql.lib.php
+++ b/htdocs/lib/databases/pgsql.lib.php
@@ -17,14 +17,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/lib/databases/pgsql.lib.php
  *	\brief      Fichier de la classe permettant de gerer une base pgsql
- *	\version	$Id: pgsql.lib.php,v 1.109 2011/07/04 07:36:30 eldy Exp $
+ *	\version	$Id: pgsql.lib.php,v 1.110 2011/07/31 23:26:03 eldy Exp $
  */
 // For compatibility during upgrade
 if (! defined('DOL_DOCUMENT_ROOT'))	 define('DOL_DOCUMENT_ROOT', '../..');
diff --git a/htdocs/lib/date.lib.php b/htdocs/lib/date.lib.php
index 36f8669a8db..5d05a731342 100644
--- a/htdocs/lib/date.lib.php
+++ b/htdocs/lib/date.lib.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
 /**
  *  \file		htdocs/lib/date.lib.php
  *  \brief		Set of function to manipulate dates
- *  \version	$Id: date.lib.php,v 1.32 2011/07/04 08:38:51 eldy Exp $
+ *  \version	$Id: date.lib.php,v 1.33 2011/07/31 23:25:42 eldy Exp $
  */
 
 
diff --git a/htdocs/lib/datepicker.php b/htdocs/lib/datepicker.php
index 3988c2d4ce1..54d6446ca07 100644
--- a/htdocs/lib/datepicker.php
+++ b/htdocs/lib/datepicker.php
@@ -17,14 +17,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/lib/datepicker.php
  *       \brief      Fichier de gestion de la popup de selection de date eldy
- *       \version    $Id$
+ *       \version    $Id: datepicker.php,v 1.32 2011/07/31 23:25:29 eldy Exp $
  */
 
 if (! defined('NOREQUIREUSER'))   define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
diff --git a/htdocs/lib/doleditor.class.php b/htdocs/lib/doleditor.class.php
index 73c19b621f6..0544b840a11 100644
--- a/htdocs/lib/doleditor.class.php
+++ b/htdocs/lib/doleditor.class.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
 /**
  *       \file       htdocs/lib/doleditor.class.php
  *       \brief      Class to manage a WYSIWYG editor
- *       \version    $Id: doleditor.class.php,v 1.44 2011/07/06 12:45:36 eldy Exp $
+ *       \version    $Id: doleditor.class.php,v 1.45 2011/07/31 23:26:01 eldy Exp $
  */
 
 /**
diff --git a/htdocs/lib/dolgeoip.class.php b/htdocs/lib/dolgeoip.class.php
index 811b7e2f41f..4ae62e7d418 100644
--- a/htdocs/lib/dolgeoip.class.php
+++ b/htdocs/lib/dolgeoip.class.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +20,7 @@
  *  \file		htdocs/lib/dolgeoip.class.php
  * 	\ingroup	geoip
  *  \brief		Library for managing module geoip
- *  \version	$Id$
+ *  \version	$Id: dolgeoip.class.php,v 1.5 2011/07/31 23:26:01 eldy Exp $
  */
 
 
diff --git a/htdocs/lib/doxygen.php b/htdocs/lib/doxygen.php
index 2df7d35d9fe..0fefe2032fd 100644
--- a/htdocs/lib/doxygen.php
+++ b/htdocs/lib/doxygen.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
diff --git a/htdocs/lib/ecm.lib.php b/htdocs/lib/ecm.lib.php
index 8af11f09d53..6ef5d7ad4fb 100644
--- a/htdocs/lib/ecm.lib.php
+++ b/htdocs/lib/ecm.lib.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +20,7 @@
  *  \file       htdocs/lib/ecm.lib.php
  *  \brief      Ensemble de fonctions de base pour le module ecm
  *  \ingroup    ecm
- *  \version    $Id$
+ *  \version    $Id: ecm.lib.php,v 1.5 2011/07/31 23:25:21 eldy Exp $
  */
 
 
diff --git a/htdocs/lib/emailing.lib.php b/htdocs/lib/emailing.lib.php
index 888cd4d21ee..aca6edde708 100644
--- a/htdocs/lib/emailing.lib.php
+++ b/htdocs/lib/emailing.lib.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
 /**
  *	    \file       htdocs/lib/emailing.lib.php
  *		\brief      Library file with function for emailing module
- *		\version    $Id$
+ *		\version    $Id: emailing.lib.php,v 1.3 2011/07/31 23:25:32 eldy Exp $
  */
 
 /**
diff --git a/htdocs/lib/fichinter.lib.php b/htdocs/lib/fichinter.lib.php
index 065bf7b6664..69a875f7ab7 100644
--- a/htdocs/lib/fichinter.lib.php
+++ b/htdocs/lib/fichinter.lib.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +21,7 @@
  *	\file       htdocs/lib/fichinter.lib.php
  *	\brief      Ensemble de fonctions de base pour le module fichinter
  *	\ingroup    fichinter
- *	\version    $Id$
+ *	\version    $Id: fichinter.lib.php,v 1.15 2011/07/31 23:25:17 eldy Exp $
  *
  * 	Ensemble de fonctions de base de dolibarr sous forme d'include
  */
diff --git a/htdocs/lib/files.lib.php b/htdocs/lib/files.lib.php
index 95fb3e6adb0..312cece614e 100644
--- a/htdocs/lib/files.lib.php
+++ b/htdocs/lib/files.lib.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
 /**
  *  \file		htdocs/lib/files.lib.php
  *  \brief		Library for file managing functions
- *  \version	$Id: files.lib.php,v 1.70 2011/07/14 05:21:53 hregis Exp $
+ *  \version	$Id: files.lib.php,v 1.71 2011/07/31 23:25:43 eldy Exp $
  */
 
 /**
diff --git a/htdocs/lib/format_cards.lib.php b/htdocs/lib/format_cards.lib.php
index 6754416659e..80312414d70 100644
--- a/htdocs/lib/format_cards.lib.php
+++ b/htdocs/lib/format_cards.lib.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +22,7 @@
  *	\file       htdocs/lib/format_cards.lib.php
  *	\brief      Set of functions used for cards generation
  *	\ingroup    core
- *	\version    $Id$
+ *	\version    $Id: format_cards.lib.php,v 1.2 2011/07/31 23:25:32 eldy Exp $
  */
 
 
diff --git a/htdocs/lib/fourn.lib.php b/htdocs/lib/fourn.lib.php
index 11aede51cc7..2bfce40be69 100644
--- a/htdocs/lib/fourn.lib.php
+++ b/htdocs/lib/fourn.lib.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
 /**
  *	    \file       htdocs/lib/fourn.lib.php
  *		\brief      Ensemble de fonctions de base pour le module fournisseur
- *		\version    $Id$
+ *		\version    $Id: fourn.lib.php,v 1.21 2011/07/31 23:25:25 eldy Exp $
  */
 
 function facturefourn_prepare_head($object)
diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php
index bc023bef077..2209b8777e3 100644
--- a/htdocs/lib/functions.lib.php
+++ b/htdocs/lib/functions.lib.php
@@ -20,8 +20,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -29,7 +28,7 @@
  *	\file			htdocs/lib/functions.lib.php
  *	\brief			A set of functions for Dolibarr
  *					This file contains all frequently used functions.
- *	\version		$Id: functions.lib.php,v 1.548 2011/07/18 03:49:10 eldy Exp $
+ *	\version		$Id: functions.lib.php,v 1.549 2011/07/31 23:25:25 eldy Exp $
  */
 
 // For compatibility during upgrade
diff --git a/htdocs/lib/functions2.lib.php b/htdocs/lib/functions2.lib.php
index 57b891e00ee..ef9875dc6d3 100644
--- a/htdocs/lib/functions2.lib.php
+++ b/htdocs/lib/functions2.lib.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +21,7 @@
  *	\file			htdocs/lib/functions2.lib.php
  *	\brief			A set of functions for Dolibarr
  *					This file contains all rare functions.
- *	\version		$Id: functions2.lib.php,v 1.75 2011/07/04 08:38:51 eldy Exp $
+ *	\version		$Id: functions2.lib.php,v 1.76 2011/07/31 23:26:00 eldy Exp $
  */
 
 
diff --git a/htdocs/lib/functions_ch.lib.php b/htdocs/lib/functions_ch.lib.php
index dffa7910e21..b68357ced57 100644
--- a/htdocs/lib/functions_ch.lib.php
+++ b/htdocs/lib/functions_ch.lib.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +20,7 @@
  *	\file			htdocs/lib/functions_ch.lib.php
  *	\brief			A set of swiss functions for Dolibarr
  *					This file contains rare functions.
- *	\version		$Id: functions_ch.lib.php,v 1.3 2011/07/04 08:38:51 eldy Exp $
+ *	\version		$Id: functions_ch.lib.php,v 1.4 2011/07/31 23:25:34 eldy Exp $
  */
 
 
diff --git a/htdocs/lib/google.class.php b/htdocs/lib/google.class.php
index 08520dc84af..a964defadfb 100644
--- a/htdocs/lib/google.class.php
+++ b/htdocs/lib/google.class.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
 /**
  *	\file			htdocs/lib/google.class.php
  *	\brief			A set of functions for using Google APIs
- *	\version		$Id$
+ *	\version		$Id: google.class.php,v 1.3 2011/07/31 23:25:23 eldy Exp $
  */
 class GoogleAPI
 {
diff --git a/htdocs/lib/images.lib.php b/htdocs/lib/images.lib.php
index f561fd772fb..b51e26a75a6 100644
--- a/htdocs/lib/images.lib.php
+++ b/htdocs/lib/images.lib.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
 /**
  *  \file		htdocs/lib/images.lib.php
  *  \brief		Set of function for manipulating images
- * 	\version	$Id: images.lib.php,v 1.23 2011/07/05 22:51:24 eldy Exp $
+ * 	\version	$Id: images.lib.php,v 1.24 2011/07/31 23:26:02 eldy Exp $
  */
 
 // Define size of logo small and mini
diff --git a/htdocs/lib/index.php b/htdocs/lib/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/lib/index.php
+++ b/htdocs/lib/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/lib/invoice.lib.php b/htdocs/lib/invoice.lib.php
index 135c1d868b9..04fb81094c5 100644
--- a/htdocs/lib/invoice.lib.php
+++ b/htdocs/lib/invoice.lib.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +20,7 @@
  *	    \file       htdocs/lib/invoice.lib.php
  *		\brief      Ensemble de fonctions de base pour le module factures
  * 		\ingroup	invoice
- *		\version    $Id$ *
+ *		\version    $Id: invoice.lib.php,v 1.15 2011/07/31 23:25:41 eldy Exp $ *
  *
  *		Ensemble de fonctions de base de dolibarr sous forme d'include
  */
diff --git a/htdocs/lib/ldap.class.php b/htdocs/lib/ldap.class.php
index d9facdb386b..42ba2e68a86 100644
--- a/htdocs/lib/ldap.class.php
+++ b/htdocs/lib/ldap.class.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
 /**
  *	\file 		htdocs/lib/ldap.class.php
  *	\brief 		File of class to manage LDAP features
- *	\version 	$Id$
+ *	\version 	$Id: ldap.class.php,v 1.77 2011/07/31 23:25:43 eldy Exp $
  */
 
 /**
diff --git a/htdocs/lib/ldap.lib.php b/htdocs/lib/ldap.lib.php
index 514ecdd3518..88e68f66eba 100644
--- a/htdocs/lib/ldap.lib.php
+++ b/htdocs/lib/ldap.lib.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +20,7 @@
 	    \file       htdocs/lib/ldap.lib.php
 		\brief      Ensemble de fonctions de base pour le module LDAP
         \ingroup    ldap
-        \version    $Id$
+        \version    $Id: ldap.lib.php,v 1.49 2011/07/31 23:25:35 eldy Exp $
 
 		Ensemble de fonctions de base de dolibarr sous forme d'include
 */
diff --git a/htdocs/lib/member.lib.php b/htdocs/lib/member.lib.php
index 74257f9e4e0..2a0ece56671 100644
--- a/htdocs/lib/member.lib.php
+++ b/htdocs/lib/member.lib.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
 /**
  *	    \file       htdocs/lib/member.lib.php
  *		\brief      Ensemble de fonctions de base pour les adherents
- *		\version    $Id: member.lib.php,v 1.24 2011/07/03 16:00:19 eldy Exp $
+ *		\version    $Id: member.lib.php,v 1.25 2011/07/31 23:26:02 eldy Exp $
  *
  *		Ensemble de fonctions de base de dolibarr sous forme d'include
  */
diff --git a/htdocs/lib/memory.lib.php b/htdocs/lib/memory.lib.php
index 01f20c99df6..49d7f5ff053 100644
--- a/htdocs/lib/memory.lib.php
+++ b/htdocs/lib/memory.lib.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
 /**
  *  \file		htdocs/lib/memory.lib.php
  *  \brief		Set of function for memory/cache management
- *  \version	$Id$
+ *  \version	$Id: memory.lib.php,v 1.11 2011/07/31 23:25:11 eldy Exp $
  */
 
 global $shmkeys,$shmoffset;
diff --git a/htdocs/lib/order.lib.php b/htdocs/lib/order.lib.php
index c29f345a5c9..1c8bcd2e4d4 100644
--- a/htdocs/lib/order.lib.php
+++ b/htdocs/lib/order.lib.php
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -24,7 +23,7 @@
  *  \file       htdocs/lib/order.lib.php
  *  \brief      Ensemble de fonctions de base pour le module commande
  *  \ingroup    commande
- *  \version    $Id$
+ *  \version    $Id: order.lib.php,v 1.27 2011/07/31 23:25:41 eldy Exp $
  */
 
 function commande_prepare_head($object)
diff --git a/htdocs/lib/pdf.lib.php b/htdocs/lib/pdf.lib.php
index 0255e48d544..263e18df269 100644
--- a/htdocs/lib/pdf.lib.php
+++ b/htdocs/lib/pdf.lib.php
@@ -25,7 +25,7 @@
  *	\file       htdocs/lib/pdf.lib.php
  *	\brief      Set of functions used for PDF generation
  *	\ingroup    core
- *	\version    $Id: pdf.lib.php,v 1.97 2011/07/20 13:32:25 eldy Exp $
+ *	\version    $Id: pdf.lib.php,v 1.98 2011/07/27 17:28:42 eldy Exp $
  */
 
 
@@ -635,7 +635,8 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
     if (pdf_getPDFFont($outputlangs) == 'Helvetica')
     {
         $pdf->SetXY(-20,-$posy);
-        $pdf->MultiCell(11, 2, $pdf->PageNo().'/{nb}', 0, 'R', 0);
+        $pdf->MultiCell(11, 2, $pdf->PageNo().'/'.$pdf->getAliasNbPages(), 0, 'R', 0);
+        //print 'xxx'.$pdf->getAliasNbPages().'-'.$pdf->getAliasNumPage();exit;
     }
 }
 
diff --git a/htdocs/lib/prelevement.lib.php b/htdocs/lib/prelevement.lib.php
index 617cb297697..cdaa2f5c57f 100644
--- a/htdocs/lib/prelevement.lib.php
+++ b/htdocs/lib/prelevement.lib.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +22,7 @@
  *	\file       htdocs/lib/prelevement.lib.php
  *	\brief      Ensemble de fonctions de base pour le module prelevement
  *	\ingroup    propal
- *	\version    $Id: prelevement.lib.php,v 1.8 2011/07/04 09:01:38 eldy Exp $
+ *	\version    $Id: prelevement.lib.php,v 1.9 2011/07/31 23:25:28 eldy Exp $
  *
  * 	Ensemble de fonctions de base de dolibarr sous forme d'include
  */
diff --git a/htdocs/lib/price.lib.php b/htdocs/lib/price.lib.php
index 49e4eeb7ec8..ff4110a3883 100644
--- a/htdocs/lib/price.lib.php
+++ b/htdocs/lib/price.lib.php
@@ -14,14 +14,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\file 		htdocs/lib/price.lib.php
  *		\brief 		Librairie contenant les fonctions pour calculer un prix.
- *		\version 	$Id$
+ *		\version 	$Id: price.lib.php,v 1.36 2011/07/31 23:26:01 eldy Exp $
  */
 
 
diff --git a/htdocs/lib/product.lib.php b/htdocs/lib/product.lib.php
index 043c137e166..8b26ea66465 100644
--- a/htdocs/lib/product.lib.php
+++ b/htdocs/lib/product.lib.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +22,7 @@
  *	\file       htdocs/lib/product.lib.php
  *	\brief      Ensemble de fonctions de base pour le module produit et service
  * 	\ingroup	product
- *	\version    $Id: product.lib.php,v 1.43 2011/07/04 09:01:38 eldy Exp $
+ *	\version    $Id: product.lib.php,v 1.44 2011/07/31 23:25:32 eldy Exp $
  *
  * 	Ensemble de fonctions de base de dolibarr sous forme d'include
  */
diff --git a/htdocs/lib/project.lib.php b/htdocs/lib/project.lib.php
index ce197938ea7..d3eef74bbe6 100644
--- a/htdocs/lib/project.lib.php
+++ b/htdocs/lib/project.lib.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +22,7 @@
  *	    \file       htdocs/lib/project.lib.php
  *		\brief      Functions used by project module
  *      \ingroup    project
- *      \version    $Id: project.lib.php,v 1.69 2011/07/14 15:37:37 simnandez Exp $
+ *      \version    $Id: project.lib.php,v 1.70 2011/07/31 23:26:00 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
 
@@ -99,7 +98,7 @@ function project_prepare_head($object)
  *	    \file       htdocs/lib/project.lib.php
  *		\brief      Ensemble de fonctions de base pour le module projet
  *      \ingroup    societe
- *      \version    $Id: project.lib.php,v 1.69 2011/07/14 15:37:37 simnandez Exp $
+ *      \version    $Id: project.lib.php,v 1.70 2011/07/31 23:26:00 eldy Exp $
  */
 function task_prepare_head($object)
 {
diff --git a/htdocs/lib/propal.lib.php b/htdocs/lib/propal.lib.php
index 041c87e94c5..db310e8deaf 100644
--- a/htdocs/lib/propal.lib.php
+++ b/htdocs/lib/propal.lib.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +21,7 @@
  *	\file       htdocs/lib/propal.lib.php
  *	\brief      Ensemble de fonctions de base pour le module propal
  *	\ingroup    propal
- *	\version    $Id$
+ *	\version    $Id: propal.lib.php,v 1.26 2011/07/31 23:25:42 eldy Exp $
  *
  * 	Ensemble de fonctions de base de dolibarr sous forme d'include
  */
diff --git a/htdocs/lib/report.lib.php b/htdocs/lib/report.lib.php
index e1f73204ab2..50b1a83c83c 100644
--- a/htdocs/lib/report.lib.php
+++ b/htdocs/lib/report.lib.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
 /**
  *  \file       	htdocs/lib/report.lib.php
  *  \brief      	Set of functions for reporting
- *  \version		$Id$
+ *  \version		$Id: report.lib.php,v 1.6 2011/07/31 23:25:39 eldy Exp $
  */
 
 
diff --git a/htdocs/lib/security.lib.php b/htdocs/lib/security.lib.php
index 8c8a2331259..4212cc12529 100644
--- a/htdocs/lib/security.lib.php
+++ b/htdocs/lib/security.lib.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
 /**
  *  \file			htdocs/lib/security.lib.php
  *  \brief			Set of function used for dolibarr security
- *  \version		$Id: security.lib.php,v 1.124 2011/07/09 08:05:08 hregis Exp $
+ *  \version		$Id: security.lib.php,v 1.125 2011/07/31 23:25:15 eldy Exp $
  */
 
 
diff --git a/htdocs/lib/sendings.lib.php b/htdocs/lib/sendings.lib.php
index d41b1e81898..e75bcb1abc9 100644
--- a/htdocs/lib/sendings.lib.php
+++ b/htdocs/lib/sendings.lib.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/lib/sendings.lib.php
  *	\ingroup    expedition
  *	\brief      Library for expedition module
- *	\version    $Id$
+ *	\version    $Id: sendings.lib.php,v 1.25 2011/07/31 23:25:42 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php");
diff --git a/htdocs/lib/stock.lib.php b/htdocs/lib/stock.lib.php
index e086652bbbf..034e4b81352 100644
--- a/htdocs/lib/stock.lib.php
+++ b/htdocs/lib/stock.lib.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
 /**
  *	    \file       htdocs/lib/stock.lib.php
  *		\brief      Library file with function for stock module
- *		\version    $Id$
+ *		\version    $Id: stock.lib.php,v 1.8 2011/07/31 23:25:15 eldy Exp $
  */
 
 /**
diff --git a/htdocs/lib/tax.lib.php b/htdocs/lib/tax.lib.php
index 82e5cad0bc2..eebca0ca1d7 100644
--- a/htdocs/lib/tax.lib.php
+++ b/htdocs/lib/tax.lib.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/lib/tax.lib.php
  *      \ingroup    tax
  *      \brief      Library for tax module
- *      \version    $Id: tax.lib.php,v 1.21 2011/07/18 11:11:19 eldy Exp $
+ *      \version    $Id: tax.lib.php,v 1.22 2011/07/31 23:26:01 eldy Exp $
  */
 
 
diff --git a/htdocs/lib/treeview.lib.php b/htdocs/lib/treeview.lib.php
index 736f309ddc0..bcdfd54592c 100644
--- a/htdocs/lib/treeview.lib.php
+++ b/htdocs/lib/treeview.lib.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \file       htdocs/lib/treeview.lib.php
  *  \ingroup    core
  *  \brief      Libraries for tree views
- *  \version    $Id: treeview.lib.php,v 1.12 2011/07/04 09:01:38 eldy Exp $
+ *  \version    $Id: treeview.lib.php,v 1.13 2011/07/31 23:25:41 eldy Exp $
  */
 
 
diff --git a/htdocs/lib/usergroups.lib.php b/htdocs/lib/usergroups.lib.php
index 1521cc75921..d9c4b5a542f 100644
--- a/htdocs/lib/usergroups.lib.php
+++ b/htdocs/lib/usergroups.lib.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +21,7 @@
 /**
  *	    \file       htdocs/lib/usergroups.lib.php
  *		\brief      Ensemble de fonctions de base pour la gestion des utilisaterus et groupes
- *		\version    $Id: usergroups.lib.php,v 1.29 2011/07/18 23:35:06 eldy Exp $
+ *		\version    $Id: usergroups.lib.php,v 1.30 2011/07/31 23:25:25 eldy Exp $
  */
 function user_prepare_head($object)
 {
diff --git a/htdocs/lib/viewfiles.lib.php b/htdocs/lib/viewfiles.lib.php
index f444b9d0a96..92dd8b06b23 100644
--- a/htdocs/lib/viewfiles.lib.php
+++ b/htdocs/lib/viewfiles.lib.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
 /**
  *	\file       htdocs/lib/viewfiles.lib.php
  *	\brief      Set of function to view file content
- *	\version 	$Id$
+ *	\version 	$Id: viewfiles.lib.php,v 1.8 2011/07/31 23:25:42 eldy Exp $
  */
 
 
diff --git a/htdocs/lib/ws.lib.php b/htdocs/lib/ws.lib.php
index 9cce70fc3b5..f5b3ba3656e 100755
--- a/htdocs/lib/ws.lib.php
+++ b/htdocs/lib/ws.lib.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
 /**
  *  \file		htdocs/lib/ws.lib.php
  *  \brief		Set of function for manipulating web services
- * 	\version	$Id$
+ * 	\version	$Id: ws.lib.php,v 1.3 2011/07/31 23:25:42 eldy Exp $
  */
 
 
diff --git a/htdocs/lib/xcal.lib.php b/htdocs/lib/xcal.lib.php
index 7b72f9b4d04..1e3f11e7126 100644
--- a/htdocs/lib/xcal.lib.php
+++ b/htdocs/lib/xcal.lib.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 
 /**
  *  \file       htdocs/lib/xcal.lib.php
  *  \brief      Function to manage calendar files (vcal/ical/...)
- *  \version    $Id: xcal.lib.php,v 1.39 2011/07/08 17:12:03 eldy Exp $
+ *  \version    $Id: xcal.lib.php,v 1.40 2011/07/31 23:25:58 eldy Exp $
  */
 
 /**
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index 9dc3d64f56c..e889ff94e49 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \file       htdocs/livraison/class/livraison.class.php
  *  \ingroup    delivery
  *  \brief      Fichier de la classe de gestion des bons de livraison
- *  \version    $Id$
+ *  \version    $Id: livraison.class.php,v 1.28 2011/07/31 23:24:38 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php
index bbb26d33cc0..df55391e08a 100644
--- a/htdocs/livraison/fiche.php
+++ b/htdocs/livraison/fiche.php
@@ -16,15 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/livraison/fiche.php
  *	\ingroup    livraison
  *	\brief      Fiche descriptive d'un bon de livraison=reception
- *	\version    $Id$
+ *	\version    $Id: fiche.php,v 1.114 2011/07/31 23:24:38 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -637,5 +636,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:24:38 $ - $Revision: 1.114 $');
 ?>
diff --git a/htdocs/livraison/index.php b/htdocs/livraison/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/livraison/index.php
+++ b/htdocs/livraison/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 0a44842296f..49b67f9349a 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -26,7 +26,7 @@
  *	\file       htdocs/main.inc.php
  *	\ingroup	core
  *	\brief      File that defines environment for Dolibarr pages only (variables not required by scripts)
- *	\version    $Id: main.inc.php,v 1.754 2011/07/12 20:16:03 eldy Exp $
+ *	\version    $Id: main.inc.php,v 1.755 2011/07/30 10:23:24 eldy Exp $
  */
 
 @ini_set('memory_limit', '64M');	// This may be useless if memory is hard limited by your PHP
@@ -299,31 +299,6 @@ if (! empty($_SESSION["disablemodules"]))
 	}
 }
 
-// Init Smarty (used by some modules like multicompany)
-if (sizeof($conf->need_smarty) > 0)
-{
-	// Usage of const in conf.php file (deprecated) can overwrite default dir.
-	$dolibarr_smarty_libs_dir=DOL_DOCUMENT_ROOT.'/includes/smarty/libs/';
-	$dolibarr_smarty_compile=DOL_DATA_ROOT.'/smarty/templates/temp';
-	$dolibarr_smarty_cache=DOL_DATA_ROOT.'/smarty/cache/temp';
-
-	// Create directory if not exist
-	if (! is_dir($dolibarr_smarty_compile)) create_exdir($dolibarr_smarty_compile);
-	if (! is_dir($dolibarr_smarty_cache))	create_exdir($dolibarr_smarty_cache);
-
-	$smarty_libs = $dolibarr_smarty_libs_dir. "Smarty.class.php";
-	if (@include_once($smarty_libs))
-	{
-		$smarty = new Smarty();
-		$smarty->compile_dir = $dolibarr_smarty_compile;
-		$smarty->cache_dir = $dolibarr_smarty_cache;
-	}
-	else
-	{
-		dol_print_error('',"Library Smarty ".$smarty_libs." not found.");
-	}
-}
-
 
 /*
  * Phase authentication / login
diff --git a/htdocs/mantis/admin/mantis.php b/htdocs/mantis/admin/mantis.php
index 287328e3a6e..8504264034a 100644
--- a/htdocs/mantis/admin/mantis.php
+++ b/htdocs/mantis/admin/mantis.php
@@ -16,17 +16,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: mantis.php,v 1.3 2011/07/31 23:24:38 eldy Exp $
  */
 
 /**
  *   \file       htdocs/mantis/admin/mantis.php
  *   \ingroup    mantis
  *   \brief      Page de configuration du module mantis
- *   \version    $Revision$
+ *   \version    $Revision: 1.3 $
  */
 
 require("../../main.inc.php");
@@ -205,5 +204,5 @@ print "<br>";
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:24:38 $ - $Revision: 1.3 $');
 ?>
diff --git a/htdocs/mantis/class/mantis.class.php b/htdocs/mantis/class/mantis.class.php
index d8bcd8993a8..31a003e4c10 100644
--- a/htdocs/mantis/class/mantis.class.php
+++ b/htdocs/mantis/class/mantis.class.php
@@ -13,10 +13,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: mantis.class.php,v 1.2 2011/07/31 23:24:38 eldy Exp $
  */
 
 /**
@@ -24,7 +23,7 @@
         \ingroup    mantis
 		\brief      Ensemble des fonctions permettant d'acceder a la database mantis.
 		\author     Laurent Destailleur.
-		\version    $Revision$
+		\version    $Revision: 1.2 $
 */
 
 
diff --git a/htdocs/mantis/index.php b/htdocs/mantis/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/mantis/index.php
+++ b/htdocs/mantis/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/mantis/mantis.php b/htdocs/mantis/mantis.php
index 26fd5939d5c..4f1877aabdc 100644
--- a/htdocs/mantis/mantis.php
+++ b/htdocs/mantis/mantis.php
@@ -12,17 +12,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: mantis.php,v 1.8 2011/07/31 23:24:38 eldy Exp $
  */
 
 /**	    \file       htdocs/mantis/mantis.php
         \ingroup    mantis
 		\brief      Page generant 2 frames, une pour le menu Dolibarr, l'autre pour l'affichage de Mantis
 		\author	    Laurent Destailleur
-		\version    $Revision$
+		\version    $Revision: 1.8 $
 */
 
 require("../main.inc.php");
@@ -31,7 +30,7 @@ if (empty($conf->global->PHPMANTIS_URL))
 {
 	llxHeader();
 	print '<div class="error">Module Mantis was not configured properly.</div>';
-	llxFooter('$Date$ - $Revision$');
+	llxFooter('$Date: 2011/07/31 23:24:38 $ - $Revision: 1.8 $');
 }
 
 $mainmenu=isset($_GET["mainmenu"])?$_GET["mainmenu"]:"";
diff --git a/htdocs/mantis/mantistop.php b/htdocs/mantis/mantistop.php
index 4b9ceb3f5f0..22d39f78d27 100644
--- a/htdocs/mantis/mantistop.php
+++ b/htdocs/mantis/mantistop.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
 		\file 		htdocs/mantis/mantistop.php
         \ingroup    mantis
 		\brief      Top frame to show mantis application
-		\version    $Id$
+		\version    $Id: mantistop.php,v 1.5 2011/07/31 23:24:38 eldy Exp $
 */
 
 require ("../main.inc.php");
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 2c622c94511..03ef2767e40 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -29,8 +29,8 @@
  *	\file       htdocs/master.inc.php
  * 	\ingroup	core
  *  \brief      File that defines environment for all Dolibarr process (pages or scripts)
- * 				This script reads the conf.php file, init $lang, $db and empty $user
- *  \version    $Id: master.inc.php,v 1.349 2011/06/28 15:06:26 hregis Exp $
+ * 				This script reads the conf file, init $lang, $db and and empty $user
+ *  \version    $Id: master.inc.php,v 1.350 2011/07/30 10:23:24 eldy Exp $
  */
 
 
@@ -65,7 +65,7 @@ if (defined('TEST_DB_FORCE_TYPE')) $conf->db->type=constant('TEST_DB_FORCE_TYPE'
 $conf->file->main_authentication = empty($dolibarr_main_authentication)?'':$dolibarr_main_authentication;
 // Force https
 $conf->file->main_force_https = empty($dolibarr_main_force_https)?'':$dolibarr_main_force_https;
-// Define charset for HTML Output (can set hidden value force_charset in conf.php file)
+// Define charset for HTML Output (can set hidden value force_charset in conf file)
 $conf->file->character_set_client=strtoupper($force_charset_do_notuse);
 // Cookie cryptkey
 $conf->file->cookie_cryptkey = empty($dolibarr_main_cookie_cryptkey)?'':$dolibarr_main_cookie_cryptkey;
diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
index 9f265b5a0dc..2760915dafb 100644
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**	    \file       htdocs/paybox/admin/paybox.php
  *		\ingroup    paybox
  *		\brief      Page to setup paybox module
- *		\version    $Id$
+ *		\version    $Id: paybox.php,v 1.14 2011/07/31 23:20:29 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -212,5 +211,5 @@ print info_admin($langs->trans("YouCanAddTagOnUrl"));
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:20:29 $ - $Revision: 1.14 $');
 ?>
diff --git a/htdocs/paybox/index.php b/htdocs/paybox/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/paybox/index.php
+++ b/htdocs/paybox/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php
index 565194fe8b4..454073d9730 100755
--- a/htdocs/paybox/lib/paybox.lib.php
+++ b/htdocs/paybox/lib/paybox.lib.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +21,7 @@
  *	\file			htdocs/paybox/lib/paybox.lib.php
  *	\ingroup		paybox
  *  \brief			Library for common paybox functions
- *  \version		$Id$
+ *  \version		$Id: paybox.lib.php,v 1.9 2011/07/31 23:24:24 eldy Exp $
  */
 function llxHeaderPaybox($title, $head = "")
 {
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index 37ca979071a..fb798aed47b 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -14,14 +14,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**	    \file       htdocs/paypal/admin/paypal.php
  *		\ingroup    paypal
  *		\brief      Page to setup paypal module
- *		\version    $Id: paypal.php,v 1.22 2011/07/09 08:05:08 hregis Exp $
+ *		\version    $Id: paypal.php,v 1.23 2011/07/31 23:24:25 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -273,5 +272,5 @@ print info_admin($langs->trans("YouCanAddTagOnUrl"));
 
 $db->close();
 
-llxFooter('$Date: 2011/07/09 08:05:08 $ - $Revision: 1.22 $');
+llxFooter('$Date: 2011/07/31 23:24:25 $ - $Revision: 1.23 $');
 ?>
diff --git a/htdocs/paypal/index.php b/htdocs/paypal/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/paypal/index.php
+++ b/htdocs/paypal/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index 82ec9a15c2e..b5304ba4198 100755
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +21,7 @@
  *	\file			htdocs/paypal/lib/paypal.lib.php
  *  \ingroup		paypal
  *  \brief			Library for common paypal functions
- *  \version		$Id: paypal.lib.php,v 1.25 2011/07/13 16:55:34 eldy Exp $
+ *  \version		$Id: paypal.lib.php,v 1.26 2011/07/31 23:24:24 eldy Exp $
  */
 function llxHeaderPaypal($title, $head = "")
 {
diff --git a/htdocs/product/admin/produit.php b/htdocs/product/admin/produit.php
index 0ec44a649b9..8bf475f0b35 100644
--- a/htdocs/product/admin/produit.php
+++ b/htdocs/product/admin/produit.php
@@ -16,15 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \file       htdocs/product/admin/produit.php
  *  \ingroup    produit
  *  \brief      Page d'administration/configuration du module Produit
- *  \version    $Id$
+ *  \version    $Id: produit.php,v 1.7 2011/07/31 23:24:02 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -295,5 +294,5 @@ if ($conf->global->PRODUCT_CANVAS_ABILITY)
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:24:02 $ - $Revision: 1.7 $');
 ?>
diff --git a/htdocs/product/ajaxproducts.php b/htdocs/product/ajaxproducts.php
index dc92b76134c..2f5b4838d29 100644
--- a/htdocs/product/ajaxproducts.php
+++ b/htdocs/product/ajaxproducts.php
@@ -14,14 +14,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/product/ajaxproducts.php
  *       \brief      File to return Ajax response on product list request
- *       \version    $Id: ajaxproducts.php,v 1.36 2011/07/10 17:28:10 hregis Exp $
+ *       \version    $Id: ajaxproducts.php,v 1.37 2011/07/31 23:19:26 eldy Exp $
  */
 
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
diff --git a/htdocs/product/barcode.php b/htdocs/product/barcode.php
index cdb297d3f76..007ca050d66 100644
--- a/htdocs/product/barcode.php
+++ b/htdocs/product/barcode.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/product/barcode.php
  *       \ingroup    product
  *       \brief      Page with bar code informations of product
- *       \version    $Id$
+ *       \version    $Id: barcode.php,v 1.52 2011/07/31 23:19:26 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -165,5 +164,5 @@ print "</div>\n";
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:19:26 $ - $Revision: 1.52 $');
 ?>
diff --git a/htdocs/product/canvas/default/index.php b/htdocs/product/canvas/default/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/product/canvas/default/index.php
+++ b/htdocs/product/canvas/default/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/product/canvas/default/product.default.class.php b/htdocs/product/canvas/default/product.default.class.php
index b98da0c3e7b..5f8bee89683 100644
--- a/htdocs/product/canvas/default/product.default.class.php
+++ b/htdocs/product/canvas/default/product.default.class.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/product/canvas/default/product.default.class.php
  *	\ingroup    produit
  *	\brief      Fichier de la classe des produits par defaut
- *	\version    $Id: product.default.class.php,v 1.41 2011/07/21 01:20:33 eldy Exp $
+ *	\version    $Id: product.default.class.php,v 1.42 2011/07/31 23:19:28 eldy Exp $
  */
 include_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php');
 
diff --git a/htdocs/product/canvas/default/tpl/create.tpl.php b/htdocs/product/canvas/default/tpl/create.tpl.php
index 8c571678cf2..5d4449ddad6 100644
--- a/htdocs/product/canvas/default/tpl/create.tpl.php
+++ b/htdocs/product/canvas/default/tpl/create.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: create.tpl.php,v 1.8 2011/07/31 23:19:26 eldy Exp $
  */
 ?>
 
diff --git a/htdocs/product/canvas/default/tpl/edit.tpl.php b/htdocs/product/canvas/default/tpl/edit.tpl.php
index 69dc46d6234..c37be523e91 100644
--- a/htdocs/product/canvas/default/tpl/edit.tpl.php
+++ b/htdocs/product/canvas/default/tpl/edit.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: edit.tpl.php,v 1.3 2011/07/31 23:19:27 eldy Exp $
  */
 ?>
 
diff --git a/htdocs/product/canvas/default/tpl/index.php b/htdocs/product/canvas/default/tpl/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/product/canvas/default/tpl/index.php
+++ b/htdocs/product/canvas/default/tpl/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/product/canvas/default/tpl/list.tpl.php b/htdocs/product/canvas/default/tpl/list.tpl.php
index a6bbd200776..25e03e40b58 100644
--- a/htdocs/product/canvas/default/tpl/list.tpl.php
+++ b/htdocs/product/canvas/default/tpl/list.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: list.tpl.php,v 1.4 2011/07/31 23:19:26 eldy Exp $
  */
 ?>
 
diff --git a/htdocs/product/canvas/default/tpl/view.tpl.php b/htdocs/product/canvas/default/tpl/view.tpl.php
index ab505001692..40459ee2a56 100644
--- a/htdocs/product/canvas/default/tpl/view.tpl.php
+++ b/htdocs/product/canvas/default/tpl/view.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id: view.tpl.php,v 1.5 2011/07/08 13:11:07 eldy Exp $
+ * $Id: view.tpl.php,v 1.6 2011/07/31 23:19:26 eldy Exp $
  */
 ?>
 
diff --git a/htdocs/product/canvas/index.php b/htdocs/product/canvas/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/product/canvas/index.php
+++ b/htdocs/product/canvas/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/product/canvas/service/index.php b/htdocs/product/canvas/service/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/product/canvas/service/index.php
+++ b/htdocs/product/canvas/service/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/product/canvas/service/product.service.class.php b/htdocs/product/canvas/service/product.service.class.php
index 3e291743a36..11a4a5d74fe 100644
--- a/htdocs/product/canvas/service/product.service.class.php
+++ b/htdocs/product/canvas/service/product.service.class.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/product/canvas/service/product.service.class.php
  *	\ingroup    service
  *	\brief      Fichier de la classe des services par defaut
- *	\version    $Id: product.service.class.php,v 1.14 2011/07/21 01:20:33 eldy Exp $
+ *	\version    $Id: product.service.class.php,v 1.15 2011/07/31 23:24:03 eldy Exp $
  */
 
 /**
diff --git a/htdocs/product/canvas/service/tpl/create.tpl.php b/htdocs/product/canvas/service/tpl/create.tpl.php
index 4f7e08f3d0b..e4e5355a5f6 100644
--- a/htdocs/product/canvas/service/tpl/create.tpl.php
+++ b/htdocs/product/canvas/service/tpl/create.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: create.tpl.php,v 1.4 2011/07/31 23:24:02 eldy Exp $
  */
 ?>
 
diff --git a/htdocs/product/canvas/service/tpl/edit.tpl.php b/htdocs/product/canvas/service/tpl/edit.tpl.php
index 83544edec5b..32fe9dbb0c7 100644
--- a/htdocs/product/canvas/service/tpl/edit.tpl.php
+++ b/htdocs/product/canvas/service/tpl/edit.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: edit.tpl.php,v 1.3 2011/07/31 23:24:02 eldy Exp $
  */
 ?>
 
diff --git a/htdocs/product/canvas/service/tpl/index.php b/htdocs/product/canvas/service/tpl/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/product/canvas/service/tpl/index.php
+++ b/htdocs/product/canvas/service/tpl/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/product/canvas/service/tpl/list.tpl.php b/htdocs/product/canvas/service/tpl/list.tpl.php
index ac0a4be89a7..f630c849f87 100644
--- a/htdocs/product/canvas/service/tpl/list.tpl.php
+++ b/htdocs/product/canvas/service/tpl/list.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: list.tpl.php,v 1.4 2011/07/31 23:24:02 eldy Exp $
  */
 ?>
 
diff --git a/htdocs/product/canvas/service/tpl/view.tpl.php b/htdocs/product/canvas/service/tpl/view.tpl.php
index 8b204da37a0..398d06f1a4a 100644
--- a/htdocs/product/canvas/service/tpl/view.tpl.php
+++ b/htdocs/product/canvas/service/tpl/view.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id: view.tpl.php,v 1.3 2011/07/08 13:33:42 eldy Exp $
+ * $Id: view.tpl.php,v 1.4 2011/07/31 23:24:02 eldy Exp $
  */
 ?>
 
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index feef65e034e..30e97de04a5 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -12,14 +12,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/product/class/html.formproduct.class.php
  *	\brief      Fichier de la classe des fonctions predefinie de composants html
- *	\version	$Id$
+ *	\version	$Id: html.formproduct.class.php,v 1.11 2011/07/31 23:24:03 eldy Exp $
  */
 
 
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 8f02f1e5c4f..1da2adb751e 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -25,7 +25,7 @@
  *	\file       htdocs/product/class/product.class.php
  *	\ingroup    produit
  *	\brief      Fichier de la classe des produits predefinis
- *	\version    $Id$
+ *	\version    $Id: product.class.php,v 1.47 2011/07/29 20:47:35 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
 
@@ -191,14 +191,15 @@ class Product extends CommonObject
 
 	/**
 	 *	Insert product into database
-	 *	@param    user     	User making insert
-	 *	@return   int     	id of product/service if OK or number of error < 0
+	 *	@param    user     		User making insert
+	 *  @param	  notrigger		Disable triggers
+	 *	@return   int     		Id of product/service if OK or number of error < 0
 	 */
-	function create($user)
+	function create($user,$notrigger=0)
 	{
-		global $conf ;
+		global $conf, $langs;
 
-		$this->errno = 0;
+        $error=0;
 
 		// Clean parameters
 		$this->ref = dol_string_nospecial(trim($this->ref));
@@ -250,172 +251,149 @@ class Product extends CommonObject
 			$this->error='ErrorWrongParameters';
 			return -1;
 		}
+		if (empty($this->ref))
+		{
+			$this->error='ErrorWrongParameters';
+		    return -2;
+		}
 
 		dol_syslog("Product::Create ref=".$this->ref." price=".$this->price." price_ttc=".$this->price_ttc." tva_tx=".$this->tva_tx." price_base_type=".$this->price_base_type." Category : ".$this->catid, LOG_DEBUG);
 
-		if ($this->ref)
+
+		$this->db->begin();
+
+		$sql = "SELECT count(*) as nb";
+		$sql.= " FROM ".MAIN_DB_PREFIX."product";
+		$sql.= " WHERE ref = '" .$this->ref."'";
+		$sql.= " AND entity = ".$conf->entity;
+
+		$result = $this->db->query($sql);
+		if ($result)
 		{
-			$this->db->begin();
-
-			$sql = "SELECT count(*)";
-			$sql.= " FROM ".MAIN_DB_PREFIX."product";
-			$sql.= " WHERE ref = '" .$this->ref."'";
-			$sql.= " AND entity = ".$conf->entity;
-
-			$result = $this->db->query($sql) ;
-			if ($result)
+			$obj = $this->db->fetch_object($result);
+			if ($obj->nb == 0)
 			{
-				$row = $this->db->fetch_array($result);
-				if ($row[0] == 0)
+				// Produit non deja existant
+				$sql = "INSERT INTO ".MAIN_DB_PREFIX."product (";
+				$sql.= "datec";
+				$sql.= ", entity";
+				$sql.= ", ref";
+				$sql.= ", price_min";
+				$sql.= ", price_min_ttc";
+				$sql.= ", label";
+				$sql.= ", fk_user_author";
+				$sql.= ", fk_product_type";
+				$sql.= ", price";
+				$sql.= ", price_ttc";
+				$sql.= ", price_base_type";
+				$sql.= ", tobuy";
+				$sql.= ", tosell";
+				$sql.= ", canvas";
+				$sql.= ", finished";
+				$sql.= ", hidden";
+				$sql.= ") VALUES (";
+				$sql.= $this->db->idate(mktime());
+				$sql.= ", ".$conf->entity;
+				$sql.= ", '".$this->ref."'";
+				$sql.= ", ".price2num($price_min_ht);
+				$sql.= ", ".price2num($price_min_ttc);
+				$sql.= ", ".($this->libelle?"'".$this->db->escape($this->libelle)."'":"null");
+				$sql.= ", ".$user->id;
+				$sql.= ", ".$this->type;
+				$sql.= ", ".price2num($price_ht);
+				$sql.= ", ".price2num($price_ttc);
+				$sql.= ", '".$this->price_base_type."'";
+				$sql.= ", ".$this->status;
+				$sql.= ", ".$this->status_buy;
+				$sql.= ", '".$this->canvas."'";
+				$sql.= ", ".$this->finished;
+				$sql.= ", ".$this->hidden;
+				$sql.= ")";
+
+				dol_syslog("Product::Create sql=".$sql);
+				$result = $this->db->query($sql);
+				if ( $result )
 				{
-					// Produit non deja existant
-					$sql = "INSERT INTO ".MAIN_DB_PREFIX."product (";
-					$sql.= "datec";
-					$sql.= ", entity";
-					$sql.= ", ref";
-					$sql.= ", price_min";
-					$sql.= ", price_min_ttc";
-					$sql.= ", label";
-					$sql.= ", fk_user_author";
-					$sql.= ", fk_product_type";
-					$sql.= ", price";
-					$sql.= ", price_ttc";
-					$sql.= ", price_base_type";
-					$sql.= ", canvas";
-					$sql.= ", finished";
-					$sql.= ", hidden";
-					$sql.= ") VALUES (";
-					$sql.= $this->db->idate(mktime());
-					$sql.= ", ".$conf->entity;
-					$sql.= ", '".$this->ref."'";
-					$sql.= ", ".price2num($price_min_ht);
-					$sql.= ", ".price2num($price_min_ttc);
-					$sql.= ", ".($this->libelle?"'".$this->db->escape($this->libelle)."'":"null");
-					$sql.= ", ".$user->id;
-					$sql.= ", ".$this->type;
-					$sql.= ", ".price2num($price_ht);
-					$sql.= ", ".price2num($price_ttc);
-					$sql.= ", '".$this->price_base_type."'";
-					$sql.= ", '".$this->canvas."'";
-					$sql.= ", ".$this->finished;
-					$sql.= ", ".$this->hidden;
-					$sql.= ")";
+					$id = $this->db->last_insert_id(MAIN_DB_PREFIX."product");
 
-					dol_syslog("Product::Create sql=".$sql);
-					$result = $this->db->query($sql);
-					if ( $result )
+					if ($id > 0)
 					{
-						$id = $this->db->last_insert_id(MAIN_DB_PREFIX."product");
+						$this->id				= $id;
+						$this->price			= $price_ht;
+						$this->price_ttc		= $price_ttc;
+						$this->price_min		= $price_min_ht;
+						$this->price_min_ttc	= $price_min_ttc;
 
-						if ($id > 0)
+						$result = $this->_log_price($user);
+						if ($result > 0)
 						{
-							$this->id				= $id;
-							$this->price			= $price_ht;
-							$this->price_ttc		= $price_ttc;
-							$this->price_min		= $price_min_ht;
-							$this->price_min_ttc	= $price_min_ttc;
-
-							$result = $this->_log_price($user);
-							if ($result > 0)
+							if ( $this->update($id, $user) > 0)
 							{
-								if ( $this->update($id, $user) > 0)
+								if ($this->catid > 0)
 								{
-									if ($this->catid > 0)
-									{
-										require_once(DOL_DOCUMENT_ROOT ."/categories/class/categorie.class.php");
-										$cat = new Categorie($this->db, $this->catid);
-										$cat->add_type($this,"product");
-									}
-								}
-								else
-								{
-									$this->_setErrNo("Create",260,$this->error);
+									require_once(DOL_DOCUMENT_ROOT ."/categories/class/categorie.class.php");
+									$cat = new Categorie($this->db, $this->catid);
+									$cat->add_type($this,"product");
 								}
 							}
 							else
 							{
-								$this->error=$this->db->error();
-								$this->_setErrNo("Create",264,$this->error);
+							    $error++;
+					            $this->error='ErrorFailedToUpdateRecord';
 							}
 						}
 						else
 						{
-							$this->_setErrNo("Create",259);
+							$error++;
+						    $this->error=$this->db->lasterror();
 						}
 					}
 					else
 					{
-						$this->error=$this->db->error();
-						$this->_setErrNo("Create",258,$this->error);
+						$error++;
+					    $this->error='ErrorFailedToGetInsertedId';
 					}
 				}
 				else
 				{
-					// Le produit existe deja
-					$this->error='ErrorProductAlreadyExists';
+					$error++;
+				    $this->error=$this->db->lasterror();
 				}
 			}
 			else
 			{
-				$this->_setErrNo("Create",263);
-			}
-
-			/*
-			 * END COMMIT
-			 */
-
-			if ($this->errno === 0)
-			{
-				// Appel des triggers
-				include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('PRODUCT_CREATE',$this,$user,$langs,$conf);
-				if ($result < 0) { $error++; $this->errors=$interface->errors; }
-				// Fin appel triggers
-
-				$this->db->commit();
-				return $id;
-			}
-			else
-			{
-				$this->db->rollback();
-				return -1;
+				// Product already exists with this ref
+				$langs->trans("Error")." : ".$langs->trans("ErrorProductAlreadyExists",$this->ref);
 			}
 		}
 		else
 		{
-			$this->_setErrNo("Create",262);
-
-			return -2;
+			$error++;
+		    $this->error=$this->db->lasterror();
 		}
 
-		return -1;
+		if (! $error && ! $notrigger)
+		{
+			// Appel des triggers
+			include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
+			$interface=new Interfaces($this->db);
+			$result=$interface->run_triggers('PRODUCT_CREATE',$this,$user,$langs,$conf);
+			if ($result < 0) { $error++; $this->errors=$interface->errors; }
+			// Fin appel triggers
+		}
+
+		if (! $error)
+		{
+			$this->db->commit();
+			return $this->id;
+		}
+		else
+		{
+			$this->db->rollback();
+			return -$error;
+		}
 	}
 
-	/**
-	 *  Positionne le numero d'erreur
-	 *  @param      func Nom de la fonction
-	 *  @param      num  Numero de l'erreur
-	 *  @param		error string
-	 */
-	function _setErrNo($func, $num, $error='')
-	{
-		$this->errno = $num;
-		dol_syslog(get_class($this)."::".$func." - ERRNO(".$this->errno.")".($error?' - '.$error:''), LOG_ERR);
-	}
-
-	/**
-	 *	Retourne le texte de l'erreur
-	 */
-	function error()
-	{
-		$errs[257] = "ErrorProductAlreadyExists";
-		$errs[262] = "ErrorProductBadRefOrLabel";
-
-		return $errs[$this->errno];
-	}
-
-
 	/**
 	 *	Update a record into database
 	 *	@param      id          Id of product
@@ -533,7 +511,7 @@ class Product extends CommonObject
 	{
 		$sqr = 0;
 
-		$elements = array('propaldet','commandedet','facturedet','contratdet');
+		$elements = array('propaldet','commandedet','facturedet','contratdet','product_fournisseur');
 
 		foreach($elements as $table)
 		{
@@ -580,7 +558,7 @@ class Product extends CommonObject
 			if ($prod_use == 0)
 			{
 				// TODO possibility to add external module constraint
-				$elements = array('product_price','product_price_min','product_lang','categorie_product');
+				$elements = array('product_price','product_lang','categorie_product');
 
 				foreach($elements as $table)
 				{
@@ -2161,7 +2139,7 @@ class Product extends CommonObject
 					$prods[$this->db->escape($rec['label'])][$keyChild] = $valueChild;
 				}
 			}
-			
+
 			return $prods;
 		}
 		else
diff --git a/htdocs/product/class/service.class.php b/htdocs/product/class/service.class.php
index 683d6778445..d24c4c5ffde 100644
--- a/htdocs/product/class/service.class.php
+++ b/htdocs/product/class/service.class.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/product/class/service.class.php
  *       \ingroup    service
  *       \brief      Fichier de la classe des services predefinis
- *       \version    $Id$
+ *       \version    $Id: service.class.php,v 1.4 2011/07/31 23:24:02 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
 
diff --git a/htdocs/product/composition/fiche.php b/htdocs/product/composition/fiche.php
index c17a6ac2636..55fc3373402 100644
--- a/htdocs/product/composition/fiche.php
+++ b/htdocs/product/composition/fiche.php
@@ -16,15 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \file       htdocs/product/composition/fiche.php
  *  \ingroup    product
  *  \brief      Page de la fiche produit
- *  \version    $Id$
+ *  \version    $Id: fiche.php,v 1.9 2011/07/31 23:24:03 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -447,5 +446,5 @@ print "\n</div>\n";
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:24:03 $ - $Revision: 1.9 $');
 ?>
diff --git a/htdocs/product/composition/index.php b/htdocs/product/composition/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/product/composition/index.php
+++ b/htdocs/product/composition/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 131c278e151..53f17703932 100755
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -16,15 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/product/document.php
  *       \ingroup    product
  *       \brief      Page des documents joints sur les produits
- *       \version    $Id: document.php,v 1.68 2011/07/06 20:56:49 eldy Exp $
+ *       \version    $Id: document.php,v 1.69 2011/07/31 23:19:25 eldy Exp $
  */
 
 require('../main.inc.php');
@@ -189,5 +188,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/06 20:56:49 $ - $Revision: 1.68 $');
+llxFooter('$Date: 2011/07/31 23:19:25 $ - $Revision: 1.69 $');
 ?>
diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
index 7908ed29d4f..a65f888ab11 100644
--- a/htdocs/product/fiche.php
+++ b/htdocs/product/fiche.php
@@ -26,7 +26,7 @@
  *  \file       htdocs/product/fiche.php
  *  \ingroup    product
  *  \brief      Page to show product
- *  \version    $Id$
+ *  \version    $Id: fiche.php,v 1.373 2011/07/29 20:47:35 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -294,6 +294,7 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->produit->
 		{
 			$product->ref = GETPOST('clone_ref');
 			$product->status = 0;
+			$product->status_buy = 0;
 			$product->finished = 1;
 			$product->id = null;
 
@@ -1645,6 +1646,6 @@ if ($product->id && $action == '' && $product->status)
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.373 $');
 
 ?>
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 110482c829e..39459f57a6c 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -16,15 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \file       htdocs/product/fournisseurs.php
  *  \ingroup    product
  *  \brief      Page of tab suppliers for products
- *  \version    $Id$
+ *  \version    $Id: fournisseurs.php,v 1.97 2011/07/31 23:19:26 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -431,5 +430,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:19:26 $ - $Revision: 1.97 $');
 ?>
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index ee6d7216bb7..bd607db7565 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/product/index.php
  *  \ingroup    product
  *  \brief      Page accueil des produits et services
- *  \version    $Id$
+ *  \version    $Id: index.php,v 1.101 2011/07/31 23:19:25 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -248,5 +247,5 @@ print '</td></tr></table>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:19:25 $ - $Revision: 1.101 $');
 ?>
diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php
index 704df904140..771722dd166 100644
--- a/htdocs/product/liste.php
+++ b/htdocs/product/liste.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \file       htdocs/product/liste.php
  *  \ingroup    produit
  *  \brief      Page to list products and services
- *  \version    $Id: liste.php,v 1.151 2011/06/26 00:41:41 eldy Exp $
+ *  \version    $Id: liste.php,v 1.152 2011/07/31 23:19:25 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -476,5 +475,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/06/26 00:41:41 $ - $Revision: 1.151 $');
+llxFooter('$Date: 2011/07/31 23:19:25 $ - $Revision: 1.152 $');
 ?>
diff --git a/htdocs/product/photos.php b/htdocs/product/photos.php
index 364c5ef19ec..412bdecc116 100644
--- a/htdocs/product/photos.php
+++ b/htdocs/product/photos.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/product/photos.php
  *	\ingroup    product
  *	\brief      Onglet photos de la fiche produit
- *	\version    $Id$
+ *	\version    $Id: photos.php,v 1.91 2011/07/31 23:19:25 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -205,5 +204,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:19:25 $ - $Revision: 1.91 $');
 ?>
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 338c1876fbc..2f32cd71fb2 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -15,14 +15,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**     \file       htdocs/product/popuprop.php
  *		\ingroup    propal, produit
  *		\brief      Liste des produits/services par popularite
- *		\version    $Id$
+ *		\version    $Id: popuprop.php,v 1.42 2011/07/31 23:19:25 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -157,5 +156,5 @@ print "</table>";
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:19:25 $ - $Revision: 1.42 $');
 ?>
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 60825f58da1..2ddb4aecbd2 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -16,15 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/product/price.php
  *	\ingroup    product
  *	\brief      Page to show product prices
- *	\version    $Id$
+ *	\version    $Id: price.php,v 1.110 2011/07/31 23:19:25 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -535,5 +534,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:19:25 $ - $Revision: 1.110 $');
 ?>
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index 2802f07530a..68ccb111ba4 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \file       htdocs/product/reassort.php
  *  \ingroup    produit
  *  \brief      Page to list stocks
- *  \version    $Id$
+ *  \version    $Id: reassort.php,v 1.62 2011/07/31 23:19:25 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -361,5 +360,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:19:25 $ - $Revision: 1.62 $');
 ?>
\ No newline at end of file
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index eea105289d1..faace395e78 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/product/stats/commande.php
  *       \ingroup    product, service, commande
  *       \brief      Page des stats des commandes clients pour un produit
- *       \version    $Id$
+ *       \version    $Id: commande.php,v 1.47 2011/07/31 23:24:00 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -191,5 +190,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:24:00 $ - $Revision: 1.47 $');
 ?>
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index 5d9f256e3da..1014c2e8113 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/product/stats/commande_fournisseur.php
  *	\ingroup    product, service, commande
  *	\brief      Page des stats des commandes fournisseurs pour un produit
- *	\version    $Id$
+ *	\version    $Id: commande_fournisseur.php,v 1.33 2011/07/31 23:24:00 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -185,5 +184,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:24:00 $ - $Revision: 1.33 $');
 ?>
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index 0641e2c3b9a..74c515631fa 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/product/stats/contrat.php
  *       \ingroup    product, service, contrat
  *       \brief      Page des stats des contrats pour un produit
- *       \version    $Id$
+ *       \version    $Id: contrat.php,v 1.46 2011/07/31 23:24:00 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -203,5 +202,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:24:00 $ - $Revision: 1.46 $');
 ?>
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 2d939958fc6..f20df884701 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/product/stats/facture.php
  *	\ingroup    product, service, facture
  *	\brief      Page des stats des factures clients pour un produit
- *	\version    $Id$
+ *	\version    $Id: facture.php,v 1.83 2011/07/31 23:24:00 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -194,5 +193,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:24:00 $ - $Revision: 1.83 $');
 ?>
\ No newline at end of file
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index a0dd7b1b677..488cb79c16c 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/product/stats/facture_fournisseur.php
  *       \ingroup    product, service, facture
  *       \brief      Page des stats des factures fournisseurs pour un produit
- *       \version    $Id$
+ *       \version    $Id: facture_fournisseur.php,v 1.32 2011/07/31 23:24:00 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -195,5 +194,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:24:00 $ - $Revision: 1.32 $');
 ?>
diff --git a/htdocs/product/stats/fiche.php b/htdocs/product/stats/fiche.php
index 9cca548031b..bd67b9e93d0 100644
--- a/htdocs/product/stats/fiche.php
+++ b/htdocs/product/stats/fiche.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/product/stats/fiche.php
  *       \ingroup    product
  *       \brief      Page des stats produits
- *       \version    $Id: fiche.php,v 1.109 2011/07/04 10:04:18 eldy Exp $
+ *       \version    $Id: fiche.php,v 1.110 2011/07/31 23:24:00 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -271,5 +270,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/04 10:04:18 $ - $Revision: 1.109 $');
+llxFooter('$Date: 2011/07/31 23:24:00 $ - $Revision: 1.110 $');
 ?>
\ No newline at end of file
diff --git a/htdocs/product/stats/index.php b/htdocs/product/stats/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/product/stats/index.php
+++ b/htdocs/product/stats/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index c9081efc2d3..4cf1fc9a57c 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/product/stats/propal.php
  *      \ingroup    product, service, propal
  *		\brief      Page des stats des propals pour un produit
- *		\version    $Id$
+ *		\version    $Id: propal.php,v 1.57 2011/07/31 23:24:00 eldy Exp $
  */
 
 
@@ -185,5 +184,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:24:00 $ - $Revision: 1.57 $');
 ?>
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 051b7572be9..aca3b3db5ba 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \file       htdocs/product/stock/class/entrepot.class.php
  *  \ingroup    stock
  *  \brief      Fichier de la classe de gestion des entrepots
- *  \version    $Id$
+ *  \version    $Id: entrepot.class.php,v 1.11 2011/07/31 23:24:02 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index b93a44aa97d..902430404e1 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/product/stock/class/mouvementstock.class.php
  *	\ingroup    stock
  *	\brief      Fichier de la classe de gestion des mouvements de stocks
- *	\version    $Revision$
+ *	\version    $Revision: 1.13 $
  */
 
 
diff --git a/htdocs/product/stock/fiche-valo.php b/htdocs/product/stock/fiche-valo.php
index 70d51e4e1d0..20ecfc3b9d9 100644
--- a/htdocs/product/stock/fiche-valo.php
+++ b/htdocs/product/stock/fiche-valo.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/product/stock/fiche-valo.php
  *	\ingroup    stock
  *	\brief      Page fiche de valorisation du stock dans l'entrepot
- *	\version    $Id$
+ *	\version    $Id: fiche-valo.php,v 1.17 2011/07/31 23:24:01 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -143,5 +142,5 @@ if ($_GET["id"])
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:24:01 $ - $Revision: 1.17 $');
 ?>
diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php
index 2235824e8b9..8dd606affdb 100644
--- a/htdocs/product/stock/fiche.php
+++ b/htdocs/product/stock/fiche.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/product/stock/fiche.php
  *	\ingroup    stock
  *	\brief      Page fiche entrepot
- *	\version    $Id$
+ *	\version    $Id: fiche.php,v 1.100 2011/07/31 23:24:01 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -520,5 +519,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:24:01 $ - $Revision: 1.100 $');
 ?>
diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php
index 6f46a0d3caa..1398a282ca4 100644
--- a/htdocs/product/stock/index.php
+++ b/htdocs/product/stock/index.php
@@ -14,17 +14,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: index.php,v 1.31 2011/07/31 23:24:01 eldy Exp $
  */
 
 /**
  *  \file       htdocs/product/stock/index.php
  *  \ingroup    stock
  *  \brief      Page accueil stocks produits
- *  \version    $Revision$
+ *  \version    $Revision: 1.31 $
  */
 
 require("../../main.inc.php");
@@ -164,5 +163,5 @@ print '</td></tr></table>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:24:01 $ - $Revision: 1.31 $');
 ?>
diff --git a/htdocs/product/stock/info.php b/htdocs/product/stock/info.php
index c16f09a82d6..74af937bdb3 100644
--- a/htdocs/product/stock/info.php
+++ b/htdocs/product/stock/info.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/product/stock/info.php
  *	\ingroup    stock
  *	\brief      Page des informations d'un entrepot
- *	\version    $Id$
+ *	\version    $Id: info.php,v 1.16 2011/07/31 23:24:01 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -54,5 +53,5 @@ print '</div>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:24:01 $ - $Revision: 1.16 $');
 ?>
diff --git a/htdocs/product/stock/liste.php b/htdocs/product/stock/liste.php
index 017f3c548a7..a6b6ba000c7 100644
--- a/htdocs/product/stock/liste.php
+++ b/htdocs/product/stock/liste.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/product/stock/liste.php
  *      \ingroup    stock
  *      \brief      Page liste des stocks
- *      \version    $Id$
+ *      \version    $Id: liste.php,v 1.22 2011/07/31 23:24:01 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -111,5 +110,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:24:01 $ - $Revision: 1.22 $');
 ?>
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index 09dbc3f37ec..563d8f104c3 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/product/stock/mouvement.php
  *	\ingroup    stock
  *	\brief      Page to list stock movements
- *	\version    $Id$
+ *	\version    $Id: mouvement.php,v 1.63 2011/07/31 23:24:01 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -339,5 +338,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:24:01 $ - $Revision: 1.63 $');
 ?>
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 101ea1f8b19..b1c8845bb51 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -16,15 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/product/stock/product.php
  *	\ingroup    product, stock
  *	\brief      Page to list detailed stock of a product
- *	\version    $Id$
+ *	\version    $Id: product.php,v 1.108 2011/07/31 23:24:00 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -519,5 +518,5 @@ print "</table>";
 $db->close();
 
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:24:00 $ - $Revision: 1.108 $');
 ?>
diff --git a/htdocs/product/stock/user.php b/htdocs/product/stock/user.php
index 654d564b462..0c63b590523 100644
--- a/htdocs/product/stock/user.php
+++ b/htdocs/product/stock/user.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       	htdocs/product/stock/user.php
  *	\ingroup    	stock
  *	\brief      	Page to link dolibarr users with warehouses
- *	\version    	$Id$
+ *	\version    	$Id: user.php,v 1.16 2011/07/31 23:24:01 eldy Exp $
  * 	\deprecated		This page is never called. Feature will never be developped.
  */
 
@@ -176,5 +175,5 @@ if ($_GET["id"])
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:24:01 $ - $Revision: 1.16 $');
 ?>
diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php
index 4888ad0cd26..848846f0706 100644
--- a/htdocs/product/stock/valo.php
+++ b/htdocs/product/stock/valo.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/product/stock/valo.php
  *  \ingroup    stock
  *  \brief      Page with stock values
- *  \version    $Id$
+ *  \version    $Id: valo.php,v 1.27 2011/07/31 23:24:01 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -162,5 +161,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:24:01 $ - $Revision: 1.27 $');
 ?>
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index 7c2e52e5af7..740d52ca6eb 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +22,7 @@
  *	\file       htdocs/product/traduction.php
  *	\ingroup    product
  *	\brief      Page de traduction des produits
- *	\version    $Id$
+ *	\version    $Id: traduction.php,v 1.45 2011/07/31 23:19:26 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -266,5 +265,5 @@ if ($_GET["action"] == 'add' && ($user->rights->produit->creer || $user->rights-
 
 	print '<br>';
 }
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:19:26 $ - $Revision: 1.45 $');
 ?>
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index 60d89967b65..14350748ef6 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/projet/activity/index.php
  *	\ingroup    projet
  *	\brief      Page activite perso du module projet
- *	\version    $Id: index.php,v 1.35 2011/07/04 10:56:12 eldy Exp $
+ *	\version    $Id: index.php,v 1.36 2011/07/31 23:23:39 eldy Exp $
  */
 
 require ("../../main.inc.php");
@@ -332,5 +331,5 @@ print '</td></tr></table>';
 
 $db->close();
 
-llxFooter('$Date: 2011/07/04 10:56:12 $ - $Revision: 1.35 $');
+llxFooter('$Date: 2011/07/31 23:23:39 $ - $Revision: 1.36 $');
 ?>
diff --git a/htdocs/projet/activity/list.php b/htdocs/projet/activity/list.php
index 8e1cc328ef9..8d7b7e5ec5f 100644
--- a/htdocs/projet/activity/list.php
+++ b/htdocs/projet/activity/list.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/projet/activity/list.php
  *	\ingroup    projet
  *	\brief      List activities of tasks
- *	\version    $Id$
+ *	\version    $Id: list.php,v 1.31 2011/07/31 23:23:39 eldy Exp $
  */
 
 require ("../../main.inc.php");
@@ -147,5 +146,5 @@ print '</div>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:23:39 $ - $Revision: 1.31 $');
 ?>
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 2a8218a9295..e300c26470b 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\file       htdocs/projet/class/project.class.php
  *		\ingroup    projet
  *		\brief      Fichier de la classe de gestion des projets
- *		\version    $Id$
+ *		\version    $Id: project.class.php,v 1.24 2011/07/31 23:23:39 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
 
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 00c12c6a6d5..e03edf379a8 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/projet/class/task.class.php
  *      \ingroup    project
  *      \brief      This file is a CRUD class file for Task (Create/Read/Update/Delete)
- *		\version    $Id: task.class.php,v 1.11 2011/06/25 10:55:11 eldy Exp $
+ *		\version    $Id: task.class.php,v 1.12 2011/07/31 23:23:39 eldy Exp $
  *		\remarks	Initialy built by build_class_from_table on 2008-09-10 12:41
  */
 
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index 3a83720074a..820a8c4e182 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/projet/contact.php
  *       \ingroup    project
  *       \brief      Onglet de gestion des contacts du projet
- *       \version    $Id$
+ *       \version    $Id: contact.php,v 1.28 2011/07/31 23:23:39 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -416,5 +415,5 @@ if ($id > 0 || ! empty($ref))
 
 $db->close();
 
-llxFooter('$Date$');
+llxFooter('$Date: 2011/07/31 23:23:39 $');
 ?>
\ No newline at end of file
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index 906d33b10af..f1ad2575a2e 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/projet/document.php
  *	\ingroup    project
  *	\brief      Page de gestion des documents attachees a un projet
- *	\version    $Id: document.php,v 1.13 2011/07/06 20:56:49 eldy Exp $
+ *	\version    $Id: document.php,v 1.14 2011/07/31 23:23:36 eldy Exp $
  */
 
 require('../main.inc.php');
@@ -203,5 +202,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/06 20:56:49 $ - $Revision: 1.13 $');
+llxFooter('$Date: 2011/07/31 23:23:36 $ - $Revision: 1.14 $');
 ?>
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 8b984fed7e6..16656405daf 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/projet/element.php
  *      \ingroup    projet facture
  *		\brief      Page of project referrers
- *		\version    $Id$
+ *		\version    $Id: element.php,v 1.49 2011/07/31 23:23:39 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -284,5 +283,5 @@ foreach ($listofreferent as $key => $value)
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:23:39 $ - $Revision: 1.49 $');
 ?>
diff --git a/htdocs/projet/fiche.php b/htdocs/projet/fiche.php
index 8806bc7c32e..94e38a8d4a9 100644
--- a/htdocs/projet/fiche.php
+++ b/htdocs/projet/fiche.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/projet/fiche.php
  *	\ingroup    projet
  *	\brief      Project card
- *	\version    $Id: fiche.php,v 1.126 2011/07/04 08:00:52 eldy Exp $
+ *	\version    $Id: fiche.php,v 1.127 2011/07/31 23:23:36 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -608,5 +607,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/04 08:00:52 $ - $Revision: 1.126 $');
+llxFooter('$Date: 2011/07/31 23:23:36 $ - $Revision: 1.127 $');
 ?>
diff --git a/htdocs/projet/ganttchart.php b/htdocs/projet/ganttchart.php
index 77de86ab997..e551205523f 100644
--- a/htdocs/projet/ganttchart.php
+++ b/htdocs/projet/ganttchart.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/projet/ganttview.php
  *	\ingroup    projet
  *	\brief      Gantt diagrame of a project
- *	\version    $Id$
+ *	\version    $Id: ganttchart.php,v 1.7 2011/07/31 23:23:36 eldy Exp $
  */
 
 ?>
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index d025bc10412..efa962e2cb3 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/projet/ganttview.php
  *	\ingroup    projet
  *	\brief      Gantt diagramm of a project
- *	\version    $Id$
+ *	\version    $Id: ganttview.php,v 1.14 2011/07/31 23:23:38 eldy Exp $
  */
 
 require ("../main.inc.php");
@@ -254,5 +253,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:23:38 $ - $Revision: 1.14 $');
 ?>
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 5284b87c094..9a6702d9225 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/projet/index.php
  *       \ingroup    projet
  *       \brief      Main project home page
- *       \version    $Id$
+ *       \version    $Id: index.php,v 1.75 2011/07/31 23:23:39 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -131,5 +130,5 @@ print '</td></tr></table>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:23:39 $ - $Revision: 1.75 $');
 ?>
diff --git a/htdocs/projet/jsgantt_language.js.php b/htdocs/projet/jsgantt_language.js.php
index a2c785fac8f..7affcf4b183 100644
--- a/htdocs/projet/jsgantt_language.js.php
+++ b/htdocs/projet/jsgantt_language.js.php
@@ -12,14 +12,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\file       htdocs/projet/jsgantt_language.js.php
  *		\brief      Fichier de javascript de traduction pour JSGantt
- *		\version    $Id$
+ *		\version    $Id: jsgantt_language.js.php,v 1.4 2011/07/31 23:23:39 eldy Exp $
  */
 
 //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
diff --git a/htdocs/projet/liste.php b/htdocs/projet/liste.php
index 1b79cbbe445..a8a679f9b27 100644
--- a/htdocs/projet/liste.php
+++ b/htdocs/projet/liste.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/projet/liste.php
  *	\ingroup    projet
  *	\brief      Page to list projects
- *	\version    $Id$
+ *	\version    $Id: liste.php,v 1.49 2011/07/31 23:23:37 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -206,5 +205,5 @@ print "</table>";
 $db->close();
 
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:23:37 $ - $Revision: 1.49 $');
 ?>
diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php
index 99bba94acd7..4e42f250946 100644
--- a/htdocs/projet/note.php
+++ b/htdocs/projet/note.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/projet/note.php
  *	\ingroup    project
  *	\brief      Fiche d'information sur un projet
- *	\version    $Id$
+ *	\version    $Id: note.php,v 1.13 2011/07/31 23:23:38 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -209,5 +208,5 @@ if ($id > 0 || ! empty($ref))
 }
 $db->close();
 
-llxFooter('$Date$ - $Revision: 1.15 ');
+llxFooter('$Date: 2011/07/31 23:23:38 $ - $Revision: 1.15 ');
 ?>
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index f6d40753fd3..e55bf465e6d 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/projet/tasks.php
  *	\ingroup    projet
  *	\brief      List all tasks of a project
- *	\version    $Id$
+ *	\version    $Id: tasks.php,v 1.8 2011/07/31 23:23:39 eldy Exp $
  */
 
 require ("../main.inc.php");
@@ -346,5 +345,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:23:39 $ - $Revision: 1.8 $');
 ?>
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 710864e1bea..738fdaec46f 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/projet/tasks/contact.php
  *	\ingroup    project
  *	\brief      Actors of a task
- *	\version    $Id$
+ *	\version    $Id: contact.php,v 1.22 2011/07/31 23:23:36 eldy Exp $
  */
 
 require ("../../main.inc.php");
@@ -417,5 +416,5 @@ if ($id > 0 || ! empty($ref))
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:23:36 $ - $Revision: 1.22 $');
 ?>
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index 259f551a7e8..9c506be2794 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/projet/tasks/document.php
  *	\ingroup    project
  *	\brief      Page de gestion des documents attachees a une tache d'un projet
- *	\version    $Id: document.php,v 1.15 2011/07/06 20:56:50 eldy Exp $
+ *	\version    $Id: document.php,v 1.16 2011/07/31 23:23:36 eldy Exp $
  */
 
 require('../../main.inc.php');
@@ -205,5 +204,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/06 20:56:50 $ - $Revision: 1.15 $');
+llxFooter('$Date: 2011/07/31 23:23:36 $ - $Revision: 1.16 $');
 ?>
diff --git a/htdocs/projet/tasks/index.php b/htdocs/projet/tasks/index.php
index f64ff40fadf..43124c0f83b 100644
--- a/htdocs/projet/tasks/index.php
+++ b/htdocs/projet/tasks/index.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/projet/tasks/index.php
  *	\ingroup    project
  *	\brief      List all task of a project
- *	\version    $Id$
+ *	\version    $Id: index.php,v 1.43 2011/07/31 23:23:36 eldy Exp $
  */
 
 require ("../../main.inc.php");
@@ -113,5 +112,5 @@ if ($user->rights->projet->creer)
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:23:36 $ - $Revision: 1.43 $');
 ?>
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index dc766903818..11e2fd27462 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/projet/tasks/note.php
  *	\ingroup    project
  *	\brief      Page to show information on a task
- *	\version    $Id$
+ *	\version    $Id: note.php,v 1.13 2011/07/31 23:23:36 eldy Exp $
  */
 
 require ("../../main.inc.php");
@@ -203,5 +202,5 @@ if ($id > 0 || ! empty($ref))
 }
 $db->close();
 
-llxFooter('$Date$ - $Revision: 1.15 ');
+llxFooter('$Date: 2011/07/31 23:23:36 $ - $Revision: 1.15 ');
 ?>
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index e53bd795e2b..c608c6dfd30 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/projet/tasks/task.php
  *	\ingroup    projet
  *	\brief      Fiche taches d'un projet
- *	\version    $Id$
+ *	\version    $Id: task.php,v 1.43 2011/07/31 23:23:36 eldy Exp $
  */
 
 require ("../../main.inc.php");
@@ -292,5 +291,5 @@ if ($taskid)
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:23:36 $ - $Revision: 1.43 $');
 ?>
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index ad10c1b51d8..56ddce7af70 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/projet/tasks/time.php
  *	\ingroup    projet
  *	\brief      Page to add new time spent on a task
- *	\version    $Id: time.php,v 1.32 2011/07/14 15:37:37 simnandez Exp $
+ *	\version    $Id: time.php,v 1.33 2011/07/31 23:23:36 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -404,5 +403,5 @@ if ($_GET["id"] > 0)
 
 $db->close();
 
-llxFooter('$Date: 2011/07/14 15:37:37 $ - $Revision: 1.32 $');
+llxFooter('$Date: 2011/07/31 23:23:36 $ - $Revision: 1.33 $');
 ?>
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index ece9d4edcfb..8189d77a172 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**	    \file       htdocs/public/agenda/agendaexport.php
@@ -22,7 +21,7 @@
  *                  http://127.0.0.1/dolibarr/public/agenda/agendaexport.php?format=vcal&exportkey=cle
  *                  http://127.0.0.1/dolibarr/public/agenda/agendaexport.php?format=ical&type=event&exportkey=cle
  *					http://127.0.0.1/dolibarr/public/agenda/agendaexport.php?format=rss&exportkey=cle
- *		\version    $Id$
+ *		\version    $Id: agendaexport.php,v 1.18 2011/07/31 23:23:21 eldy Exp $
  */
 
 //if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
@@ -74,7 +73,7 @@ if (empty($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY))
 
 	llxHeaderVierge();
 	print '<div class="error">Module Agenda was not configured properly.</div>';
-	llxFooterVierge('$Date$ - $Revision$');
+	llxFooterVierge('$Date: 2011/07/31 23:23:21 $ - $Revision: 1.18 $');
 	exit;
 }
 
@@ -85,7 +84,7 @@ if (empty($_GET["exportkey"]) || $conf->global->MAIN_AGENDA_XCAL_EXPORTKEY != $_
 
 	llxHeaderVierge();
 	print '<div class="error">Bad value for key.</div>';
-	llxFooterVierge('$Date$ - $Revision$');
+	llxFooterVierge('$Date: 2011/07/31 23:23:21 $ - $Revision: 1.18 $');
 	exit;
 }
 
@@ -117,7 +116,7 @@ if ($shortfilename=='dolibarrcalendar')
 	$langs->load("errors");
 	llxHeaderVierge();
     print '<div class="error">'.$langs->trans("ErrorWrongValueForParameterX",'format').'</div>';
-	llxFooterVierge('$Date$ - $Revision$');
+	llxFooterVierge('$Date: 2011/07/31 23:23:21 $ - $Revision: 1.18 $');
 	exit;
 }
 
@@ -202,5 +201,5 @@ if ($format == 'rss')
 
 llxHeaderVierge();
 print '<div class="error">'.$agenda->error.'</div>';
-llxFooterVierge('$Date$ - $Revision$');
+llxFooterVierge('$Date: 2011/07/31 23:23:21 $ - $Revision: 1.18 $');
 ?>
diff --git a/htdocs/public/agenda/index.php b/htdocs/public/agenda/index.php
index 5851748a9f8..148d3086bba 100644
--- a/htdocs/public/agenda/index.php
+++ b/htdocs/public/agenda/index.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -21,7 +20,7 @@
  *		\ingroup    core
  *		\brief      A redirect page to an error
  *		\author	    Laurent Destailleur
- *		\version    $Id$
+ *		\version    $Id: index.php,v 1.2 2011/07/31 23:23:21 eldy Exp $
  */
 
 require("../../master.inc.php");
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index d07ee20dced..fef3c04a3f1 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -23,7 +22,7 @@
  *		\ingroup    core
  *		\brief      Entry page to access demo
  *		\author	    Laurent Destailleur
- *		\version    $Id$
+ *		\version    $Id: index.php,v 1.61 2011/07/31 23:23:21 eldy Exp $
  */
 
 define("NOLOGIN",1);	// This means this output page does not require to be logged.
@@ -354,7 +353,7 @@ if (! empty($conf->global->MAIN_GOOGLE_AN_ID))
 }
 
 
-llxFooterVierge('$Date$ - $Revision$');
+llxFooterVierge('$Date: 2011/07/31 23:23:21 $ - $Revision: 1.61 $');
 
 
 
diff --git a/htdocs/public/donations/donateurs_code.php b/htdocs/public/donations/donateurs_code.php
index 5befd6faecd..e420384cefb 100644
--- a/htdocs/public/donations/donateurs_code.php
+++ b/htdocs/public/donations/donateurs_code.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/public/donations/donateurs_code.php
  *      \ingroup    donation
  *		\brief      Page to list donators
- * 		\version	$Id$
+ * 		\version	$Id: donateurs_code.php,v 1.13 2011/07/31 23:23:21 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
diff --git a/htdocs/public/donations/index.php b/htdocs/public/donations/index.php
index 667d64d0525..12361f99edd 100644
--- a/htdocs/public/donations/index.php
+++ b/htdocs/public/donations/index.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -21,7 +20,7 @@
  *		\ingroup    core
  *		\brief      A redirect page to an error
  *		\author	    Laurent Destailleur
- *		\version    $Id$
+ *		\version    $Id: index.php,v 1.2 2011/07/31 23:23:21 eldy Exp $
  */
 
 require("../../master.inc.php");
diff --git a/htdocs/public/donations/therm.php b/htdocs/public/donations/therm.php
index c5e80149588..13618c91a48 100644
--- a/htdocs/public/donations/therm.php
+++ b/htdocs/public/donations/therm.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/public/donations/therm.php
  *      \ingroup    donation
  *		\brief      Screen with thermometer
- *		\version    $Id$
+ *		\version    $Id: therm.php,v 1.8 2011/07/31 23:23:21 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
diff --git a/htdocs/public/index.php b/htdocs/public/index.php
index a0024f11310..639badd8cfd 100644
--- a/htdocs/public/index.php
+++ b/htdocs/public/index.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -21,7 +20,7 @@
  *		\ingroup    core
  *		\brief      A redirect page to an error
  *		\author	    Laurent Destailleur
- *		\version    $Id$
+ *		\version    $Id: index.php,v 1.5 2011/07/31 23:23:21 eldy Exp $
  */
 
 require("../master.inc.php");
diff --git a/htdocs/public/members/index.php b/htdocs/public/members/index.php
index e98ec22c97b..b2084916997 100644
--- a/htdocs/public/members/index.php
+++ b/htdocs/public/members/index.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -21,7 +20,7 @@
  *		\ingroup    core
  *		\brief      A redirect page to an error
  *		\author	    Laurent Destailleur
- *		\version    $Id$
+ *		\version    $Id: index.php,v 1.3 2011/07/31 23:23:21 eldy Exp $
  */
 
 require("../../master.inc.php");
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index f4d349046b0..b68c5e3f15d 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/public/members/new.php
  *	\ingroup    member
  *	\brief      Example of form to add a new member
- *	\version    $Id: new.php,v 1.42 2011/07/13 11:56:36 eldy Exp $
+ *	\version    $Id: new.php,v 1.43 2011/07/31 23:23:21 eldy Exp $
  *
  *  Note that you can add following constant to change behaviour of page
  *  MEMBER_NEWFORM_AMOUNT               Default amount for autosubscribe form
@@ -289,7 +288,7 @@ if ($action == 'added')
     print $langs->trans("NewMemberbyWeb");
     print '</center>';
 
-    llxFooterVierge('$Date: 2011/07/13 11:56:36 $ - $Revision: 1.42 $');
+    llxFooterVierge('$Date: 2011/07/31 23:23:21 $ - $Revision: 1.43 $');
     exit;
 }
 
@@ -537,5 +536,5 @@ print "<br></form>\n";
 
 $db->close();
 
-llxFooterVierge('$Date: 2011/07/13 11:56:36 $ - $Revision: 1.42 $');
+llxFooterVierge('$Date: 2011/07/31 23:23:21 $ - $Revision: 1.43 $');
 ?>
diff --git a/htdocs/public/members/public_card.php b/htdocs/public/members/public_card.php
index 72db8f68fb1..a322b0de163 100644
--- a/htdocs/public/members/public_card.php
+++ b/htdocs/public/members/public_card.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/public/members/public_card.php
  *	\ingroup    member
  * 	\brief      File to show a public card of a member
- *	\version    $Id$
+ *	\version    $Id: public_card.php,v 1.12 2011/07/31 23:23:21 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -114,7 +113,7 @@ if ($rowid > 0)
 
 $db->close();
 
-llxFooterVierge('$Date$ - $Revision$');
+llxFooterVierge('$Date: 2011/07/31 23:23:21 $ - $Revision: 1.12 $');
 
 
 /* Functions header and footer */
diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php
index 7e7272801f5..47185e9885f 100644
--- a/htdocs/public/members/public_list.php
+++ b/htdocs/public/members/public_list.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/public/members/public_list.php
  *	\ingroup    member
  *  \brief      File sample to list members
- *  \version    $Id$
+ *  \version    $Id: public_list.php,v 1.18 2011/07/31 23:23:21 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -144,5 +143,5 @@ else
 
 $db->close();
 
-llxFooterVierge('$Date$ - $Revision$');
+llxFooterVierge('$Date: 2011/07/31 23:23:21 $ - $Revision: 1.18 $');
 ?>
diff --git a/htdocs/public/paybox/index.php b/htdocs/public/paybox/index.php
index 55d099b9519..43ba2dbfca8 100644
--- a/htdocs/public/paybox/index.php
+++ b/htdocs/public/paybox/index.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -21,7 +20,7 @@
  *		\ingroup    core
  *		\brief      A redirect page to an error
  *		\author	    Laurent Destailleur
- *		\version    $Id$
+ *		\version    $Id: index.php,v 1.2 2011/07/31 23:23:21 eldy Exp $
  */
 
 require("../../master.inc.php");
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index 9d405438673..d3f8ac6c78b 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -23,7 +22,7 @@
  *		\ingroup    paybox
  *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
  *		\author	    Laurent Destailleur
- *		\version    $Id: newpayment.php,v 1.60 2011/07/13 12:03:30 eldy Exp $
+ *		\version    $Id: newpayment.php,v 1.61 2011/07/31 23:23:21 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -729,5 +728,5 @@ html_print_paybox_footer($mysoc,$langs);
 
 $db->close();
 
-llxFooterPayBox('$Date: 2011/07/13 12:03:30 $ - $Revision: 1.60 $');
+llxFooterPayBox('$Date: 2011/07/31 23:23:21 $ - $Revision: 1.61 $');
 ?>
diff --git a/htdocs/public/paybox/paymentko.php b/htdocs/public/paybox/paymentko.php
index 02047f07b9c..b5b66ccd49a 100644
--- a/htdocs/public/paybox/paymentko.php
+++ b/htdocs/public/paybox/paymentko.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -22,7 +21,7 @@
  *		\ingroup    paybox
  *		\brief      File to show page after a failed payment
  *		\author	    Laurent Destailleur
- *		\version    $Id$
+ *		\version    $Id: paymentko.php,v 1.9 2011/07/31 23:23:20 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -78,5 +77,5 @@ html_print_paybox_footer($mysoc,$langs);
 
 $db->close();
 
-llxFooterPayBox('$Date$ - $Revision$');
+llxFooterPayBox('$Date: 2011/07/31 23:23:20 $ - $Revision: 1.9 $');
 ?>
diff --git a/htdocs/public/paybox/paymentok.php b/htdocs/public/paybox/paymentok.php
index 86d9cc39891..4cce6c8a230 100644
--- a/htdocs/public/paybox/paymentok.php
+++ b/htdocs/public/paybox/paymentok.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -22,7 +21,7 @@
  *		\ingroup    paybox
  *		\brief      File to show page after a successful payment
  *		\author	    Laurent Destailleur
- *		\version    $Id$
+ *		\version    $Id: paymentok.php,v 1.9 2011/07/31 23:23:20 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -78,5 +77,5 @@ html_print_paybox_footer($mysoc,$langs);
 
 $db->close();
 
-llxFooterPayBox('$Date$ - $Revision$');
+llxFooterPayBox('$Date: 2011/07/31 23:23:20 $ - $Revision: 1.9 $');
 ?>
diff --git a/htdocs/public/paypal/index.php b/htdocs/public/paypal/index.php
index a43eb42417c..fec58bf75eb 100755
--- a/htdocs/public/paypal/index.php
+++ b/htdocs/public/paypal/index.php
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -21,7 +20,7 @@
  *		\ingroup    core
  *		\brief      A redirect page to an error
  *		\author	    Laurent Destailleur
- *		\version    $Id$
+ *		\version    $Id: index.php,v 1.2 2011/07/31 23:23:20 eldy Exp $
  */
 
 require("../../master.inc.php");
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index 5215b3f9924..860d2c3ab55 100755
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -23,7 +22,7 @@
  *		\ingroup    paypal
  *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
  *		\author	    Laurent Destailleur
- *		\version    $Id: newpayment.php,v 1.24 2011/07/13 12:00:18 eldy Exp $
+ *		\version    $Id: newpayment.php,v 1.26 2011/07/31 23:23:20 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -287,6 +286,7 @@ if (! empty($conf->global->PAYPAL_NEWFORM_TEXT))
     $langs->load("members");
     if (preg_match('/^\((.*)\)$/',$conf->global->PAYPAL_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
     else $text.=$conf->global->PAYPAL_NEWFORM_TEXT."<br>\n";
+    $text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
 }
 if (empty($text))
 {
@@ -946,5 +946,5 @@ html_print_paypal_footer($mysoc,$langs);
 
 $db->close();
 
-llxFooterPaypal('$Date: 2011/07/13 12:00:18 $ - $Revision: 1.24 $');
+llxFooterPaypal('$Date: 2011/07/31 23:23:20 $ - $Revision: 1.26 $');
 ?>
diff --git a/htdocs/public/paypal/paymentko.php b/htdocs/public/paypal/paymentko.php
index dd6f6f810dd..5b3487d4f00 100755
--- a/htdocs/public/paypal/paymentko.php
+++ b/htdocs/public/paypal/paymentko.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -24,7 +23,7 @@
  *                  This page is called by paypal with url provided to payal competed with parameter TOKEN=xxx
  *                  This token can be used to get more informations.
  *		\author	    Laurent Destailleur
- *		\version    $Id$
+ *		\version    $Id: paymentko.php,v 1.7 2011/07/31 23:23:20 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -82,5 +81,5 @@ html_print_paypal_footer($mysoc,$langs);
 
 $db->close();
 
-llxFooterPaypal('$Date$ - $Revision$');
+llxFooterPaypal('$Date: 2011/07/31 23:23:20 $ - $Revision: 1.7 $');
 ?>
diff --git a/htdocs/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php
index ef4d92273df..00fd9ab39c9 100755
--- a/htdocs/public/paypal/paymentok.php
+++ b/htdocs/public/paypal/paymentok.php
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -24,7 +23,7 @@
  *                  This page is called by paypal with url provided to payal competed with parameter TOKEN=xxx
  *                  This token can be used to get more informations.
  *		\author	    Laurent Destailleur
- *		\version    $Id$
+ *		\version    $Id: paymentok.php,v 1.12 2011/07/31 23:23:20 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -189,5 +188,5 @@ html_print_paypal_footer($mysoc,$langs);
 
 $db->close();
 
-llxFooterPaypal('$Date$ - $Revision$');
+llxFooterPaypal('$Date: 2011/07/31 23:23:20 $ - $Revision: 1.12 $');
 ?>
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index cdf0b7236d6..09d69531be7 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -17,15 +17,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \file       htdocs/societe/agenda.php
  *  \ingroup    societe
  *  \brief      Page of third party events
- *  \version    $Id$
+ *  \version    $Id: agenda.php,v 1.21 2011/07/31 23:22:57 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -187,5 +186,5 @@ if ($_GET["socid"])
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:22:57 $ - $Revision: 1.21 $');
 ?>
diff --git a/htdocs/societe/ajaxcompanies.php b/htdocs/societe/ajaxcompanies.php
index 4683b879a58..087d6f4bef0 100644
--- a/htdocs/societe/ajaxcompanies.php
+++ b/htdocs/societe/ajaxcompanies.php
@@ -15,14 +15,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/societe/ajaxcompanies.php
  *       \brief      File to return Ajax response on third parties request
- *       \version    $Id$
+ *       \version    $Id: ajaxcompanies.php,v 1.30 2011/07/31 23:22:57 eldy Exp $
  */
 
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
diff --git a/htdocs/societe/ajaxcountries.php b/htdocs/societe/ajaxcountries.php
index c01f914d497..6ea19ebc44c 100644
--- a/htdocs/societe/ajaxcountries.php
+++ b/htdocs/societe/ajaxcountries.php
@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/societe/ajaxcountries.php
  *       \brief      File to return Ajax response on country request
- *       \version    $Id$
+ *       \version    $Id: ajaxcountries.php,v 1.15 2011/07/31 23:22:56 eldy Exp $
  */
 
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index 1abcabd8134..0398be3d25e 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/societe/canvas/actions_card_common.class.php
  *	\ingroup    thirdparty
  *	\brief      Fichier de la classe Thirdparty card controller (common)
- *	\version    $Id: actions_card_common.class.php,v 1.23 2011/07/08 13:07:45 eldy Exp $
+ *	\version    $Id: actions_card_common.class.php,v 1.24 2011/07/31 23:22:58 eldy Exp $
  */
 
 /**
diff --git a/htdocs/societe/canvas/default/actions_card_default.class.php b/htdocs/societe/canvas/default/actions_card_default.class.php
index 3050584ab62..0d392e98d2d 100644
--- a/htdocs/societe/canvas/default/actions_card_default.class.php
+++ b/htdocs/societe/canvas/default/actions_card_default.class.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/societe/canvas/default/actions_card_default.class.php
  *	\ingroup    thirdparty
  *	\brief      Fichier de la classe Thirdparty card controller (default canvas)
- *	\version    $Id$
+ *	\version    $Id: actions_card_default.class.php,v 1.13 2011/07/31 23:22:58 eldy Exp $
  */
 include_once(DOL_DOCUMENT_ROOT.'/societe/canvas/actions_card_common.class.php');
 
diff --git a/htdocs/societe/canvas/default/dao_thirdparty_default.class.php b/htdocs/societe/canvas/default/dao_thirdparty_default.class.php
index 4aac3873b26..c1c6028c9e2 100644
--- a/htdocs/societe/canvas/default/dao_thirdparty_default.class.php
+++ b/htdocs/societe/canvas/default/dao_thirdparty_default.class.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/societe/canvas/default/dao_thirdparty_default.class.php
  *	\ingroup    thirdparty
  *	\brief      Fichier de la classe des tiers par defaut
- *	\version    $Id$
+ *	\version    $Id: dao_thirdparty_default.class.php,v 1.5 2011/07/31 23:22:58 eldy Exp $
  */
 
 /**
diff --git a/htdocs/societe/canvas/default/index.php b/htdocs/societe/canvas/default/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/societe/canvas/default/index.php
+++ b/htdocs/societe/canvas/default/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/societe/canvas/default/tpl/card_create.tpl.php b/htdocs/societe/canvas/default/tpl/card_create.tpl.php
index c0850550a0f..58dd446377e 100644
--- a/htdocs/societe/canvas/default/tpl/card_create.tpl.php
+++ b/htdocs/societe/canvas/default/tpl/card_create.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: card_create.tpl.php,v 1.12 2011/07/31 23:22:58 eldy Exp $
  */
 ?>
 
diff --git a/htdocs/societe/canvas/default/tpl/card_edit.tpl.php b/htdocs/societe/canvas/default/tpl/card_edit.tpl.php
index b3ec839f4ef..77c043aa53f 100644
--- a/htdocs/societe/canvas/default/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/default/tpl/card_edit.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: card_edit.tpl.php,v 1.11 2011/07/31 23:22:58 eldy Exp $
  */
 
 $contact = $GLOBALS['objcanvas']->control->object;
diff --git a/htdocs/societe/canvas/default/tpl/card_view.tpl.php b/htdocs/societe/canvas/default/tpl/card_view.tpl.php
index 31688e7e61c..b9b7354d2ae 100644
--- a/htdocs/societe/canvas/default/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/default/tpl/card_view.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: card_view.tpl.php,v 1.15 2011/07/31 23:22:58 eldy Exp $
  */
 
 $soc = $GLOBALS['objcanvas']->control->object;
diff --git a/htdocs/societe/canvas/default/tpl/index.php b/htdocs/societe/canvas/default/tpl/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/societe/canvas/default/tpl/index.php
+++ b/htdocs/societe/canvas/default/tpl/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/societe/canvas/individual/actions_card_individual.class.php b/htdocs/societe/canvas/individual/actions_card_individual.class.php
index 1fc3939aebb..71c259f9a9d 100644
--- a/htdocs/societe/canvas/individual/actions_card_individual.class.php
+++ b/htdocs/societe/canvas/individual/actions_card_individual.class.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/societe/canvas/individual/actions_card_individual.class.php
  *	\ingroup    thirdparty
  *	\brief      Fichier de la classe Thirdparty card controller (individual canvas)
- *	\version    $Id$
+ *	\version    $Id: actions_card_individual.class.php,v 1.13 2011/07/31 23:22:59 eldy Exp $
  */
 include_once(DOL_DOCUMENT_ROOT.'/societe/canvas/actions_card_common.class.php');
 
diff --git a/htdocs/societe/canvas/individual/dao_thirdparty_individual.class.php b/htdocs/societe/canvas/individual/dao_thirdparty_individual.class.php
index c6b66436c59..d1a1b0240af 100644
--- a/htdocs/societe/canvas/individual/dao_thirdparty_individual.class.php
+++ b/htdocs/societe/canvas/individual/dao_thirdparty_individual.class.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/societe/canvas/individual/dao_thirdparty_individual.class.php
  *	\ingroup    thirdparty
  *	\brief      Fichier de la classe des particuliers
- *	\version    $Id$
+ *	\version    $Id: dao_thirdparty_individual.class.php,v 1.6 2011/07/31 23:22:59 eldy Exp $
  */
 
 /**
diff --git a/htdocs/societe/canvas/individual/index.php b/htdocs/societe/canvas/individual/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/societe/canvas/individual/index.php
+++ b/htdocs/societe/canvas/individual/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
index 6f3d07fae61..60ab4675d4f 100644
--- a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id: card_create.tpl.php,v 1.9 2011/07/06 08:09:28 hregis Exp $
+ * $Id: card_create.tpl.php,v 1.10 2011/07/31 23:22:59 eldy Exp $
  */
 ?>
 
diff --git a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
index ffb6071d538..a080589cc77 100644
--- a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: card_edit.tpl.php,v 1.8 2011/07/31 23:22:59 eldy Exp $
  */
 ?>
 
diff --git a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
index 86504ec6462..2666b1f82ea 100644
--- a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id: card_view.tpl.php,v 1.11 2011/07/06 08:09:28 hregis Exp $
+ * $Id: card_view.tpl.php,v 1.12 2011/07/31 23:22:59 eldy Exp $
  */
 
 $object = $GLOBALS['objcanvas']->control->object;
diff --git a/htdocs/societe/canvas/individual/tpl/index.php b/htdocs/societe/canvas/individual/tpl/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/societe/canvas/individual/tpl/index.php
+++ b/htdocs/societe/canvas/individual/tpl/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php
index 2d49ccc9b2b..020b418a0b3 100644
--- a/htdocs/societe/checkvat/checkVatPopup.php
+++ b/htdocs/societe/checkvat/checkVatPopup.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\file       htdocs/societe/checkvat/checkVatPopup.php
  *		\ingroup    societe
  *		\brief      Popup screen to validate VAT
- *		\version    $Id$
+ *		\version    $Id: checkVatPopup.php,v 1.20 2011/07/31 23:22:59 eldy Exp $
  */
 
 require ("../../main.inc.php");
@@ -67,7 +66,7 @@ else
     $params=getSoapParams();
     //ini_set('default_socket_timeout', $params['response_timeout']);
     //$soapclient = new SoapClient($WS_DOL_URL_WSDL,$params);
-	$soapclient = new nusoap_client($WS_DOL_URL_WSDL,true,$params['proxy_host'],$params['proxy_port'],$params['proxy_user'],$params['proxy_host'],$params['connection_timeout'],$params['response_timeout']);
+	$soapclient = new nusoap_client($WS_DOL_URL_WSDL,true,$params['proxy_host'],$params['proxy_port'],$params['proxy_login'],$params['proxy_password'],$params['connection_timeout'],$params['response_timeout']);
 
 	// Check for an error
 	$err = $soapclient->getError();
@@ -167,5 +166,5 @@ if ($messagetoshow)
 }
 
 
-llxFooter('$Date$ - $Revision$',0);
+llxFooter('$Date: 2011/07/31 23:22:59 $ - $Revision: 1.20 $',0);
 ?>
diff --git a/htdocs/societe/checkvat/index.php b/htdocs/societe/checkvat/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/societe/checkvat/index.php
+++ b/htdocs/societe/checkvat/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/societe/class/address.class.php b/htdocs/societe/class/address.class.php
index 3fc3c9d6538..ef776327f67 100644
--- a/htdocs/societe/class/address.class.php
+++ b/htdocs/societe/class/address.class.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  * 	\file       htdocs/societe/class/address.class.php
  * 	\ingroup    societe
  *  \brief      Fichier de la classe des adresses des tiers
- *  \version    $Id$
+ *  \version    $Id: address.class.php,v 1.5 2011/07/31 23:22:58 eldy Exp $
  */
 
 
diff --git a/htdocs/societe/class/client.class.php b/htdocs/societe/class/client.class.php
index f05779bb64e..981b375a258 100644
--- a/htdocs/societe/class/client.class.php
+++ b/htdocs/societe/class/client.class.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *   	\file       htdocs/societe/class/client.class.php
  *		\ingroup    societe
  *		\brief      File for class of customers
- *		\version    $Id$
+ *		\version    $Id: client.class.php,v 1.4 2011/07/31 23:22:58 eldy Exp $
  */
 include_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index efa154c828f..79601ea1031 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -21,7 +21,7 @@
  * 		\files		htdocs/societe/class/companybankaccount.class.php
  *		\ingroup    societe
  *		\brief      File of class to manage bank accounts description of third parties
- *   	\version	$Id$
+ *   	\version	$Id: companybankaccount.class.php,v 1.10 2011/07/29 20:47:35 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/compta/bank/class/account.class.php");
@@ -182,15 +182,6 @@ class CompanyBankAccount extends Account
 		}
 	}
 
-	/**
-	 *
-	 *
-	 */
-	function error()
-	{
-		return $this->error;
-	}
-
 }
 
 ?>
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 7099b6cc22f..fc8450ad55c 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -19,15 +19,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/societe/class/societe.class.php
  *	\ingroup    societe
  *	\brief      File for third party class
- *	\version    $Id: societe.class.php,v 1.91 2011/07/07 21:32:21 eldy Exp $
+ *	\version    $Id: societe.class.php,v 1.92 2011/07/31 23:22:58 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
 
diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php
index 7415187f9d6..f4b39ce83ed 100644
--- a/htdocs/societe/commerciaux.php
+++ b/htdocs/societe/commerciaux.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \file       htdocs/societe/commerciaux.php
  *  \ingroup    societe
  *  \brief      Page of links to sales representatives
- *  \version    $Id$
+ *  \version    $Id: commerciaux.php,v 1.29 2011/07/31 23:22:56 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -251,5 +250,5 @@ if ($_GET["socid"])
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:22:56 $ - $Revision: 1.29 $');
 ?>
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index 74252ada670..1c8e2cfb7bf 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \file       htdocs/societe/document.php
  *  \brief      Tab for documents linked to third party
  *  \ingroup    societe
- *  \version    $Id: document.php,v 1.38 2011/07/14 05:21:52 hregis Exp $
+ *  \version    $Id: document.php,v 1.39 2011/07/31 23:22:57 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -241,6 +240,6 @@ else
 $db->close();
 
 
-llxFooter('$Date: 2011/07/14 05:21:52 $ - $Revision: 1.38 $');
+llxFooter('$Date: 2011/07/31 23:22:57 $ - $Revision: 1.39 $');
 
 ?>
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index 778b139c198..faefe103cb3 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/societe/index.php
  *  \ingroup    societe
  *  \brief      Home page for third parties area
- *  \version    $Id$
+ *  \version    $Id: index.php,v 1.17 2011/07/31 23:22:57 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -240,5 +239,5 @@ print '</td></tr></table>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:22:57 $ - $Revision: 1.17 $');
 ?>
diff --git a/htdocs/societe/info.php b/htdocs/societe/info.php
index 2af56a34195..136c6caea85 100644
--- a/htdocs/societe/info.php
+++ b/htdocs/societe/info.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/societe/info.php
  *      \ingroup    societe
  *      \brief      Page des informations d'une societe
- *      \version    $Id$
+ *      \version    $Id: info.php,v 1.24 2011/07/31 23:22:56 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -68,5 +67,5 @@ print '</div>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:22:56 $ - $Revision: 1.24 $');
 ?>
diff --git a/htdocs/societe/lien.php b/htdocs/societe/lien.php
index 708c62974f5..8319a2aaf2c 100644
--- a/htdocs/societe/lien.php
+++ b/htdocs/societe/lien.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \file       htdocs/societe/lien.php
  *  \ingroup    societe
  *  \brief      Page of links to other third parties
- *  \version    $Id$
+ *  \version    $Id: lien.php,v 1.38 2011/07/31 23:22:57 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -295,5 +294,5 @@ if($_GET["socid"])
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:22:57 $ - $Revision: 1.38 $');
 ?>
diff --git a/htdocs/societe/notify/fiche.php b/htdocs/societe/notify/fiche.php
index 0373cabbdf4..15007f3a735 100644
--- a/htdocs/societe/notify/fiche.php
+++ b/htdocs/societe/notify/fiche.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	    \file       htdocs/societe/notify/fiche.php
  *      \ingroup    societe, notification
  *		\brief      Tab for notifications of third party
- *		\version    $Id$
+ *		\version    $Id: fiche.php,v 1.70 2011/07/31 23:22:58 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -350,6 +349,6 @@ if ( $soc->fetch($soc->id) )
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:22:58 $ - $Revision: 1.70 $');
 
 ?>
diff --git a/htdocs/societe/notify/index.php b/htdocs/societe/notify/index.php
index 6b9836a0ac1..4fea0ea8195 100644
--- a/htdocs/societe/notify/index.php
+++ b/htdocs/societe/notify/index.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
 	    \file       htdocs/societe/notify/index.php
 		\ingroup    notification
 		\brief      List of done notifications
-		\version    $Id$
+		\version    $Id: index.php,v 1.17 2011/07/31 23:22:59 eldy Exp $
 */
 
 require("../../main.inc.php");
@@ -112,5 +111,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:22:59 $ - $Revision: 1.17 $');
 ?>
diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index b4f5f6aea66..8cf57ec0b64 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -23,7 +23,7 @@
  *	    \file       htdocs/societe/rib.php
  *      \ingroup    societe
  *		\brief      BAN tab for companies
- *		\version    $Id$
+ *		\version    $Id: rib.php,v 1.36 2011/07/29 20:47:34 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -73,7 +73,7 @@ if ($_POST["action"] == 'update' && ! $_POST["cancel"])
 	$result = $account->update($user);
 	if (! $result)
 	{
-		$message=$account->error();
+		$message=$account->error;
 		$_GET["action"]='edit';     // Force chargement page edition
 	}
 	else
@@ -272,5 +272,5 @@ if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer
 $db->close();
 
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/29 20:47:34 $ - $Revision: 1.36 $');
 ?>
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index c6a9b4904e2..ec5d660daef 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -18,15 +18,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \file       htdocs/societe/soc.php
  *  \ingroup    societe
  *  \brief      Third party card page
- *  \version    $Id: soc.php,v 1.124 2011/07/19 07:33:23 simnandez Exp $
+ *  \version    $Id: soc.php,v 1.126 2011/08/01 00:38:49 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -588,7 +587,8 @@ else
         if ($conf->fournisseur->enabled && (GETPOST("type")=='f' || GETPOST("type")==''))  { $object->fournisseur=1; }
         if (GETPOST("private")==1) { $object->particulier=1; }
 
-        $object->nom=$_POST["nom"];
+        $object->name=$_POST["nom"];
+        $object->nom=$_POST["nom"];    // deprecated
         $object->prenom=$_POST["prenom"];
         $object->particulier=$_REQUEST["private"];
         $object->prefix_comm=$_POST["prefix_comm"];
@@ -1094,7 +1094,8 @@ else
             if (! empty($_POST["nom"]))
             {
                 // We overwrite with values if posted
-                $object->nom=$_POST["nom"];
+                $object->name=$_POST["nom"];
+                $object->nom=$_POST["nom"];    // deprecated
                 $object->prefix_comm=$_POST["prefix_comm"];
                 $object->client=$_POST["client"];
                 $object->code_client=$_POST["code_client"];
@@ -1968,5 +1969,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/19 07:33:23 $ - $Revision: 1.124 $');
+llxFooter('$Date: 2011/08/01 00:38:49 $ - $Revision: 1.126 $');
 ?>
\ No newline at end of file
diff --git a/htdocs/societe/societe.php b/htdocs/societe/societe.php
index 9c5c2bdb162..0a1ad2cdb81 100644
--- a/htdocs/societe/societe.php
+++ b/htdocs/societe/societe.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/societe/societe.php
  *	\ingroup    societe
  *	\brief      Page to show a third party
- *	\version    $Id$
+ *	\version    $Id: societe.php,v 1.12 2011/07/31 23:22:56 eldy Exp $
  */
 
 require_once("../main.inc.php");
@@ -430,5 +429,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:22:56 $ - $Revision: 1.12 $');
 ?>
diff --git a/htdocs/societe/socnote.php b/htdocs/societe/socnote.php
index e0a849af112..08c05cd1b23 100644
--- a/htdocs/societe/socnote.php
+++ b/htdocs/societe/socnote.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *   \file       htdocs/societe/socnote.php
  *   \brief      Tab for notes on third party
  *   \ingroup    societe
- *   \version    $Id: socnote.php,v 1.22 2011/07/13 16:24:57 eldy Exp $
+ *   \version    $Id: socnote.php,v 1.23 2011/07/31 23:22:56 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -167,5 +166,5 @@ if ($action != 'edit')
 
 $db->close();
 
-llxFooter('$Date: 2011/07/13 16:24:57 $ - $Revision: 1.22 $');
+llxFooter('$Date: 2011/07/31 23:22:56 $ - $Revision: 1.23 $');
 ?>
diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php
index ba4c7488a33..330d77ee107 100644
--- a/htdocs/support/inc.php
+++ b/htdocs/support/inc.php
@@ -15,14 +15,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  * 	    \file       htdocs/support/inc.php
  *		\brief      File that define environment for support pages
- *		\version    $Id$
+ *		\version    $Id: inc.php,v 1.31 2011/07/31 23:22:33 eldy Exp $
  */
 
 define('DOL_VERSION','2.5-dev');	// Also defined in htdocs/master.inc.php
diff --git a/htdocs/support/index.php b/htdocs/support/index.php
index f56b7f60614..3077d54e481 100644
--- a/htdocs/support/index.php
+++ b/htdocs/support/index.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file      htdocs/support/index.php
  *       \ingroup   support
  *       \brief     Provide an Online Help support
- *       \version   $Id$
+ *       \version   $Id: index.php,v 1.23 2011/07/31 23:22:33 eldy Exp $
  */
 
 error_reporting(0);
diff --git a/htdocs/support/online.php b/htdocs/support/online.php
index 159b2f5fa44..6a79b33faec 100644
--- a/htdocs/support/online.php
+++ b/htdocs/support/online.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file      htdocs/support/online.php
  *       \ingroup   install
  *       \brief     Provide an Online Help support
- *       \version   $Id$
+ *       \version   $Id: online.php,v 1.28 2011/07/31 23:22:33 eldy Exp $
  */
 
 error_reporting(0);
diff --git a/htdocs/theme/auguria/fckeditor/index.php b/htdocs/theme/auguria/fckeditor/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/theme/auguria/fckeditor/index.php
+++ b/htdocs/theme/auguria/fckeditor/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/theme/auguria/graph-color.php b/htdocs/theme/auguria/graph-color.php
index cda44d58255..bb1a03299ba 100755
--- a/htdocs/theme/auguria/graph-color.php
+++ b/htdocs/theme/auguria/graph-color.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\file       htdocs/theme/auguria/graph-color.php
  *		\brief      File to declare colors to use to build graphics with theme Auguria
  *      \ingroup    core
- *		\version    $Id$
+ *		\version    $Id: graph-color.php,v 1.9 2011/07/31 23:22:04 eldy Exp $
  */
 
 global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
diff --git a/htdocs/theme/auguria/index.php b/htdocs/theme/auguria/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/theme/auguria/index.php
+++ b/htdocs/theme/auguria/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php
index f642438a8f8..78ca25e85a6 100644
--- a/htdocs/theme/auguria/style.css.php
+++ b/htdocs/theme/auguria/style.css.php
@@ -21,7 +21,7 @@
 /**
  *		\file       htdocs/theme/auguria/style.css.php
  *		\brief      Fichier de style CSS du theme auguria
- *		\version    $Id: style.css.php,v 1.89 2011/07/21 01:20:33 eldy Exp $
+ *		\version    $Id: style.css.php,v 1.91 2011/07/28 20:54:02 eldy Exp $
  */
 
 //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
@@ -1083,9 +1083,9 @@ margin-right: 1px;
 margin-bottom: 2px;
 margin-top: 0px;
 
--moz-box-shadow: 6px 6px 10px #CCC;
--webkit-box-shadow: 6px 6px 10px #CCC;
-box-shadow: 6px 6px 10px #CCC;
+-moz-box-shadow: 2px 4px 2px #CCC;
+-webkit-box-shadow: 2px 4px 2px #CCC;
+box-shadow: 2px 4px 2px #CCC;
 }
 
 table.noborder tr {
@@ -1101,7 +1101,7 @@ border-left-style: solid;
 }
 
 table.noborder td {
-padding: 1px 2px 0px 1px;			/* t r b l */
+padding: 1px 2px 2px 1px;			/* t r b l */
 }
 
 table.nobordernopadding {
@@ -1139,9 +1139,9 @@ border-bottom-style: solid;
 margin-bottom: 2px;
 margin-top: 0px;
 
--moz-box-shadow: 6px 6px 10px #CCC;
--webkit-box-shadow: 6px 6px 10px #CCC;
-box-shadow: 6px 6px 10px #CCC;
+-moz-box-shadow: 2px 4px 2px #CCC;
+-webkit-box-shadow: 2px 4px 2px #CCC;
+box-shadow: 2px 4px 2px #CCC;
 }
 table.liste td {
 padding-right: 2px;
@@ -1240,9 +1240,9 @@ border: 0px;
  */
 
 .boxtable {
--moz-box-shadow: 6px 6px 10px #CCC;
--webkit-box-shadow: 6px 6px 10px #CCC;
-box-shadow: 6px 6px 10px #CCC;
+-moz-box-shadow: 2px 4px 2px #CCC;
+-webkit-box-shadow: 2px 4px 2px #CCC;
+box-shadow: 2px 4px 2px #CCC;
 }
 
 .box {
diff --git a/htdocs/theme/auguria/tpl/index.php b/htdocs/theme/auguria/tpl/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/theme/auguria/tpl/index.php
+++ b/htdocs/theme/auguria/tpl/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/theme/bureau2crea/fckeditor/index.php b/htdocs/theme/bureau2crea/fckeditor/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/theme/bureau2crea/fckeditor/index.php
+++ b/htdocs/theme/bureau2crea/fckeditor/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/theme/bureau2crea/graph-color.php b/htdocs/theme/bureau2crea/graph-color.php
index 3a01d7a1de1..083db4f9296 100644
--- a/htdocs/theme/bureau2crea/graph-color.php
+++ b/htdocs/theme/bureau2crea/graph-color.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\file       htdocs/theme/bureau2crea/graph-color.php
  *		\brief      File to declare colors to use to build graphics with theme Auguria
  *      \ingroup    core
- *		\version    $Id$
+ *		\version    $Id: graph-color.php,v 1.2 2011/07/31 23:19:57 eldy Exp $
  */
 
 global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
diff --git a/htdocs/theme/bureau2crea/index.php b/htdocs/theme/bureau2crea/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/theme/bureau2crea/index.php
+++ b/htdocs/theme/bureau2crea/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php
index 95d421f28c6..6d9f27d592d 100644
--- a/htdocs/theme/bureau2crea/style.css.php
+++ b/htdocs/theme/bureau2crea/style.css.php
@@ -23,7 +23,7 @@
 /**
  *		\file       htdocs/theme/bureau2crea/style.css.php
  *		\brief      Fichier de style CSS du theme bureau2crea
- *		\version    $Id: style.css.php,v 1.39 2011/07/21 01:20:32 eldy Exp $
+ *		\version    $Id: style.css.php,v 1.40 2011/07/21 09:05:33 simnandez Exp $
  */
 
 //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
@@ -1217,6 +1217,7 @@ margin: 0px 0px 0px 0px;
 table.border {
 border: 2px solid #666666;
 border-collapse: collapse;
+clear: left;
 }
 
 table.border td {
diff --git a/htdocs/theme/bureau2crea/tpl/index.php b/htdocs/theme/bureau2crea/tpl/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/theme/bureau2crea/tpl/index.php
+++ b/htdocs/theme/bureau2crea/tpl/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/theme/cameleo/fckeditor/index.php b/htdocs/theme/cameleo/fckeditor/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/theme/cameleo/fckeditor/index.php
+++ b/htdocs/theme/cameleo/fckeditor/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/theme/cameleo/graph-color.php b/htdocs/theme/cameleo/graph-color.php
index 447cf6e7b8d..ad67ea829e8 100644
--- a/htdocs/theme/cameleo/graph-color.php
+++ b/htdocs/theme/cameleo/graph-color.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\file       htdocs/theme/cameleo/graph-color.php
  *		\brief      File to declare colors to use to build graphics with theme cameleo
  *      \ingroup    core
- *		\version    $Id$
+ *		\version    $Id: graph-color.php,v 1.2 2011/07/31 23:22:05 eldy Exp $
  */
 
 global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
diff --git a/htdocs/theme/cameleo/index.php b/htdocs/theme/cameleo/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/theme/cameleo/index.php
+++ b/htdocs/theme/cameleo/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php
index 903e70c91a5..6bc5688eeaa 100644
--- a/htdocs/theme/cameleo/style.css.php
+++ b/htdocs/theme/cameleo/style.css.php
@@ -16,14 +16,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\file       htdocs/theme/eldy/style.css.php
  *		\brief      Fichier de style CSS du theme Cameleo
- *		\version    $Id: style.css.php,v 1.8 2011/07/21 01:20:33 eldy Exp $
+ *		\version    $Id: style.css.php,v 1.9 2011/07/31 23:22:05 eldy Exp $
  */
 
 //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
diff --git a/htdocs/theme/cameleo/tpl/index.php b/htdocs/theme/cameleo/tpl/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/theme/cameleo/tpl/index.php
+++ b/htdocs/theme/cameleo/tpl/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/theme/eldy/fckeditor/index.php b/htdocs/theme/eldy/fckeditor/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/theme/eldy/fckeditor/index.php
+++ b/htdocs/theme/eldy/fckeditor/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/theme/eldy/graph-color.php b/htdocs/theme/eldy/graph-color.php
index 1419de38977..c48f2aee486 100755
--- a/htdocs/theme/eldy/graph-color.php
+++ b/htdocs/theme/eldy/graph-color.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\file       htdocs/theme/eldy/graph-color.php
  *		\brief      File to declare colors to use to build graphics with theme Eldy
  *      \ingroup    core
- *		\version    $Id$
+ *		\version    $Id: graph-color.php,v 1.10 2011/07/31 23:22:05 eldy Exp $
  */
 
 global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
diff --git a/htdocs/theme/eldy/index.php b/htdocs/theme/eldy/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/theme/eldy/index.php
+++ b/htdocs/theme/eldy/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 3a11f7e5dbc..9af151bc40a 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -21,7 +21,7 @@
 /**
  *		\file       htdocs/theme/eldy/style.css.php
  *		\brief      Fichier de style CSS du theme Eldy
- *		\version    $Id: style.css.php,v 1.87 2011/07/21 01:20:33 eldy Exp $
+ *		\version    $Id: style.css.php,v 1.88 2011/07/28 13:22:19 eldy Exp $
  */
 
 //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
@@ -1207,9 +1207,9 @@ border: 0px;
  */
 
 .boxtable {
--moz-box-shadow: 8px 8px 20px #CCC;
--webkit-box-shadow: 8px 8px 20px #CCC;
-box-shadow: 8px 8px 20px #CCC;
+-moz-box-shadow: 4px 4px 4px #CCC;
+-webkit-box-shadow: 4px 4px 4px #CCC;
+box-shadow: 4px 4px 4px #CCC;
 }
 
 .box {
@@ -1895,4 +1895,4 @@ span.cke_skin_kama { padding: 0 !important; }
 
 .template-upload {
     height: 72px !important;
-}
\ No newline at end of file
+}
diff --git a/htdocs/theme/eldy/tpl/index.php b/htdocs/theme/eldy/tpl/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/theme/eldy/tpl/index.php
+++ b/htdocs/theme/eldy/tpl/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/theme/freelug/fckeditor/index.php b/htdocs/theme/freelug/fckeditor/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/theme/freelug/fckeditor/index.php
+++ b/htdocs/theme/freelug/fckeditor/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/theme/freelug/graph-color.php b/htdocs/theme/freelug/graph-color.php
index 69e2fc92d46..cadac2164e8 100755
--- a/htdocs/theme/freelug/graph-color.php
+++ b/htdocs/theme/freelug/graph-color.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\file       htdocs/theme/freelug/graph-color.php
  *		\brief      File to declare colors to use to build graphics with theme Freelug
  *      \ingroup    core
- *		\version    $Id$
+ *		\version    $Id: graph-color.php,v 1.6 2011/07/31 23:22:05 eldy Exp $
  */
 
 global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
diff --git a/htdocs/theme/freelug/index.php b/htdocs/theme/freelug/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/theme/freelug/index.php
+++ b/htdocs/theme/freelug/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/theme/freelug/style.css.php b/htdocs/theme/freelug/style.css.php
index 34afdf52d09..928700d2f7a 100644
--- a/htdocs/theme/freelug/style.css.php
+++ b/htdocs/theme/freelug/style.css.php
@@ -20,7 +20,7 @@
 /**
  *		\file       htdocs/theme/freelug/style.css.php
  *		\brief      Fichier de style CSS du theme Freelug
- *		\version    $Id: style.css.php,v 1.42 2011/07/20 19:03:33 eldy Exp $
+ *		\version    $Id: style.css.php,v 1.43 2011/07/28 13:31:58 eldy Exp $
  */
 
 //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
@@ -1048,9 +1048,9 @@ th {
  */
 
 .boxtable {
--moz-box-shadow: 6px 6px 20px #AAA;
--webkit-box-shadow: 6px 6px 20px #AAA;
-box-shadow: 6px 6px 20px #AAA;
+-moz-box-shadow: 2px 4px 2px #AAA;
+-webkit-box-shadow: 2px 4px 2px #AAA;
+box-shadow: 2px 4px 2px #AAA;
 }
 
 .box {
diff --git a/htdocs/theme/freelug/tpl/index.php b/htdocs/theme/freelug/tpl/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/theme/freelug/tpl/index.php
+++ b/htdocs/theme/freelug/tpl/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/theme/index.php b/htdocs/theme/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/theme/index.php
+++ b/htdocs/theme/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/theme/phones/index.php b/htdocs/theme/phones/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/theme/phones/index.php
+++ b/htdocs/theme/phones/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/theme/phones/smartphone/index.php b/htdocs/theme/phones/smartphone/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/theme/phones/smartphone/index.php
+++ b/htdocs/theme/phones/smartphone/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/theme/phones/smartphone/theme/default/index.php b/htdocs/theme/phones/smartphone/theme/default/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/theme/phones/smartphone/theme/default/index.php
+++ b/htdocs/theme/phones/smartphone/theme/default/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/theme/phones/smartphone/tpl/header.tpl.php b/htdocs/theme/phones/smartphone/tpl/header.tpl.php
index 465ef460be3..319557d365f 100644
--- a/htdocs/theme/phones/smartphone/tpl/header.tpl.php
+++ b/htdocs/theme/phones/smartphone/tpl/header.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: header.tpl.php,v 1.14 2011/07/31 23:19:27 eldy Exp $
  */
 ?>
 <head>
diff --git a/htdocs/theme/phones/smartphone/tpl/index.php b/htdocs/theme/phones/smartphone/tpl/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/theme/phones/smartphone/tpl/index.php
+++ b/htdocs/theme/phones/smartphone/tpl/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/theme/phones/smartphone/tpl/login.tpl.php b/htdocs/theme/phones/smartphone/tpl/login.tpl.php
index cedf9daef0a..848ead30096 100644
--- a/htdocs/theme/phones/smartphone/tpl/login.tpl.php
+++ b/htdocs/theme/phones/smartphone/tpl/login.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: login.tpl.php,v 1.18 2011/07/31 23:19:28 eldy Exp $
  */
 top_httphead();
 ?>
diff --git a/htdocs/theme/phones/smartphone/tpl/menu.tpl.php b/htdocs/theme/phones/smartphone/tpl/menu.tpl.php
index f280e37dd9e..559abda250a 100644
--- a/htdocs/theme/phones/smartphone/tpl/menu.tpl.php
+++ b/htdocs/theme/phones/smartphone/tpl/menu.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: menu.tpl.php,v 1.18 2011/07/31 23:19:28 eldy Exp $
  */
 top_httphead();
 ?>
diff --git a/htdocs/theme/phones/smartphone/tpl/passwordforgotten.tpl.php b/htdocs/theme/phones/smartphone/tpl/passwordforgotten.tpl.php
index a43b6600488..36fad6998bd 100644
--- a/htdocs/theme/phones/smartphone/tpl/passwordforgotten.tpl.php
+++ b/htdocs/theme/phones/smartphone/tpl/passwordforgotten.tpl.php
@@ -12,10 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * $Id: passwordforgotten.tpl.php,v 1.14 2011/07/31 23:19:27 eldy Exp $
  */
 top_httphead();
 ?>
diff --git a/htdocs/theme/yellow/fckeditor/index.php b/htdocs/theme/yellow/fckeditor/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/theme/yellow/fckeditor/index.php
+++ b/htdocs/theme/yellow/fckeditor/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/theme/yellow/graph-color.php b/htdocs/theme/yellow/graph-color.php
index 2b72a2a2761..9dfadfa57ba 100755
--- a/htdocs/theme/yellow/graph-color.php
+++ b/htdocs/theme/yellow/graph-color.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *		\file       htdocs/theme/yellow/graph-color.php
  *		\brief      File to declare colors to use to build graphics with theme Yellow
  *      \ingroup    core
- *		\version    $Id$
+ *		\version    $Id: graph-color.php,v 1.6 2011/07/31 23:22:04 eldy Exp $
  */
 
 global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
diff --git a/htdocs/theme/yellow/index.php b/htdocs/theme/yellow/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/theme/yellow/index.php
+++ b/htdocs/theme/yellow/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/theme/yellow/style.css.php b/htdocs/theme/yellow/style.css.php
index dd5b38e06ef..74a4705b691 100644
--- a/htdocs/theme/yellow/style.css.php
+++ b/htdocs/theme/yellow/style.css.php
@@ -20,7 +20,7 @@
 /**
  *		\file       htdocs/theme/yellow/style.css.php
  *		\brief      Fichier de style CSS du theme Yellow
- *		\version    $Id: style.css.php,v 1.44 2011/07/20 19:03:32 eldy Exp $
+ *		\version    $Id: style.css.php,v 1.45 2011/07/28 13:31:58 eldy Exp $
  */
 
 //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
@@ -1040,9 +1040,9 @@ th {
  */
 
 .boxtable {
--moz-box-shadow: 6px 6px 20px #AAA;
--webkit-box-shadow: 6px 6px 20px #AAA;
-box-shadow: 6px 6px 20px #AAA;
+-moz-box-shadow: 2px 4px 2px #AAA;
+-webkit-box-shadow: 2px 4px 2px #AAA;
+box-shadow: 2px 4px 2px #AAA;
 }
 
 .box {
diff --git a/htdocs/theme/yellow/tpl/index.php b/htdocs/theme/yellow/tpl/index.php
index e69de29bb2d..7db0dd9ebf9 100644
--- a/htdocs/theme/yellow/tpl/index.php
+++ b/htdocs/theme/yellow/tpl/index.php
@@ -0,0 +1 @@
+Url not available
\ No newline at end of file
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 33c4bc837d2..393d9710a48 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -18,14 +18,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *  \file       htdocs/user/class/user.class.php
  *  \brief      Fichier de la classe utilisateur
- *  \version    $Id: user.class.php,v 1.46 2011/07/17 18:13:44 eldy Exp $
+ *  \version    $Id: user.class.php,v 1.47 2011/07/31 23:21:26 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 95ff706a916..74c1970c7f6 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	 \file       htdocs/user/class/usergroup.class.php
  *	 \brief      Fichier de la classe des groupes d'utilisateur
  *	 \author     Rodolphe Qiedeville
- *	 \version    $Id: usergroup.class.php,v 1.11 2011/07/08 18:49:16 eldy Exp $
+ *	 \version    $Id: usergroup.class.php,v 1.12 2011/07/31 23:21:26 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index b4d7cfc266c..a1adef9ad74 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/user/clicktodial.php
  *       \brief      Page for Click to dial datas
- *       \version    $Id$
+ *       \version    $Id: clicktodial.php,v 1.25 2011/07/31 23:19:42 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -201,5 +200,5 @@ if ($_GET["id"])
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:19:42 $ - $Revision: 1.25 $');
 ?>
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 7ca187da7a7..4531214e886 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -17,14 +17,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/user/fiche.php
  *       \brief      Tab of user card
- *       \version    $Id: fiche.php,v 1.274 2011/07/08 18:49:17 eldy Exp $
+ *       \version    $Id: fiche.php,v 1.275 2011/07/31 23:19:43 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -1660,7 +1659,7 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/08 18:49:17 $ - $Revision: 1.274 $');
+llxFooter('$Date: 2011/07/31 23:19:43 $ - $Revision: 1.275 $');
 
 
 
diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php
index 61c873a23b5..052021abd95 100644
--- a/htdocs/user/group/fiche.php
+++ b/htdocs/user/group/fiche.php
@@ -14,14 +14,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/user/group/fiche.php
  *       \brief      Onglet groupes utilisateurs
- *       \version    $Id: fiche.php,v 1.68 2011/07/08 18:49:17 eldy Exp $
+ *       \version    $Id: fiche.php,v 1.69 2011/07/31 23:21:25 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -474,5 +473,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/08 18:49:17 $ - $Revision: 1.68 $');
+llxFooter('$Date: 2011/07/31 23:21:25 $ - $Revision: 1.69 $');
 ?>
diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php
index b725674c48d..e25ab02e785 100644
--- a/htdocs/user/group/index.php
+++ b/htdocs/user/group/index.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/user/group/index.php
  * 		\ingroup	core
  *      \brief      Page of user groups
- *      \version    $Id$
+ *      \version    $Id: index.php,v 1.24 2011/07/31 23:21:25 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -109,6 +108,6 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:21:25 $ - $Revision: 1.24 $');
 
 ?>
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index 3f72932b347..eb342318fa6 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/user/group/ldap.php
  *       \ingroup    ldap
  *       \brief      Page fiche LDAP groupe
- *       \version    $Id: ldap.php,v 1.25 2011/07/08 18:49:17 eldy Exp $
+ *       \version    $Id: ldap.php,v 1.26 2011/07/31 23:21:25 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -216,5 +215,5 @@ print '</table>';
 
 $db->close();
 
-llxFooter('$Date: 2011/07/08 18:49:17 $ - $Revision: 1.25 $');
+llxFooter('$Date: 2011/07/31 23:21:25 $ - $Revision: 1.26 $');
 ?>
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 527143d0448..9edcafd59c0 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -16,14 +16,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/user/group/perms.php
  *       \brief      Onglet user et permissions de la fiche utilisateur
- *       \version    $Id: perms.php,v 1.38 2011/07/08 15:50:28 eldy Exp $
+ *       \version    $Id: perms.php,v 1.40 2011/08/01 13:15:53 hregis Exp $
  */
 
 require("../../main.inc.php");
@@ -94,10 +93,34 @@ if ($_GET["id"])
 
     // Charge les modules soumis a permissions
     $modules = array();
-    foreach ($conf->file->dol_document_root as $dirroot)
+    $modulesdir = array();
+    
+	foreach ($conf->file->dol_document_root as $type => $dirroot)
+	{
+		$modulesdir[] = $dirroot . "/includes/modules/";
+		
+		if ($type == 'alt')
+		{	
+			$handle=@opendir($dirroot);
+			if (is_resource($handle))
+			{
+				while (($file = readdir($handle))!==false)
+				{
+				    if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
+				    {
+				    	if (is_dir($dirroot . '/' . $file . '/includes/modules/'))
+				    	{
+				    		$modulesdir[] = $dirroot . '/' . $file . '/includes/modules/';
+				    	}
+				    }
+				}
+				closedir($handle);
+			}
+		}
+	}
+    
+    foreach ($modulesdir as $dir)
     {
-        $dir = $dirroot . "/includes/modules/";
-
         // Load modules attributes in arrays (name, numero, orders) from dir directory
         //print $dir."\n<br>";
         $handle=@opendir($dir);
@@ -293,5 +316,5 @@ if ($_GET["id"])
 
 $db->close();
 
-llxFooter('$Date: 2011/07/08 15:50:28 $ - $Revision: 1.38 $');
+llxFooter('$Date: 2011/08/01 13:15:53 $ - $Revision: 1.40 $');
 ?>
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index 5830fd8a46c..8d3371ea4fa 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *	\file       htdocs/user/home.php
  *	\brief      Home page of users and groups management
- *	\version    $Id$
+ *	\version    $Id: home.php,v 1.48 2011/07/31 23:19:42 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -220,5 +219,5 @@ print '</table>';
 $db->close();
 
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:19:42 $ - $Revision: 1.48 $');
 ?>
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index e392602dfaf..d0d692dd775 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/user/index.php
  * 		\ingroup	core
  *      \brief      Page of users
- *      \version    $Id$
+ *      \version    $Id: index.php,v 1.51 2011/07/31 23:19:42 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -150,5 +149,5 @@ else
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:19:42 $ - $Revision: 1.51 $');
 ?>
diff --git a/htdocs/user/info.php b/htdocs/user/info.php
index 6cbdc91f460..c4fa92297fd 100644
--- a/htdocs/user/info.php
+++ b/htdocs/user/info.php
@@ -12,15 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/user/info.php
  *      \ingroup    core
  *		\brief      Page des informations d'un utilisateur
- *		\version    $Id$
+ *		\version    $Id: info.php,v 1.19 2011/07/31 23:19:42 eldy Exp $
 */
 
 require("../main.inc.php");
@@ -73,5 +72,5 @@ print '</div>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:19:42 $ - $Revision: 1.19 $');
 ?>
diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index 4c037fb17ee..b2b92f363a5 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/user/ldap.php
  *      \ingroup    ldap
  *      \brief      Page fiche LDAP utilisateur
- *      \version    $Id: ldap.php,v 1.30 2011/07/08 18:49:17 eldy Exp $
+ *      \version    $Id: ldap.php,v 1.31 2011/07/31 23:19:42 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -233,5 +232,5 @@ print '</table>';
 
 $db->close();
 
-llxFooter('$Date: 2011/07/08 18:49:17 $ - $Revision: 1.30 $');
+llxFooter('$Date: 2011/07/31 23:19:42 $ - $Revision: 1.31 $');
 ?>
diff --git a/htdocs/user/logout.php b/htdocs/user/logout.php
index ef9dd2c408a..c99c52cf063 100644
--- a/htdocs/user/logout.php
+++ b/htdocs/user/logout.php
@@ -15,14 +15,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/user/logout.php
  *      \brief      Page called to disconnect a user
- * 		\version	$Id$
+ * 		\version	$Id: logout.php,v 1.49 2011/07/31 23:19:42 eldy Exp $
  */
 
 //if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Uncomment creates pb to relogon after a disconnect
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index 7308041afb3..3d2c3fbafa1 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/user/note.php
  *      \ingroup    usergroup
  *      \brief      Fiche de notes sur un utilisateur Dolibarr
- *		\version    $Id$
+ *		\version    $Id: note.php,v 1.24 2011/07/31 23:19:42 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -165,5 +164,5 @@ if ($id)
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:19:42 $ - $Revision: 1.24 $');
 ?>
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index e938755bf55..7f012e19284 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/user/param_ihm.php
  *       \brief      Page to show user setup for display
- *       \version    $Id: param_ihm.php,v 1.52 2011/07/08 18:49:17 eldy Exp $
+ *       \version    $Id: param_ihm.php,v 1.53 2011/07/31 23:19:43 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -259,5 +258,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/08 18:49:17 $ - $Revision: 1.52 $');
+llxFooter('$Date: 2011/07/31 23:19:43 $ - $Revision: 1.53 $');
 ?>
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 02a4318c340..98124e66972 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/user/passwordforgotten.php
  *       \brief      Page to ask a new password
- *       \version    $Id: passwordforgotten.php,v 1.75 2011/07/08 18:49:17 eldy Exp $
+ *       \version    $Id: passwordforgotten.php,v 1.76 2011/07/31 23:19:43 eldy Exp $
  */
 
 define("NOLOGIN",1);	// This means this output page does not require to be logged.
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 0e7abfc9902..47710b31d9d 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -16,14 +16,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/user/perms.php
  *       \brief      Onglet user et permissions de la fiche utilisateur
- *       \version    $Id$
+ *       \version    $Id: perms.php,v 1.57 2011/08/01 13:15:54 hregis Exp $
  */
 
 require("../main.inc.php");
@@ -121,12 +120,34 @@ $db->begin();
 
 // Search all modules with permission and reload permissions def.
 $modules = array();
+$modulesdir = array();
 
-$listdir=$conf->file->dol_document_root;
-foreach($listdir as $dirroot)
+foreach ($conf->file->dol_document_root as $type => $dirroot)
 {
-	$dir=$dirroot."/includes/modules/";
+	$modulesdir[] = $dirroot . "/includes/modules/";
+	
+	if ($type == 'alt')
+	{	
+		$handle=@opendir($dirroot);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle))!==false)
+			{
+			    if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
+			    {
+			    	if (is_dir($dirroot . '/' . $file . '/includes/modules/'))
+			    	{
+			    		$modulesdir[] = $dirroot . '/' . $file . '/includes/modules/';
+			    	}
+			    }
+			}
+			closedir($handle);
+		}
+	}
+}
 
+foreach($modulesdir as $dir)
+{
 	$handle=opendir($dir);
     if (is_resource($handle))
     {
@@ -374,5 +395,5 @@ print '</table>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/08/01 13:15:54 $ - $Revision: 1.57 $');
 ?>
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index 488efb23137..143af8934c7 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -23,7 +23,7 @@
  *		\file       htdocs/viewimage.php
  *		\brief      Wrapper to show images into Dolibarr screens
  *      \remarks    Call to wrapper is '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=diroffile&file=relativepathofofile&cache=0">'
- *		\version    $Id: viewimage.php,v 1.95 2011/07/09 00:15:16 eldy Exp $
+ *		\version    $Id: viewimage.php,v 1.96 2011/07/28 13:56:17 eldy Exp $
  */
 
 // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
@@ -121,7 +121,7 @@ if ($modulepart)
     }
 
     // Wrapping pour les images des societes
-    if ($modulepart == 'societe')
+    elseif ($modulepart == 'societe')
     {
         $accessallowed=1;
         $original_file=$conf->societe->dir_output.'/'.$original_file;
diff --git a/htdocs/webservices/admin/webservices.php b/htdocs/webservices/admin/webservices.php
index f3a49b805bd..743fa2fa138 100644
--- a/htdocs/webservices/admin/webservices.php
+++ b/htdocs/webservices/admin/webservices.php
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       htdocs/webservices/admin/webservices.php
  *		\ingroup    webservices
  *		\brief      Page to setup webservices module
- *		\version    $Id$
+ *		\version    $Id: webservices.php,v 1.8 2011/07/31 23:21:08 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -146,5 +145,5 @@ print '<br>';
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/31 23:21:08 $ - $Revision: 1.8 $');
 ?>
diff --git a/htdocs/webservices/demo_wsclient_invoice.php b/htdocs/webservices/demo_wsclient_invoice.php
index 6cabefd522d..8bfc7d0efa7 100755
--- a/htdocs/webservices/demo_wsclient_invoice.php
+++ b/htdocs/webservices/demo_wsclient_invoice.php
@@ -12,14 +12,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/webservices/demo_wsclient_invoice.php
  *       \brief      Demo page to make a client call to Dolibarr WebServices "server_invoice"
- *       \version    $Id$
+ *       \version    $Id: demo_wsclient_invoice.php,v 1.8 2011/07/31 23:21:08 eldy Exp $
  */
 
 // This is to make Dolibarr working with Plesk
diff --git a/htdocs/webservices/demo_wsclient_other.php b/htdocs/webservices/demo_wsclient_other.php
index 6026a199fc7..7ec42251a16 100755
--- a/htdocs/webservices/demo_wsclient_other.php
+++ b/htdocs/webservices/demo_wsclient_other.php
@@ -12,14 +12,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/webservices/demo_wsclient_other.php
  *       \brief      Demo page to make a client call to Dolibarr WebServices "server_other"
- *       \version    $Id$
+ *       \version    $Id: demo_wsclient_other.php,v 1.8 2011/07/31 23:21:08 eldy Exp $
  */
 
 // This is to make Dolibarr working with Plesk
diff --git a/htdocs/webservices/demo_wsclient_thirdparty.php b/htdocs/webservices/demo_wsclient_thirdparty.php
index d9bc209ce11..6a646b98570 100755
--- a/htdocs/webservices/demo_wsclient_thirdparty.php
+++ b/htdocs/webservices/demo_wsclient_thirdparty.php
@@ -12,14 +12,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/webservices/demo_wsclient_thirdparty.php
  *       \brief      Demo page to make a client call to Dolibarr WebServices "server_other"
- *       \version    $Id$
+ *       \version    $Id: demo_wsclient_thirdparty.php,v 1.8 2011/07/31 23:21:08 eldy Exp $
  */
 
 // This is to make Dolibarr working with Plesk
diff --git a/htdocs/webservices/index.php b/htdocs/webservices/index.php
index 971cf3aa03e..4752651c128 100644
--- a/htdocs/webservices/index.php
+++ b/htdocs/webservices/index.php
@@ -12,14 +12,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/webservices/server_invoice.php
  *       \brief      File that is entry point to call Dolibarr WebServices
- *       \version    $Id$
+ *       \version    $Id: index.php,v 1.5 2011/07/31 23:21:08 eldy Exp $
  */
 
 // This is to make Dolibarr working with Plesk
diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
index 5a5f09370b3..33ae1d69ba1 100755
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -12,14 +12,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/webservices/server_invoice.php
  *       \brief      File that is entry point to call Dolibarr WebServices
- *       \version    $Id$
+ *       \version    $Id: server_invoice.php,v 1.14 2011/07/31 23:21:08 eldy Exp $
  */
 
 // This is to make Dolibarr working with Plesk
diff --git a/htdocs/webservices/server_other.php b/htdocs/webservices/server_other.php
index 0d32271038e..42b65a2aee5 100644
--- a/htdocs/webservices/server_other.php
+++ b/htdocs/webservices/server_other.php
@@ -12,14 +12,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/webservices/server_other.php
  *       \brief      File that is entry point to call Dolibarr WebServices
- *       \version    $Id$
+ *       \version    $Id: server_other.php,v 1.12 2011/07/31 23:21:08 eldy Exp $
  */
 
 // This is to make Dolibarr working with Plesk
diff --git a/htdocs/webservices/server_supplier_invoice.php b/htdocs/webservices/server_supplier_invoice.php
index 05479e9b825..2df693d9fad 100755
--- a/htdocs/webservices/server_supplier_invoice.php
+++ b/htdocs/webservices/server_supplier_invoice.php
@@ -12,14 +12,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/webservices/server_supplier_invoice.php
  *       \brief      File that is entry point to call Dolibarr WebServices
- *       \version    $Id$
+ *       \version    $Id: server_supplier_invoice.php,v 1.9 2011/07/31 23:21:08 eldy Exp $
  */
 
 // This is to make Dolibarr working with Plesk
diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index ebd153681a1..da2f0bb3a3e 100755
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -12,14 +12,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/webservices/server_thirdparty.php
  *       \brief      File that is entry point to call Dolibarr WebServices
- *       \version    $Id$
+ *       \version    $Id: server_thirdparty.php,v 1.13 2011/07/31 23:21:08 eldy Exp $
  */
 
 // This is to make Dolibarr working with Plesk
diff --git a/scripts/banks/build-graph-sold-example.php b/scripts/banks/build-graph-sold-example.php
index 08cf68fd6bb..8cec01dad14 100644
--- a/scripts/banks/build-graph-sold-example.php
+++ b/scripts/banks/build-graph-sold-example.php
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -24,7 +23,7 @@
  *		\ingroup    	banque
  *		\brief      	Script to build graph of sold for each bank account
  *		\deprecated		Ce script n'est plus utilise car les graphiques sont generes dynamiquement maintenant.
- *		\version		$Id: build-graph-sold-example.php,v 1.10 2011/07/09 14:11:41 eldy Exp $
+ *		\version		$Id: build-graph-sold-example.php,v 1.11 2011/07/31 22:22:12 eldy Exp $
  */
 
 $sapi_type = php_sapi_name();
diff --git a/scripts/company/export-contacts-xls-example.php b/scripts/company/export-contacts-xls-example.php
index 009f7d6b482..ae21c88a2d4 100644
--- a/scripts/company/export-contacts-xls-example.php
+++ b/scripts/company/export-contacts-xls-example.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       scripts/company/export-contacts-xls-example.php
  *      \ingroup    company
  *      \brief      Export third parties' contacts with emails
- *		\version	$Id: export-contacts-xls-example.php,v 1.7 2011/07/09 14:11:42 eldy Exp $
+ *		\version	$Id: export-contacts-xls-example.php,v 1.8 2011/07/31 22:22:12 eldy Exp $
  */
 
 $sapi_type = php_sapi_name();
@@ -43,7 +42,7 @@ if (! isset($argv[1]) || ! $argv[1]) {
 $now=$argv[1];
 
 // Recupere env dolibarr
-$version='$Revision: 1.7 $';
+$version='$Revision: 1.8 $';
 
 require_once("../../htdocs/master.inc.php");
 require_once(PHP_WRITEEXCEL_PATH."/class.writeexcel_workbook.inc.php");
diff --git a/scripts/company/sync_contacts_dolibarr2ldap.php b/scripts/company/sync_contacts_dolibarr2ldap.php
index 2dd446eb842..40364e7897b 100644
--- a/scripts/company/sync_contacts_dolibarr2ldap.php
+++ b/scripts/company/sync_contacts_dolibarr2ldap.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       scripts/company/sync_contacts_dolibarr2ldap.php
  *      \ingroup    ldap company
  *      \brief      Script to update all contacts from Dolibarr into a LDAP database
- *		\version	$Id: sync_contacts_dolibarr2ldap.php,v 1.23 2011/07/09 14:11:42 eldy Exp $
+ *		\version	$Id: sync_contacts_dolibarr2ldap.php,v 1.24 2011/07/31 22:22:12 eldy Exp $
  */
 
 $sapi_type = php_sapi_name();
@@ -43,7 +42,7 @@ if (! isset($argv[1]) || ! $argv[1]) {
 $now=$argv[1];
 
 // Recupere env dolibarr
-$version='$Revision: 1.23 $';
+$version='$Revision: 1.24 $';
 
 require_once($path."../../htdocs/master.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index 9f435cdb9d8..b564214c18b 100644
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 
@@ -24,7 +23,7 @@
  *      \file       scripts/emailings/mailing-send.php
  *      \ingroup    mailing
  *      \brief      Script d'envoi d'un mailing prepare et valide
- *		\version	$Id$
+ *		\version	$Id: mailing-send.php,v 1.20 2011/07/31 22:22:12 eldy Exp $
  */
 
 $sapi_type = php_sapi_name();
diff --git a/scripts/invoices/email_unpaid_invoices_to_representatives.php b/scripts/invoices/email_unpaid_invoices_to_representatives.php
index 8ee631df756..50e3c39d2b4 100644
--- a/scripts/invoices/email_unpaid_invoices_to_representatives.php
+++ b/scripts/invoices/email_unpaid_invoices_to_representatives.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       scripts/invoices/email_unpaid_invoices_to_representatives.php
  *      \ingroup    facture
  *      \brief      Script to send a mail to dolibarr users linked to companies with unpaid invoices
- *		\version	$Id: email_unpaid_invoices_to_representatives.php,v 1.9 2011/07/09 14:11:41 eldy Exp $
+ *		\version	$Id: email_unpaid_invoices_to_representatives.php,v 1.10 2011/07/31 22:22:11 eldy Exp $
  */
 
 $sapi_type = php_sapi_name();
diff --git a/scripts/invoices/rebuild_merge_pdf.php b/scripts/invoices/rebuild_merge_pdf.php
index 631f4475be6..83a4df58e90 100644
--- a/scripts/invoices/rebuild_merge_pdf.php
+++ b/scripts/invoices/rebuild_merge_pdf.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       scripts/invoices/rebuild_merge_pdf.php
  *      \ingroup    facture
  *      \brief      Script to rebuild PDF and merge PDF files into one
- *		\version	$Id: rebuild_merge_pdf.php,v 1.20 2011/07/09 14:11:41 eldy Exp $
+ *		\version	$Id: rebuild_merge_pdf.php,v 1.21 2011/07/31 22:22:11 eldy Exp $
  */
 
 $sapi_type = php_sapi_name();
@@ -49,7 +48,7 @@ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
 $langs->load("main");
 
 // Global variables
-$version='$Revision: 1.20 $';
+$version='$Revision: 1.21 $';
 $error=0;
 
 
diff --git a/scripts/members/sync_members_dolibarr2ldap.php b/scripts/members/sync_members_dolibarr2ldap.php
index 3481510fdd3..2dc135a56c0 100644
--- a/scripts/members/sync_members_dolibarr2ldap.php
+++ b/scripts/members/sync_members_dolibarr2ldap.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       scripts/members/sync_members_dolibarr2ldap.php
  *      \ingroup    ldap member
  *      \brief      Script de mise a jour des adherents dans LDAP depuis base Dolibarr
- * 		\version	$Id: sync_members_dolibarr2ldap.php,v 1.9 2011/07/09 14:11:41 eldy Exp $
+ * 		\version	$Id: sync_members_dolibarr2ldap.php,v 1.10 2011/07/31 22:22:12 eldy Exp $
  */
 
 $sapi_type = php_sapi_name();
@@ -37,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Main
-$version='$Revision: 1.9 $';
+$version='$Revision: 1.10 $';
 $path=str_replace($script_file,'',$_SERVER["PHP_SELF"]);
 @set_time_limit(0);
 $error=0;
diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php
index 47aacc54898..2fd60a78188 100644
--- a/scripts/members/sync_members_ldap2dolibarr.php
+++ b/scripts/members/sync_members_ldap2dolibarr.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       scripts/members/sync_members_ldap2dolibarr.php
  *      \ingroup    ldap member
  *      \brief      Script de mise a jour des adherents dans Dolibarr depuis LDAP
- * 		\version	$Id: sync_members_ldap2dolibarr.php,v 1.12 2011/07/09 14:11:41 eldy Exp $
+ * 		\version	$Id: sync_members_ldap2dolibarr.php,v 1.13 2011/07/31 22:22:12 eldy Exp $
  */
 
 $sapi_type = php_sapi_name();
@@ -37,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Main
-$version='$Revision: 1.12 $';
+$version='$Revision: 1.13 $';
 @set_time_limit(0);
 $error=0;
 $forcecommit=0;
diff --git a/scripts/user/sync_groups_dolibarr2ldap.php b/scripts/user/sync_groups_dolibarr2ldap.php
index c98720713c3..9ff4f0768be 100644
--- a/scripts/user/sync_groups_dolibarr2ldap.php
+++ b/scripts/user/sync_groups_dolibarr2ldap.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       scripts/user/sync_groups_dolibarr2ldap.php
  *      \ingroup    ldap core
  *      \brief      Script de mise a jour des groupes dans LDAP depuis base Dolibarr
- * 		\version	$Id: sync_groups_dolibarr2ldap.php,v 1.8 2011/07/09 14:11:42 eldy Exp $
+ * 		\version	$Id: sync_groups_dolibarr2ldap.php,v 1.9 2011/07/31 22:22:12 eldy Exp $
  */
 
 $sapi_type = php_sapi_name();
@@ -43,7 +42,7 @@ if (! isset($argv[1]) || ! $argv[1]) {
 $now=$argv[1];
 
 // Recupere env dolibarr
-$version='$Revision: 1.8 $';
+$version='$Revision: 1.9 $';
 
 require_once($path."../../htdocs/master.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
diff --git a/scripts/user/sync_users_dolibarr2ldap.php b/scripts/user/sync_users_dolibarr2ldap.php
index cb18a18979a..01fe34141f6 100644
--- a/scripts/user/sync_users_dolibarr2ldap.php
+++ b/scripts/user/sync_users_dolibarr2ldap.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       scripts/user/sync_users_dolibarr2ldap.php
  *      \ingroup    ldap core
  *      \brief      Script de mise a jour des users dans LDAP depuis base Dolibarr
- *		\version	$Id: sync_users_dolibarr2ldap.php,v 1.11 2011/07/09 14:11:42 eldy Exp $
+ *		\version	$Id: sync_users_dolibarr2ldap.php,v 1.12 2011/07/31 22:22:12 eldy Exp $
  */
 
 $sapi_type = php_sapi_name();
@@ -43,7 +42,7 @@ if (! isset($argv[1]) || ! $argv[1]) {
 $now=$argv[1];
 
 // Recupere env dolibarr
-$version='$Revision: 1.11 $';
+$version='$Revision: 1.12 $';
 
 require_once($path."../../htdocs/master.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
diff --git a/scripts/withdrawals/build_withdrawal_file.php b/scripts/withdrawals/build_withdrawal_file.php
index d5853858189..bcfcc1d1c8e 100644
--- a/scripts/withdrawals/build_withdrawal_file.php
+++ b/scripts/withdrawals/build_withdrawal_file.php
@@ -15,15 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *      \file       scripts/withdrawals/build_withdrawal_file.php
  *      \ingroup    prelevement
  *      \brief      Script de prelevement
- * 		\version	$Id: build_withdrawal_file.php,v 1.4 2011/07/09 14:11:41 eldy Exp $
+ * 		\version	$Id: build_withdrawal_file.php,v 1.5 2011/07/31 22:22:12 eldy Exp $
  */
 
 $sapi_type = php_sapi_name();
@@ -37,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Recupere env dolibarr
-$version='$Revision: 1.4 $';
+$version='$Revision: 1.5 $';
 
 require_once($path."../../htdocs/master.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php");