Add Mexico society types

2011-07-28 15:09:53 +00:00
parent f4f623e809
commit 4c25e45bf8
241 changed files with 1203 additions and 1302 deletions
--- a/build/.cvsignore
+++ b/build/.cvsignore
@@ -14,6 +14,3 @@ version-phpsane.txt
 makepack-phpsane.conf
 html
 *.deb
-*.dsc
-*.tar.gz
-*.changes
--- a/build/deb/README
+++ b/build/deb/README
@@ -22,13 +22,12 @@ with format .DEB (for Debian, Ubuntu, ...).
 # lintian --pedantic -E -I package.deb   To test a package   
 #
 # dpkg -l                                List all packages
-# dpkg -b                                To build binary only package
+# 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-reconfigure -plow package		 Reconfigure package
+#
 # dpkg -L packagename                    List content of installed package 
-# dpkg -r packagename                    Remove config files and interactive saved answers
 # dpkg --purge                           Remove config files and interactive saved answers
 #
 # dpkg-buildpackage -us -uc              Build a source and binary package
@@ -50,5 +49,5 @@ For first ITP submission of Dolibarr, bug id was 634783.
 - 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://packages.qa.debian.org/package
 http://bugs.debian.org/package
--- a/build/deb/changelog
+++ b/build/deb/changelog
@@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low
  * New upstream release.
    closes: bug#634783
    
- -- Dolibarr team <contact@dolibarr.org>  Mon, 30 Jul 2011 12:00:00 +0100     
+ -- Laurent Destailleur <eldy@users.sourceforge.net>  Mon, 18 Jul 2011 12:00:00 +0100     

-# For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. 
+# More information into /usr/share/dolibarr/ChangeLog file. 
--- a/build/deb/config
+++ b/build/deb/config
@@ -13,29 +13,16 @@ db_version 2.0
 echo Run the dolibarr config script

 # Rotate old configuration
-#if [ "$1" = "reconfigure" ] ; then
-#	config="/etc/dolibarr/apache.conf"
-#	if [ -f $config ] ; then
-#		for i in $(seq 8 -1 0) ; do
-#			if [ -f ${config}.$i ] ; then
-#				mv ${config}.$i ${config}.$(($i +1))
-#			fi
-#		done
-#		mv ${config} ${config}.0
-#	fi
-#fi
-# Rotate old configuration
-#if [ "$1" = "reconfigure" ] ; then
-#	config="/etc/dolibarr/lighttpd.conf"
-#	if [ -f $config ] ; then
-#		for i in $(seq 8 -1 0) ; do
-#			if [ -f ${config}.$i ] ; then
-#				mv ${config}.$i ${config}.$(($i +1))
-#			fi
-#		done
-#		mv ${config} ${config}.0
-#	fi
-#fi
+if [ "$1" = "reconfigure" ] ; then
+	config="/etc/dolibarr/apache.conf"
+	for i in $(seq 8 -1 0) ; do
+		if [ -f ${config}.$i ] ; then
+			mv ${config}.$i ${config}.$(($i +1))
+		fi
+	done
+	mv ${config} ${config}.0
+fi
+


 db_capb backup
@@ -43,9 +30,8 @@ db_capb backup
 db_title "dolibarr" || true


-# Ask if we must delete database
-echo "Ask for web server to setup"
-db_input critical dolibarr/reconfigure-webserver || true
+# Ask for web server type.
+#db_input critical "dolibarr/webserver" || true

 if db_go ; then
    okcancel="1"
--- a/build/deb/control.debianbin
+++ b/build/deb/control.debianbin
--- a/build/deb/control.debian
+++ b/build/deb/control.debian
@@ -4,16 +4,10 @@ Standards-Version: 3.9.1
 Section: web
 Priority: optional
 Homepage: http://www.dolibarr.org
-Build-Depends: debhelper (>= 7), po-debconf
+Build-Depends: debhelper, po-debconf

 Package: dolibarr
-Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5,
-    php5-mysql | php5-mysqli, 
-    php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime,
-    ${misc:Depends}, xdg-utils,
-    mysql-server, perl
-Recommends: apache2 | lighttpd | httpd, mysql-client
-Suggests: www-browser
+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
--- a/build/deb/copyright
+++ b/build/deb/copyright
@@ -44,9 +44,7 @@ Copyright: 2002-2009, Rodolphe Quiedeville   <rodolphe@quiedeville.org>
 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'.
- Full text of Lesser General Public Licence version 3 can be 
- found in the file
- `/usr/share/common-licenses/LGPL-3'.
+ 
 
 Files: htdocs/includes/artichow/*
 License: Public Domain
@@ -66,9 +64,6 @@ License: GPL-2+
 Files: htdocs/includes/jquery/*
 License: GPL-2+ or MIT

-Files: htdocs/includes/jquery/plugins/flot/*
-License: Public Domain
-
 Files: htdocs/includes/jsgantt/*
 License: GPL-2+

--- a/build/deb/dolibarr.desktop
+++ b/build/deb/dolibarr.desktop
@@ -3,14 +3,10 @@
 # It must be saved into directory /usr/share/applications
 Version=1.0
 Name=Dolibarr ERP & CRM
-Name[es]=Dolibarr ERP & CRM
 Name[fr]=Dolibarr ERP & CRM
-Name[it]=Dolibarr ERP & CRM
 GenericName=Dolibarr ERP & CRM
 Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations
-Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones
 Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations
-Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti
 # Command to open an URL
 # For Fedora: xdg-open 
 # For Debian/Ubuntu: xdg-open or x-www-browser
--- a/build/deb/dolibarr.lintian-overrides
+++ b/build/deb/dolibarr.lintian-overrides
@@ -1,9 +0,0 @@
-# embedded libraries, which don't seem to be available in Debian in correct version
-# or because they were modified and are specific dolibarr code
-embedded-javascript-library usr/share/dolibarr/htdocs/includes/ckeditor/adapters/jquery.js
-embedded-javascript-library usr/share/dolibarr/htdocs/includes/ckeditor/ckeditor.js
-embedded-javascript-library usr/share/dolibarr/htdocs/includes/fckeditor/fckeditor.js
-embedded-php-library usr/share/dolibarr/htdocs/includes/magpierss/extlib/Snoopy.class.inc
-embedded-php-library usr/share/dolibarr/htdocs/includes/magpierss/rss_parse.inc
-embedded-php-library usr/share/dolibarr/htdocs/includes/nusoap/lib/nusoap.php
-embedded-php-library usr/share/dolibarr/htdocs/includes/odtphp/zip/pclzip/pclzip.lib.php
--- a/build/deb/install
+++ b/build/deb/install
@@ -1,5 +1,4 @@
 etc/dolibarr/apache.conf
-etc/dolibarr/lighttpd.conf
 usr/share/applications/dolibarr.desktop
 usr/share/doc/dolibarr
 usr/share/dolibarr
--- 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.9 2011/07/30 14:56:12 eldy Exp $
+// $Id: install.forced.php.install,v 1.8 2011/07/27 16:45:47 eldy Exp $
 //

-$force_install_noedit=2;
+$force_install_noedit=1;
 $force_install_message='KeepDefaultValuesDeb';
 #$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='dolibarrdebian';
+$force_install_database='dolibarr';
 $force_install_createdatabase='1';
-$force_install_databaselogin='dolibarrdebian';
+$force_install_databaselogin='dolibarrmysql';
 $force_install_databasepass='';
 $force_install_createuser='1';
 $force_install_databaserootlogin='__SUPERUSERLOGIN__';
--- a/build/deb/lighttpd.conf
+++ b/build/deb/lighttpd.conf
@@ -1,22 +0,0 @@
-# Alias for dolibarr directory
-alias.url += ( 
-	"/dolibarr" => "/usr/share/dolibarr/htdocs",
-)
-
-# Disallow access to libraries
-#$HTTP["url"] =~ "^/dolibarr/libraries" { 
-#    url.access-deny = ( "" ) 
-#}
-
-# Limit access to setup script
-#$HTTP["url"] =~ "^/dolibarr/setup" {
-#	auth.backend = "htpasswd"
-#	auth.backend.htpasswd.userfile = "/etc/dolibarr/htpasswd.setup"
-#	auth.require = (
-#		"/" => (
-#			"method" => "basic",
-#			"realm" => "Dolibarr Setup",
-#			"require" => "valid-user"
-#		)
-#	)
-#}
--- a/build/deb/po/fr.po
+++ b/build/deb/po/fr.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-01 18:17+0200\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"
@@ -25,26 +25,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Project-Id: dolibarr\n"

-#. Type: multiselect
-#. Description
-#: ../templates:1001
-msgid "Web server to reconfigure automatically:"
-msgstr "Seveur web à reconfigurer automatiquement:"
-
-#. Type: multiselect
-#. Description
-#: ../templates:1001
-msgid ""
-"Please choose the web server that should be automatically configured to run "
-"dolibarr."
-msgstr ""
-"Selectionnez le serveur web à configurer automatiquement pour utiliser "
-"dolibarr."
-
 #
 #. Type: boolean
 #. Description
-#: ../templates:2001
+#: ../templates:1001
 #, fuzzy
 msgid "Delete database and uploaded files ?"
 msgstr "Effacer la base de donnée et les fichiers uploadés ?"
@@ -52,7 +36,7 @@ msgstr "Effacer la base de donnée et les fichiers uploadés ?"
 #
 #. Type: boolean
 #. Description
-#: ../templates:2001
+#: ../templates:1001
 #, fuzzy
 msgid ""
 "Answer if you want to removed the Dolibarr MySQL database and all other "
--- a/build/deb/po/templates.pot
+++ b/build/deb/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-01 18:17+0200\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"
@@ -17,29 +17,15 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"

-#. Type: multiselect
-#. Description
-#: ../templates:1001
-msgid "Web server to reconfigure automatically:"
-msgstr ""
-
-#. Type: multiselect
-#. Description
-#: ../templates:1001
-msgid ""
-"Please choose the web server that should be automatically configured to run "
-"dolibarr."
-msgstr ""
-
 #. Type: boolean
 #. Description
-#: ../templates:2001
+#: ../templates:1001
 msgid "Delete database and uploaded files ?"
 msgstr ""

 #. Type: boolean
 #. Description
-#: ../templates:2001
+#: ../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 "
--- a/build/deb/postinst
+++ b/build/deb/postinst
@@ -1,5 +1,7 @@
 #!/bin/sh
 # postinst script for dolibarr
+#
+# see: dh_installdeb(1)

 set -e

@@ -14,31 +16,6 @@ set -e
 # for details, see /usr/share/doc/packaging-manual/


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

 db_version 2.0
@@ -47,25 +24,17 @@ db_version 2.0
 echo Run the dolibarr postinst script


-# Define vars
 docdir='/var/lib/dolibarr/documents'
 #docdir='/usr/share/dolibarr/documents'
-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)

-        # Create document directory for uploaded data files
-        mkdir -p $docdir
-        chown -R www-data:www-data $docdir
-        chmod -R 775 $docdir
-        chmod -R g+s $docdir
-
-		# Copy install config file (with matching Debian) values into target directory
+		# Edit install.forced.php to match Debian values
+		fileorig="/usr/share/dolibarr/build/deb/install.forced.php.install"
+		config="/usr/share/dolibarr/htdocs/install/install.forced.php"
 		superuserlogin=''
 		superuserpassword=''
 		if [ -f /etc/mysql/debian.cnf ] ; then
@@ -75,31 +44,42 @@ case "$1" in
 		fi
 		echo Mysql superuser found to use is $superuserlogin
 		if [ -z "$superuserlogin" ] ; then
-			cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig
+			cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $config
 		else
-			cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig
+			cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $config
 		fi
-		chown -R root:www-data $installconfig
-	   	chmod -R 660 $installconfig
+
+        # 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 an empty conf.php with permission to web server
-		if [ ! -f $config ]
+		if [ ! -f /usr/share/dolibarr/htdocs/conf/conf.php ]
 		then 
-			echo Create empty file $config		
-			touch $config
-			chown -R root:www-data $config
-	    	chmod -R 660 $config
+			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
 		fi

-	
-		db_get dolibarr/reconfigure-webserver
-	
-		webservers="$RET"
-	
+		#db_reset "dolibarr/webserver"
+
+		# Get the web server type (use db_get for interactive mode).
+		#db_get "dolibarr/webserver"		# Read value for webserver.
+		#webserver="$RET"
+
+		case $webserver in
+			Apache)		webservers="apache2" ;;
+			Apache-SSL)	webservers="apache2-ssl" ;;
+			Both)		webservers="apache2 apache2-ssl" ;;
+			*)		    webservers="apache2 apache2-ssl" ;;
+		esac
+
 		# Set up web server.
-		for webserver in $webservers ; do
-			webserver=${webserver%,}
-			echo Complete config of server $webserver
+		for server in $webservers ; do
+			echo Complete config of server $server
 			
 			# Detect webuser and webgroup
 			webuser=
@@ -116,32 +96,47 @@ case "$1" in

 			# Set permissions to web server
 			chown -R $webuser:$webgroup /usr/share/dolibarr
-            chown -R root:$webgroup $config
+            chown -R root:$webgroup /usr/share/dolibarr/htdocs/conf/conf.php
+
+			# Add link to config file
+            echo Setup web server $server to add dolibarr config file
+			ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d/dolibarr.conf
+			
 		done

-		# Restart web server.
-		for webserver in $webservers; do
-			webserver=${webserver%,}
-			if [ "$webserver" = "lighttpd" ] ; then
-				lighttpd_install
-			else
-				apache_install $webserver
-			fi
-			# Reload webserver in any case, configuration might have changed
-			# Redirection of 3 is needed because Debconf uses it and it might 
-			# be inherited by webserver. See bug #446324.
-	        if [ -f /etc/init.d/$webserver ] ; then
-	            if [ -x /usr/sbin/invoke-rc.d ]; then
-    	            echo Restart web server $server using invoke-rc.d
-	    		    # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...)
-	                invoke-rc.d $webserver reload 3>/dev/null || true
-	            else
-	                echo Restart web server $server using $server reload
-	                /etc/init.d/$webserver reload 3>/dev/null || true
-	            fi
-	        fi
-		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
+		for server in $servers ; do
+    		if [ -x /usr/sbin/invoke-rc.d ]; then
+                echo Restart web server $server using invoke-rc.d
+    		    # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...)
+    	    	invoke-rc.d $server reload || true
+    		else
+                echo Restart web server $server using $server reload
+    	    	/etc/init.d/$server reload || true
+    		fi
+		done
 		
 		echo ----------
 		echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr."
@@ -152,13 +147,13 @@ case "$1" in
 	;;

 	*)
-		echo "postinst called with unknown argument $1" >&2
+		echo "postinst called with unknown argument \`$1'" >&2
 		exit 0
 	;;
 esac

-#DEBHELPER#
-
 db_stop

+#DEBHELPER#
+
 exit 0
--- a/build/deb/postrm
+++ b/build/deb/postrm
@@ -17,36 +17,7 @@ set -e
 # for details, see /usr/share/doc/packaging-manual/


-
-lighttpd_remove() {
-	if [ -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then
-		echo "Remove link for Lighttpd config file"
-		rm -f /etc/lighttpd/conf-available/50-dolibarr.conf
-		if which lighty-enable-mod >/dev/null 2>&1 ; then
-			lighty-disable-mod dolibarr
-		else
-			echo "Lighttpd not installed, skipping"
-		fi
-		# See bug #448682
-		if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then
-		    echo 'Manually deleting lighttpd/dolibarr configuration link'
-		    rm /etc/lighttpd/conf-enabled/50-dolibarr.conf
-		fi
-	fi
-}
-
-apache_remove() {
-	if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/dolibarr.conf ]; then
-		echo "Remove link for Apache config file"
-		rm -f /etc/$webserver/conf.d/dolibarr.conf
-	fi
-}
-
-
-
-if [ -f /usr/share/debconf/confmodule ]; then
-    . /usr/share/debconf/confmodule
-fi
+. /usr/share/debconf/confmodule

 db_version 2.0

@@ -55,70 +26,40 @@ echo Run the dolibarr postrm script

 docdir='/var/lib/dolibarr/documents'
 #docdir='/usr/share/dolibarr/documents'
-#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" ;;
+	Apache-SSL)	webservers="apache2-ssl" ;;
+	Both)		webservers="apache2 apache2-ssl" ;;
+	*)		    webservers="apache2 apache2-ssl" ;;
+esac
+export includefile=/etc/dolibarr/apache.conf
+

 case "$1" in
-
-    # Call when we upgrade
-	upgrade)
-		echo "postrm upgrade"
-	;;
-
-    # Call when we uninstall
-	remove)
-		echo "postrm remove"
-		rm -f $lockfile
-
-		# Reconfigure web server
-		db_get dolibarr/reconfigure-webserver
-
-		webservers="$RET"
-
-		# Restart web servers
-		for webserver in $webservers; do
-			webserver=${webserver%,}
-			if [ "$webserver" = "lighttpd" ] ; then
-				lighttpd_remove
-			else
-				apache_remove $webserver
-			fi
-			# Redirection of 3 is needed because Debconf uses it and it might 
-			# be inherited by webserver. See bug #446324.
-			if [ -f /etc/init.d/$webserver ] ; then
-				if [ -x /usr/sbin/invoke-rc.d ]; then
-					invoke-rc.d $webserver reload 3>/dev/null || true
-				else
-					/etc/init.d/$webserver reload 3>/dev/null || true
-				fi
-			fi
-		done
-	;;
-
    # Call when we uninstall and purge
 	purge)
-		echo "postrm purge"
+		echo "postrm purge webservers=$webservers includefile=$includefile"

 		# Ask if we must delete database
 		echo "postrm db_input dolibarr/postrm"
-		db_input critical dolibarr/postrm || true
+		db_input critical "dolibarr/postrm" || true
 		db_go || true

 		echo "postrm db_get dolibarr/postrm"
 		# We disable set -e to avoid premature end of script if error
 		set +e
-		db_get dolibarr/postrm
+		db_get "dolibarr/postrm"
 		set -e
 	
 		if [ "$RET" = "true" ] ; then
 			echo postrm Mysql database deletion
 			# Get database configuration
 			dbserver="localhost"
-			dbuser="dolibarrdebian"
-			dbname="dolibarrdebian"
+			dbname="dolibarrmysql"
 			#db_get "dolibarr/db/name"
 			#dbname="$RET"
 			superuserlogin=''
@@ -179,31 +120,23 @@ case "$1" in
 			fi
 			mysqlcmd="mysql $hostopt $passopt -u $dbadmin"

-		    # 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 $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
+			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"
@@ -213,22 +146,91 @@ case "$1" in
 			echo "postrm Delete of dolibarr database and uploaded files not wanted" 
 		fi
 	
+		# Remove include files
+		export restart=""
+		for server in $webservers ; do
+			export conffile="/etc/$server/conf.d/dolibarr.conf"
+            if [ -f $conffile ] ;
+            then
+               echo Delete file $conffile
+	           rm -f $conffile
+	           status=purge
+		    fi
+			
+			if [ "x$status" = "xpurge" ] ;
+				then restart="$restart $server"
+			fi
+		done
+
 		rm -rf /etc/dolibarr

+		# Restart servers
+		for server in $restart ; do
+            # We disable blocking errors
+            set +e
+            echo "Restart server $server if exists"
+    		if [ -x /usr/sbin/invoke-rc.d ]; then
+    		     invoke-rc.d $server reload || true
+    		else
+    		     /etc/init.d/$server reload || true
+    		fi
+    		# We restore blocking errors
+    		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/reconfigure-webserver
-		db_reset dolibarr/postrm
+		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
+        
+		# Remove include files
+		export restart=""
+		for server in $webservers ; do
+			export conffile="/etc/$server/conf.d/dolibarr.conf"
+            if [ -f $conffile ] ;
+            then
+               echo Delete file $conffile
+	           rm -f $conffile
+	           status=purge
+		    fi
+			
+			if [ "x$status" = "xpurge" ] ;
+				then restart="$restart $server"
+			fi
+		done
+	;;
+
+	upgrade)
+	;;
+
 	failed-upgrade|abort-install|abort-upgrade|disappear)
 	;;

 	*)
-		echo "postrm called with unknown argument $1" >&2
+		echo "postrm called with unknown argument \`$1'" >&2
 		exit 0
 	;;
 esac
--- a/build/deb/templates
+++ b/build/deb/templates
@@ -1,10 +1,3 @@
-Template: dolibarr/reconfigure-webserver
-Type: multiselect
-Choices: apache2, lighttpd
-_Description: Web server to reconfigure automatically:
- Please choose the web server that should be automatically configured
- to run dolibarr.
-
 Template: dolibarr/postrm
 Type: boolean
 Default: true
--- 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.130 2011/08/03 00:47:37 eldy Exp $
+# \version      $Id: makepack-dolibarr.pl,v 1.119 2011/07/27 23:51:07 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-beta";		# Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
+$BUILD="0-dev";		# 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
@@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") {


 use vars qw/ $REVISION $VERSION /;
-$REVISION='$Revision: 1.130 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
+$REVISION='$Revision: 1.119 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
 $VERSION="1.0 (build $REVISION)";


@@ -254,18 +254,15 @@ if ($nboftargetok) {

        $ret=`rm -f  $BUILDROOT/$PROJECT/build/DoliW*-*`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/build/DoliM*-*`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.changes`;
+        $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_*.tar.gz`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.deb`;
        $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`;
@@ -276,28 +273,16 @@ if ($nboftargetok) {
        $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`;
@@ -306,23 +291,17 @@ if ($nboftargetok) {
 	    $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*  $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/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/blank.html`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/.svn`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`;
+        $ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`;
 	    #$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/smarty`;
        $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
@@ -421,19 +400,14 @@ if ($nboftargetok) {
    	}
    
    	if ($target eq 'RPM') {                 # Linux only
-    		#$ARCH='i386';
-    		$ARCH='noarch';
+    		$ARCH='i386';
 			if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; }
           	$newbuild = $BUILD;
-           	# For fedora
-            $newbuild =~ s/(dev|alpha)/0.1.a/gi;			# dev
-            $newbuild =~ s/beta/0.2.beta1/gi;				# beta
-            $newbuild =~ s/rc./0.3.rc1/gi;					# rc
+            $newbuild =~ s/(dev|alpha)/0/gi;				# dev
+            $newbuild =~ s/beta/1/gi;						# beta
+            $newbuild =~ s/rc./2/gi;						# rc
            if ($newbuild !~ /-/) { $newbuild.='-3'; }		# finale
-            #$newbuild =~ s/(dev|alpha)/0/gi;				# dev
-            #$newbuild =~ s/beta/1/gi;						# beta
-            #$newbuild =~ s/rc./2/gi;						# rc
-            #if ($newbuild !~ /-/) { $newbuild.='-3'; }		# finale
+            # now newbuild is 0-0 or 0-3 for example
            $REL1 = $newbuild; $REL1 =~ s/-.*$//gi;
            if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; }
            print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";
@@ -445,103 +419,13 @@ if ($nboftargetok) {

            #rmdir "$BUILDROOT/$FILENAMETGZ2";
    		$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`;
-    		print "Create directory $BUILDROOT/$FILENAMETGZ2/var/www\n";
-    		$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/var/www"`;
-            print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\n";
-    		$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\"";
+            print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n";
+    		$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2\"";
            $ret=`$cmd`;

 			print "Remove other files\n";
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README-FR`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README-FR`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/aps`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/dmg`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/pad/README`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/tgz/README`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb/README`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/doap`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/exe`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/live`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/patch`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/zip`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/perl`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/dbmodel`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/fpdf`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/initdata`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/iso-normes`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpcheckstyle`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpunit`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/flyer`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/font`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/tshirt`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/rollup`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/test`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fpdf/fpdf`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/.svn`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/smarty`;
+            $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;

-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/COPYING`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
-            # To remove once stable
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/htdocs/theme/bureau2crea`;
-
-			# Apache conf files
-    		print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/httpd-dolibarr.conf\n";
-    		$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`;
-    		$ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`;
-    		$ret=`cp "$SOURCE/build/rpm/file_contexts.dolibarr" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/file_contexts.dolibarr"`;
-
-			# Dolibarr conf files
-			# TODO
-
-			# dolibarr.desktop
-	   		#print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/applications\n";
-    		#$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/applications"`;
-    		#print "Copy desktop file into $BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop\n";
-    		#$ret=`cp "$SOURCE/build/rpm/dolibarr.desktop" "$BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop"`;
-            
-            # pixmap
-	   		#print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps\n";
-    		#$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps"`;
-    		#print "Copy pixmap file into $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm\n";
-    		#$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm"`;
-
-			# Set owners
-            print "Set owners on files/dir\n";
-		    $ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`;
-
-            print "Set permissions on files/dir\n";
-		    $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`;
-		    $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.php' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.pl' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev -name '*.php' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/translation/langAutoParser.class.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_page.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/modMyModule.class.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_class.class.php`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-
-			# Build tgz
    		print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n";
    		$ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`;

@@ -569,17 +453,11 @@ 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') 
    	{
-            $olddir=getcwd();
-
            $newbuild = $BUILD;
            $newbuild =~ s/(dev|alpha)/1/gi;                # dev
            $newbuild =~ s/beta/2/gi;                       # beta
@@ -614,7 +492,7 @@ if ($nboftargetok) {
            $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.debianbin") || die "Error";
+            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/;
@@ -625,33 +503,19 @@ if ($nboftargetok) {
            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`;
@@ -659,16 +523,18 @@ if ($nboftargetok) {
            $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/build/perl`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/dmg`;
 		    $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 -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/*/README`;
+		    $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`;
@@ -683,22 +549,16 @@ if ($nboftargetok) {
            $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/htdocs/includes/fckeditor/license.txt`;
-		    $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/jquery/plugins/flot/LICENSE.txt`;
-		    $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`;
-		    $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`;
+		    
            $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`;

-			# Apache and lighttpd conf files
+			# apache.conf
    		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"`;
-    		print "Copy lighttpd.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf\n";
-    		$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`;
-    		$ret=`cp "$SOURCE/build/deb/lighttpd.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf"`;

 			# dolibarr.desktop
 	   		print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n";
@@ -715,7 +575,17 @@ if ($nboftargetok) {
            print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT\n";
            $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT"`;
            
-			# Set owners
+    		#print "Copy README file into $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
+            #$ret=`cp "$SOURCE/README" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/README"`;
+
+			# 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"`;
+
+            # 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`;

@@ -744,45 +614,47 @@ if ($nboftargetok) {
            $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`;
            
-             # Creation of binary package (to build without sources)
-     		#print "Go to directory $BUILDROOT\n";
-     		#chdir("$BUILDROOT");
+     		print "Go to directory $BUILDROOT\n";
+            $olddir=getcwd();
+     		chdir("$BUILDROOT");
+ 
+            # 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";

-            # Prepare source package
+            # 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/pom.xml"`;
+            $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYRIGHT"`;
+            $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/INSTALL"`;
+            $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README"`;
+            $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README-FR"`;
            $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/dolibarr.lintian-overrides"        "$BUILDROOT/$PROJECT.tmp/debian/dolibarr.lintian-overrides"`;
-            $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"`;
+            $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"`;
            # 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"`;
+            $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`;
-
-			# Creation of source package          
-     		print "Go to directory $BUILDROOT\n";
            chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build");
            #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
            $cmd="dpkg-buildpackage -us -uc";
@@ -795,18 +667,12 @@ if ($nboftargetok) {
            if ($OS =~ /windows/i)
            {
                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/"`;
+                $ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`;
            }
            else
            {
                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/"`;
+                $ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`;
            }
        	next;
        }
@@ -834,21 +700,14 @@ 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/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`;
--- a/build/rpm/README
+++ b/build/rpm/README
@@ -5,24 +5,17 @@ RPM Package tools

 This directory contains files used by makepack-dolibarr.pl
 script to build a package, ready to be distributed,
-with format RPM (for Redhat, OpenSuse, Mandriva, ...).
+with format RPM (for Redhat, Mandriva, ...).


-# This is standard command to work on RPM packaging:
-#
-# yum -y install rpmlint
-# yum -y install hunspell-en hunspell-es hunspell-fr hunspell-it
+# This is standard command to work on Debian packaging:
 #
 # rpmlint file.rpm				    Test a package
-# mock -r fedora-15-i386 --rebuild ../SRPMS/hello-2.7-1.fc15.src.rpm
 #
 # On Fedora
 # rpm -i --test dolibarr-...rpm     To list dependencies of RPM   
 # yum install dolibarr-...rpm       To install package and dependencies   
-# yum erase dolibarr                To remove package
-# chcon -R -h -t httpd_sys_script_rw_t /file					To add temporary context rw for httpd on /file    
-# semanage fcontext -a -t httpd_sys_script_rw_t "/dir/(.*)?" 	To add persistent context rw for httpd on /dir (this add file_contexts.local)
-# restorecon -R -v /file			Restore values into files (cancel chcon, validate semanage)    
+# yum erase dolibarr                To remove package   
 #
 # On OpenSuse
 # yast --install dolibarr-...rpm    To install package and dependencies
--- a/build/rpm/dolibarr.desktop
+++ b/build/rpm/dolibarr.desktop
@@ -4,14 +4,13 @@
 Version=1.0
 Encoding=UTF-8
 Name=Dolibarr ERP & CRM
-Name[es]=Dolibarr ERP & CRM
 Name[fr]=Dolibarr ERP & CRM
 Name[it]=Dolibarr ERP & CRM
 GenericName=Dolibarr ERP & CRM
 Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations
-Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones
 Comment[fr]=L'ERP & CRM simple pour la gestion des TPE, PME, associations et auto-entrepreneurs
 Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti
+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: xdg-open or x-www-browser
@@ -20,7 +19,7 @@ Exec=xdg-open http://localhost/dolibarr
 Icon=dolibarr
 Terminal=false
 Type=Application
-Categories=Office;
+Categories=Office
 StartupNotify=true
 InitialPreference=5
 #NoDisplay=true
--- a/build/rpm/dolibarr.spec
+++ b/build/rpm/dolibarr.spec
@@ -5,11 +5,6 @@
 # file to build a package for your own distributions and 
 # edit it if you need to match your rules.
 # --------------------------------------------------------
-
-#%define is_mandrake %(test -e /etc/mandrake-release && echo 1 || echo 0)
-#%define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0)
-#%define is_fedora %(test -e /etc/fedora-release && echo 1 || echo 0)
-
 %define name dolibarr
 %define version	__VERSION__
 %define release __RELEASE__
@@ -17,12 +12,9 @@
 Name: %{name}
 Version: %{version}
 Release: %{release}
-Summary: ERP and CRM software for small and medium companies or foundations 
-Summary(es): Software ERP y CRM para pequeñas y medianas empresas o, asociaciones o autónomos
-Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs ou associations
-Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti
+Summary: Dolibarr

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

@@ -64,12 +56,13 @@ Dolibarr was designed to provide only features you need and be easy to
 use.

 %description -l es
-Un software ERP y CRM para pequeñas y medianas empresas, asociaciones
-o autónomos. Incluye diferentes funcionalidades para la Planificación 
-de Recursos Empresariales (ERP) y Gestión de la Relación con los
-Clientes (CRM) así como para para otras diferentes actividades. 
-Dolibarr ha sido diseñado para suministrarle solamente las funcionalidades
-que necesita y haciendo hincapié en su facilidad de uso.
+Un software ERP y CRM open source/gratis para pequeñas y
+medianas empresas, asociaciones o autónomos. Incluye diferentes
+funcionalidades para la Planificación de Recursos Empresariales (ERP) y
+Gestión de la Relación con los Clientes (CRM) así como para para otras
+diferentes actividades. Dolibarr ha sido diseñado para suministrarle
+solamente las funcionalidades que necesita y haciendo hincapié en su
+facilidad de uso.
    
 %description -l fr
 Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, 
@@ -78,12 +71,12 @@ fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings
 et bien d'autres choses dans une interface pensée pour la simplicité.

 %description -l it
-Un programmo gestionale per piccole e medie
+Un programma gestionale open source e gratuito per piccole e medie
 imprese, fondazioni e liberi professionisti. Include varie funzionalità per
 Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori
-attività. Progettato per poter fornire solo ciò di cui hai bisogno 
+attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno 
 ed essere facile da usare.
-Programmo web, progettato per poter fornire solo ciò di 
+Dolibar è completamente web-based, progettato per poter fornire solo ciò di 
 cui hai bisogno ed essere facile da usare.


@@ -101,51 +94,49 @@ echo Building %{name}-%{version}-%{release}

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

-%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr
-%{__install} -m 644 etc/dolibarr/apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf
-%{__install} -m 644 etc/dolibarr/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr
+mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build
+mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc
+mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs
+mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts

 # %{_datadir} = /usr/share
-%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-%{__install} -m 644 var/www/dolibarr/doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png
-%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications
-%{__install} -m 644 var/www/dolibarr/build/rpm/dolibarr.desktop    $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+cp build/rpm/dolibarr.desktop    $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop

-%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/build
-%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/doc
-%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs
-%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts
-%{__cp} -pr var/www/dolibarr/build   $RPM_BUILD_ROOT/var/www/dolibarr
-%{__cp} -pr var/www/dolibarr/doc     $RPM_BUILD_ROOT/var/www/dolibarr
-%{__cp} -pr var/www/dolibarr/htdocs  $RPM_BUILD_ROOT/var/www/dolibarr
-%{__cp} -pr var/www/dolibarr/scripts $RPM_BUILD_ROOT/var/www/dolibarr
-%{__install} -m 644 var/www/dolibarr/COPYRIGHT  $RPM_BUILD_ROOT/var/www/dolibarr/doc/COPYRIGHT
+install -m 444 README     $RPM_BUILD_ROOT/var/www/dolibarr/README
+install -m 444 COPYRIGHT  $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT
+cp -pr build   $RPM_BUILD_ROOT/var/www/dolibarr
+cp -pr doc     $RPM_BUILD_ROOT/var/www/dolibarr
+cp -pr htdocs  $RPM_BUILD_ROOT/var/www/dolibarr
+cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr


 #---- clean
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT


 #---- files
 %files
-
 %defattr(-,root,root)
+%doc README
+%doc COPYRIGHT
 %doc /var/www/dolibarr/doc/*
 %dir /var/www/dolibarr/build
 %dir /var/www/dolibarr/htdocs
 %dir /var/www/dolibarr/scripts
-%_datadir/pixmaps/dolibarr.png
+%_datadir/pixmaps/*
 %_datadir/applications/%{name}.desktop
 /var/www/dolibarr/build/*
 /var/www/dolibarr/htdocs/*
 /var/www/dolibarr/scripts/*
-
-%defattr(0664, -, -, 0755)
-%config(noreplace) %{_sysconfdir}/dolibarr/apache.conf
-%config(noreplace) %{_sysconfdir}/dolibarr/file_contexts.dolibarr
+/var/www/dolibarr/README
+/var/www/dolibarr/COPYRIGHT
+#%config /var/www/dolibarr/htdocs/conf/conf.php


 #---- post (after unzip during install)
@@ -163,11 +154,11 @@ 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"
-export sefileorig="%{_sysconfdir}/dolibarr/file_contexts.dolibarr"
+export sefileorig="$targetdir/build/rpm/file_contexts.dolibarr"
 export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr"
-#export config="/usr/share/dolibarr/htdocs/conf/conf.php"
-export config="%{_sysconfdir}/dolibarr/conf.php"
-export lockfile="/usr/share/dolibarr/install.lock"
+#config="/usr/share/dolibarr/htdocs/conf/conf.php"
+config="%{_sysconfdir}/dolibarr/conf.php"
+lockfile="/usr/share/dolibarr/install.lock"


 # Detect OS
@@ -201,8 +192,8 @@ 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
+mkdir -p $docdir
+mkdir -p %{_sysconfdir}/dolibarr

 # Create install.forced.php into Dolibarr install directory
 superuserlogin=''
@@ -214,12 +205,12 @@ if [ -f %{_sysconfdir}/mysql/debian.cnf ] ; then
 fi
 echo Mysql superuser found to use is $superuserlogin
 if [ -z "$superuserlogin" ] ; then
-    %{__cat} $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig
+    cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig
 else
-    %{__cat} $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig
+    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
+chown -R root:$apachegroup $installconfig
+chmod -R 660 $installconfig

 # Create an empty conf.php with permission to web server
 if [ ! -f $config ]
@@ -231,20 +222,19 @@ then
 fi

 # Create config file for apache $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
+if [ ! -f $apacheconfig ]; then
+  	 echo Create dolibarr web server config file $apacheconfig
+     cp $apachefileorig $apacheconfig
+     chmod a-x $apacheconfig
+     chmod go-w $apacheconfig
+fi

 # Create config file for se $seconfig
-if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon -a ! -f $seconfig ]; then
-  	 echo Add SE Linux permission from file $sefileorig
-#     cp $sefileorig $seconfig
-     restorecon -R -v /etc/dolibarr
-     restorecon -R -v /var/www/dolibarr
-     restorecon -R -v /usr/share/dolibarr
+if [ ! -f $seconfig ]; then
+  	 echo Create se config file $seconfig
+     cp $sefileorig $seconfig
+#     chmod a-x $apacheconfig
+#     chmod go-w $apacheconfig
 fi

 # Create a config link dolibarr.conf
@@ -263,6 +253,18 @@ echo Set permission to $apacheuser:$apachegroup on $docdir
 chown -R $apacheuser:$apachegroup $docdir
 chmod -R o-w $docdir

+# 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 
+    #chcon -R -h -t httpd_sys_content_t $targetdir
+    #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
+
 # Restart web server
 echo Restart web server
 if [ -f %{_sysconfdir}/init.d/httpd ]; then
@@ -272,12 +274,6 @@ if [ -f %{_sysconfdir}/init.d/apache2 ]; then
    %{_sysconfdir}/init.d/apache2 restart
 fi

-# Restart mysql
-echo Restart mysql
-if [ -f /etc/init.d/mysqld ]; then
-	/etc/init.d/mysqld restart
-fi
-
 # Show result
 echo
 echo "----- Dolibarr %version - (c) Dolibarr dev team -----"
@@ -305,9 +301,9 @@ 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"
-#export config="/usr/share/dolibarr/htdocs/conf/conf.php"
-export config="%{_sysconfdir}/dolibarr/conf.php"
-export lockfile="$targetdir/install.lock"
+#config="/usr/share/dolibarr/htdocs/conf/conf.php"
+config="%{_sysconfdir}/dolibarr/conf.php"
+lockfile="$targetdir/install.lock"


 # Detect OS
@@ -342,7 +338,7 @@ echo OS detected: $os
 if [ -f $apachelink ] ;
 then
    echo Delete apache config link for Dolibarr
-    %{__rm} -f $apachelink
+    rm -f $apachelink
    status=purge
 fi

@@ -360,15 +356,18 @@ then
 fi

 # Removed dirs after apache restart
+echo Removed remaining $apacheconfig
+rm -f $apacheconfig
 echo Removed remaining $config
-%{__rm} -f $config
+rm -f $config
 echo Removed remaining $installconfig
-%{__rm} -f $installconfig
+rm -f $installconfig
 echo Removed remaining $lockfile
-%{__rm} -f $lockfile
+rm -f $lockfile
 echo Removed remaining dir $targetdir/doc
 rmdir $targetdir/doc >/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-0.2.beta1
--- a/build/rpm/file_contexts.dolibarr
+++ b/build/rpm/file_contexts.dolibarr
@@ -1,3 +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
+/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
--- a/dev/skeletons/modMyModule.class.php
+++ b/dev/skeletons/modMyModule.class.php
@@ -27,7 +27,7 @@
 *      \file       htdocs/includes/modules/modMyModule.class.php
 *      \ingroup    mymodule
 *      \brief      Description and activation file for module MyModule
- *		\version	$Id: modMyModule.class.php,v 1.67 2011/08/01 13:26:21 hregis Exp $
+ *		\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");

@@ -72,7 +72,7 @@ class modMyModule extends DolibarrModules
 		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
 		$this->picto='generic';

-		// Defined if the directory /mymodule/includes/triggers/ contains triggers or not
+		// Defined if the directory /mymodule/inc/triggers/ contains triggers or not
 		$this->triggers = 0;

 		// Data directories to create when module is enabled.
--- a/doc/images/README
+++ b/doc/images/README
@@ -12,3 +12,5 @@ Follow us on twitter http://twitter.com/gasyoun or email leds24@gmail.com
 -------------------------------------------------------
 List of icons from http://led24.de/iconset/ are:
 - dolihelp.ico
+
+
--- a/htdocs/accountancy/class/accountancyaccount.class.php
+++ b/htdocs/accountancy/class/accountancyaccount.class.php
@@ -12,14 +12,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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *	\file       htdocs/accountancy/class/accountancyaccount.class.php
 * 	\ingroup    accounting
 * 	\brief      Fichier de la classe des comptes comptables
- * 	\version    $Id: accountancyaccount.class.php,v 1.2 2011/08/03 00:45:22 eldy Exp $
+ * 	\version    $Id$
 */


--- a/htdocs/accountancy/class/accountancysystem.class.php
+++ b/htdocs/accountancy/class/accountancysystem.class.php
@@ -12,14 +12,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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *	\file       htdocs/accountancy/class/accountancysystem.class.php
 * 	\ingroup    accounting
 * 	\brief      File of class to manage accountancy systems
- * 	\version    $Id: accountancysystem.class.php,v 1.3 2011/08/03 00:45:22 eldy Exp $
+ * 	\version    $Id$
 */


--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -18,14 +18,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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *   	\file       htdocs/adherents/admin/adherent.php
 *		\ingroup    member
 *		\brief      Page to setup the module Foundation
- *		\version    $Id: adherent.php,v 1.18 2011/08/03 00:45:42 eldy Exp $
+ *		\version    $Id$
 */

 require("../../main.inc.php");
@@ -331,7 +332,7 @@ $db->close();

 print '<br>';

-llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.18 $');
+llxFooter('$Date$ - $Revision$');



--- a/htdocs/adherents/admin/adherent_extrafields.php
+++ b/htdocs/adherents/admin/adherent_extrafields.php
@@ -14,14 +14,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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *      \file       htdocs/adherents/admin/adherent_extrafields.php
 *		\ingroup    member
 *		\brief      Page to setup extra fields of members
- *		\version    $Id: adherent_extrafields.php,v 1.5 2011/08/03 00:45:42 eldy Exp $
+ *		\version    $Id: adherent_extrafields.php,v 1.4 2011/07/18 19:25:48 eldy Exp $
 */

 require("../../main.inc.php");
@@ -311,5 +312,5 @@ if ($_GET["attrname"] && $action == 'edit')

 $db->close();

-llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.5 $');
+llxFooter('$Date: 2011/07/18 19:25:48 $ - $Revision: 1.4 $');
 ?>
--- a/htdocs/adherents/admin/public.php
+++ b/htdocs/adherents/admin/public.php
@@ -13,7 +13,8 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
@@ -21,7 +22,7 @@
 *		\ingroup    member
 *		\brief      File of main public page for member module
 *		\author	    Laurent Destailleur
- *		\version    $Id: public.php,v 1.3 2011/08/03 00:45:42 eldy Exp $
+ *		\version    $Id: public.php,v 1.2 2011/07/05 20:39:36 eldy Exp $
 */

 require("../../main.inc.php");
@@ -186,5 +187,5 @@ print '</table>';

 $db->close();

-llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.3 $');
+llxFooter('$Date: 2011/07/05 20:39:36 $ - $Revision: 1.2 $');
 ?>
--- a/htdocs/adherents/cartes/carte.php
+++ b/htdocs/adherents/cartes/carte.php
@@ -14,14 +14,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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *	\file 		htdocs/adherents/cartes/carte.php
 *	\ingroup    member
 *	\brief      Page to output members business cards
- *	\version    $Id: carte.php,v 1.42 2011/08/03 00:45:46 eldy Exp $
+ *	\version    $Id$
 */
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
@@ -87,7 +88,7 @@ if ((empty($foruserid) && empty($foruserlogin) && empty($mode)) || $mesg)
    print '</form>';
    print '<br>';

-    llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.42 $');
+    llxFooter('$Date$ - $Revision$');
 }
 else
 {
@@ -210,7 +211,7 @@ else
    {
    	dol_print_error($db);

-    	llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.42 $');
+    	llxFooter('$Date$ - $Revision$');
    }
 }

--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -17,14 +17,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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *	\file       htdocs/adherents/class/adherent.class.php
 *	\ingroup    member
 *	\brief      File of class to manage members of a foundation
- *	\version    $Id: adherent.class.php,v 1.45 2011/08/03 00:45:44 eldy Exp $
+ *	\version    $Id: adherent.class.php,v 1.44 2011/07/03 16:55:31 eldy Exp $
 */

 require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -14,7 +14,8 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
@@ -22,7 +23,7 @@
 *	\ingroup    member
 *	\brief      File of class to manage members types
 *	\author     Rodolphe Quiedeville
- *	\version    $Id: adherent_type.class.php,v 1.12 2011/08/03 00:45:44 eldy Exp $
+ *	\version    $Id: adherent_type.class.php,v 1.11 2011/07/05 08:08:16 eldy Exp $
 */

 require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -14,14 +14,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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *	\file       htdocs/adherents/class/adherentstats.class.php
 *	\ingroup    member
 *	\brief      Fichier de la classe de gestion des stats des adhérents
- *	\version    $Id: adherentstats.class.php,v 1.3 2011/08/03 00:45:44 eldy Exp $
+ *	\version    $Id: adherentstats.class.php,v 1.2 2011/07/04 10:30:01 eldy Exp $
 */

 include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php";
--- a/htdocs/adherents/class/cotisation.class.php
+++ b/htdocs/adherents/class/cotisation.class.php
@@ -13,14 +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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *		\file 		htdocs/adherents/class/cotisation.class.php
 *      \ingroup    member
 *		\brief      File of class to manage subscriptions of foundation members
- *		\version    $Id: cotisation.class.php,v 1.9 2011/08/03 00:45:44 eldy Exp $
+ *		\version    $Id$
 */

 require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -13,14 +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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *	    \file       htdocs/adherents/stats/index.php
 *      \ingroup    member
 *		\brief      Page des stats
- *		\version    $Id: geo.php,v 1.2 2011/08/03 00:45:44 eldy Exp $
+ *		\version    $Id$
 */

 require("../../main.inc.php");
@@ -275,5 +276,5 @@ dol_fiche_end();

 $db->close();

-llxFooter('$Date: 2011/08/03 00:45:44 $ - $Revision: 1.2 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -14,14 +14,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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *	    \file       htdocs/adherents/stats/index.php
 *      \ingroup    member
 *		\brief      Page of subscription members statistics
- *		\version    $Id: index.php,v 1.10 2011/08/03 00:45:45 eldy Exp $
+ *		\version    $Id$
 */

 require("../../main.inc.php");
@@ -227,5 +228,5 @@ dol_fiche_end();

 $db->close();

-llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.10 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -20,7 +20,7 @@
 /**
 *   \file       htdocs/admin/boxes.php
 *   \brief      Page to setup boxes
- *   \version    $Id: boxes.php,v 1.73 2011/08/01 13:26:22 hregis Exp $
+ *   \version    $Id: boxes.php,v 1.72 2011/07/31 22:23:22 eldy Exp $
 */

 require("../main.inc.php");
@@ -278,7 +278,7 @@ if ($resql)
 		{
 			$boxname = $regs[1];
 			$module = $regs[2];
-			$sourcefile = "/".$module."/includes/boxes/".$boxname.".php";
+			$sourcefile = "/".$module."/inc/boxes/".$boxname.".php";
 		}
 		else
 		{
@@ -394,7 +394,7 @@ if ($resql)
 		{
 			$boxname = $regs[1];
 			$module = $regs[2];
-			$sourcefile = "/".$module."/includes/boxes/".$boxname.".php";
+			$sourcefile = "/".$module."/inc/boxes/".$boxname.".php";
 		}
 		else
 		{
@@ -470,5 +470,5 @@ print '</table>';

 $db->close();

-llxFooter('$Date: 2011/08/01 13:26:22 $ - $Revision: 1.73 $');
+llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.72 $');
 ?>
--- a/htdocs/admin/system/index.php
+++ b/htdocs/admin/system/index.php
@@ -14,13 +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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *  \file       htdocs/admin/system/index.php
 *  \brief      Home page of system information
- *  \version    $Id: index.php,v 1.49 2011/07/31 22:23:14 eldy Exp $
+ *  \version    $Id: index.php,v 1.48 2011/07/27 23:50:52 eldy Exp $
 */

 require("../../main.inc.php");
@@ -126,5 +127,5 @@ print '<br>';
 print info_admin($langs->trans("SystemInfoDesc")).'<br>';


-llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.49 $');
+llxFooter('$Date: 2011/07/27 23:50:52 $ - $Revision: 1.48 $');
 ?>
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -12,14 +12,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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *		\file 		htdocs/admin/tools/dolibarr_export.php
 *		\ingroup	core
 *		\brief      Page to export database
- *		\version    $Id: dolibarr_export.php,v 1.40 2011/08/03 00:45:43 eldy Exp $
+ *		\version    $Id$
 */

 require("../../main.inc.php");
@@ -331,5 +332,5 @@ $result=$formfile->show_documents('systemtools','backup',$conf->admin->dir_outpu

 $db->close();

-llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.40 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/tools/dolibarr_import.php
+++ b/htdocs/admin/tools/dolibarr_import.php
@@ -12,14 +12,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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *		\file 		htdocs/admin/tools/dolibarr_import.php
 *		\ingroup	core
 * 		\brief      Page to import database
- *		\version    $Id: dolibarr_import.php,v 1.24 2011/08/03 00:45:43 eldy Exp $
+ *		\version    $Id$
 */

 require("../../main.inc.php");
@@ -184,5 +185,5 @@ else if ($db->label == 'PostgreSQL')

 $db->close();

-llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.24 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/tools/eaccelerator.php
+++ b/htdocs/admin/tools/eaccelerator.php
@@ -12,13 +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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *     \file       htdocs/admin/tools/eaccelerator.php
 *     \brief      Page administration de eaccelerator
- *     \version    $Id: eaccelerator.php,v 1.18 2011/08/03 00:45:43 eldy Exp $
+ *     \version    $Id$
 */

 require("../../main.inc.php");
@@ -39,7 +40,7 @@ llxHeader();
 if (!function_exists('eaccelerator_info'))
 {
 	print 'eAccelerator is not installed.';
-	llxfooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.18 $');
+	llxfooter('$Date$ - $Revision$');
 	exit;
 }

@@ -338,5 +339,5 @@ print '<strong>Eaccelerator is created by the eAccelerator team, <a href="http:/
 print "</td></tr></table>";


-llxfooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.18 $');
+llxfooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -12,13 +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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *		\file 		htdocs/admin/tools/export.php
 *		\brief      Page to export a database into a dump file
- *		\version    $Id: export.php,v 1.45 2011/08/03 00:45:43 eldy Exp $
+ *		\version    $Id$
 */

 require("../../main.inc.php");
@@ -316,5 +317,5 @@ print '<br>';

 $time_end = time();

-llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.45 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/tools/index.php
+++ b/htdocs/admin/tools/index.php
@@ -13,13 +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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *    	\file       htdocs/admin/tools/index.php
 * 		\brief      Page d'accueil de l'espace outils admin
- *		\version    $Id: index.php,v 1.7 2011/08/03 00:45:43 eldy Exp $
+ *		\version    $Id$
 */

 require("../../main.inc.php");
@@ -56,5 +57,5 @@ print info_admin($langs->trans("SystemAreaForAdminOnly")).'<br>';

 $db->close();

-llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.7 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -13,14 +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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *		\file       htdocs/admin/tools/listevents.php
 *      \ingroup    core
 *      \brief      List of security events
- *      \version    $Id: listevents.php,v 1.32 2011/08/03 00:45:43 eldy Exp $
+ *      \version    $Id: listevents.php,v 1.31 2011/07/18 23:28:30 eldy Exp $
 */

 require("../../main.inc.php");
@@ -255,5 +256,5 @@ else

 $db->close();

-llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.32 $');
+llxFooter('$Date: 2011/07/18 23:28:30 $ - $Revision: 1.31 $');
 ?>
--- a/htdocs/admin/tools/listsessions.php
+++ b/htdocs/admin/tools/listsessions.php
@@ -13,14 +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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *		\file       htdocs/admin/tools/listsessions.php
 *      \ingroup    core
 *      \brief      List of PHP sessions
- *      \version    $Id: listsessions.php,v 1.12 2011/08/03 00:45:43 eldy Exp $
+ *      \version    $Id$
 */

 require("../../main.inc.php");
@@ -210,5 +211,5 @@ print '<br>';

 $db->close();

-llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.12 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/tools/purge.php
+++ b/htdocs/admin/tools/purge.php
@@ -12,13 +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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *		\file 		htdocs/admin/tools/purge.php
 *		\brief      Page to purge files (temporary or not)
- *		\version    $Id: purge.php,v 1.19 2011/08/03 00:45:43 eldy Exp $
+ *		\version    $Id$
 */

 require("../../main.inc.php");
@@ -171,5 +172,5 @@ if (preg_match('/^confirm/i',$_REQUEST["choice"]))
 }


-llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.19 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@@ -13,13 +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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *		\file 		htdocs/admin/tools/update.php
 *		\brief      Page to make a Dolibarr online upgrade
- *		\version    $Id: update.php,v 1.17 2011/08/03 00:45:43 eldy Exp $
+ *		\version    $Id$
 */

 require("../../main.inc.php");
@@ -143,5 +144,5 @@ print $langs->trans("SetupIsReadyForUse").'<br>';

 print '</form>';

-llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.17 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/asterisk/cidlookup.php
+++ b/htdocs/asterisk/cidlookup.php
@@ -12,7 +12,8 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
--- a/htdocs/asterisk/wrapper.php
+++ b/htdocs/asterisk/wrapper.php
@@ -12,13 +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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *	\file       htdocs/asterisk/wrapper.php
 *  \brief      File that is entry point to call an Asterisk server
- *  \version    $Id: wrapper.php,v 1.9 2011/08/03 00:45:45 eldy Exp $
+ *  \version    $Id$
 *	\remarks	To be used, an Asterisk user must be created by adding this
 * 				in /etc/asterisk/manager.conf
 * 				[dolibarr]
--- a/htdocs/bookmarks/admin/bookmark.php
+++ b/htdocs/bookmarks/admin/bookmark.php
@@ -13,13 +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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**	    \file       htdocs/bookmarks/admin/bookmark.php
 *		\ingroup    bookmark
 *		\brief      Page to setup bookmark module
- *		\version    $Id: bookmark.php,v 1.3 2011/08/03 00:45:46 eldy Exp $
+ *		\version    $Id$
 */

 require("../../main.inc.php");
@@ -83,5 +84,5 @@ print '</table></form>';

 $db->close();

-llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.3 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -12,14 +12,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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *	\file       htdocs/bookmarks/bookmarks.lib.php
 *	\ingroup	bookmarks
 *	\brief      File with library for bookmark module
- *	\version    $Id: bookmarks.lib.php,v 1.23 2011/08/03 00:45:45 eldy Exp $
+ *	\version    $Id$
 */

 /**
--- a/htdocs/bookmarks/class/bookmark.class.php
+++ b/htdocs/bookmarks/class/bookmark.class.php
@@ -12,14 +12,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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *      \file       htdocs/bookmarks/class/bookmark.class.php
 *      \ingroup    bookmark
 *      \brief      File of class to manage bookmarks
- *      \version    $Id: bookmark.class.php,v 1.7 2011/08/03 00:45:47 eldy Exp $
+ *      \version    $Id$
 */


--- a/htdocs/bookmarks/fiche.php
+++ b/htdocs/bookmarks/fiche.php
@@ -13,14 +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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *       \file       htdocs/bookmarks/fiche.php
 *       \brief      Page display/creation of bookmarks
 *       \ingroup    bookmark
- *       \version    $Id: fiche.php,v 1.27 2011/08/03 00:45:45 eldy Exp $
+ *       \version    $Id$
 */


@@ -284,5 +285,5 @@ if ($_GET["id"] > 0 && ! preg_match('/^add/i',$_GET["action"]))
 $db->close();


-llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.27 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/bookmarks/liste.php
+++ b/htdocs/bookmarks/liste.php
@@ -12,14 +12,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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *       \file       htdocs/bookmarks/liste.php
 *       \brief      Page to display list of bookmarks
 *       \ingroup    bookmark
- *       \version    $Id: liste.php,v 1.25 2011/08/03 00:45:45 eldy Exp $
+ *       \version    $Id$
 */

 require("../main.inc.php");
@@ -206,5 +207,5 @@ print '</div>';

 $db->close();

-llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.25 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/boutique/admin/boutique.php
+++ b/htdocs/boutique/admin/boutique.php
@@ -15,16 +15,17 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 *
- * $Id: boutique.php,v 1.2 2011/08/03 00:45:45 eldy Exp $
+ * $Id$
 */

 /**
 *  \file 		htdocs/boutique/admin/boutique.php
 *  \ingroup    boutique
 *  \brief      Page d'administration/configuration du module OsCommerce
- *  \version    $Revision: 1.2 $
+ *  \version    $Revision$
 */

 require("../../main.inc.php");
@@ -213,5 +214,5 @@ print "<br>";

 $db->close();

-llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.2 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/boutique/client/class/boutiqueclient.class.php
+++ b/htdocs/boutique/client/class/boutiqueclient.class.php
@@ -12,9 +12,10 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 *
- * $Id: boutiqueclient.class.php,v 1.2 2011/08/03 00:45:46 eldy Exp $
+ * $Id$
 *
 */

@@ -22,7 +23,7 @@
 *      \file       htdocs/boutique/client/class/boutiqueclient.class.php
 *      \brief      Classe permettant de gerer des clients de la boutique online
 *      \author	    Rodolphe Quiedeville
- *      \version    $Revision: 1.2 $
+ *      \version    $Revision$
 */

 /**
--- a/htdocs/boutique/client/fiche.php
+++ b/htdocs/boutique/client/fiche.php
@@ -14,16 +14,17 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 *
- * $Id: fiche.php,v 1.22 2011/08/03 00:45:42 eldy Exp $
+ * $Id$
 */

 /**
 *	\file       htdocs/boutique/client/fiche.php
 *	\ingroup    boutique
 *	\brief      Page fiche client OSCommerce
- *	\version    $Revision: 1.22 $
+ *	\version    $Revision$
 */

 require("../../main.inc.php");
@@ -128,5 +129,5 @@ else

 $dbosc->close();

-llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.22 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/boutique/client/index.php
+++ b/htdocs/boutique/client/index.php
@@ -13,16 +13,17 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 *
- * $Id: index.php,v 1.17 2011/08/03 00:45:42 eldy Exp $
+ * $Id$
 */

 /**
 	    \file       htdocs/boutique/client/index.php
 		\ingroup    boutique
 		\brief      Page gestion client OSCommerce
-		\version    $Revision: 1.17 $
+		\version    $Revision$
 */

 require("../../main.inc.php");
@@ -90,5 +91,5 @@ else

 $dbosc->close();

-llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.17 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/boutique/commande/ca.php
+++ b/htdocs/boutique/commande/ca.php
@@ -13,16 +13,17 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 *
- * $Id: ca.php,v 1.17 2011/08/03 00:45:43 eldy Exp $
+ * $Id$
 */

 /**
 		\file 		htdocs/boutique/commande/ca.php
 		\ingroup    boutique
 		\brief      Page ca commandes du module OsCommerce
-		\version    $Revision: 1.17 $
+		\version    $Revision$
 */

 require("../../main.inc.php");
@@ -114,5 +115,5 @@ print "</table>";

 $dbosc->close();

-llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.17 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/boutique/commande/class/boutiquecommande.class.php
+++ b/htdocs/boutique/commande/class/boutiquecommande.class.php
@@ -13,14 +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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *	\file       htdocs/boutique/commande/class/boutiquecommande.class.php
 *	\ingroup    osc
 *	\brief      Fichier de la classe des commandes de la boutique online
- *	\version    $Id: boutiquecommande.class.php,v 1.7 2011/08/03 00:45:46 eldy Exp $
+ *	\version    $Id$
 */

 require_once(DOL_DOCUMENT_ROOT ."/societe/class/address.class.php");
--- a/htdocs/boutique/commande/fiche.php
+++ b/htdocs/boutique/commande/fiche.php
@@ -14,16 +14,17 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 *
- * $Id: fiche.php,v 1.24 2011/08/03 00:45:44 eldy Exp $
+ * $Id$
 */

 /**
 \file       htdocs/boutique/commande/fiche.php
 \ingroup    boutique
 \brief      Page fiche commande OSCommerce
- \version    $Revision: 1.24 $
+ \version    $Revision$
 */

 require("../../main.inc.php");
@@ -154,5 +155,5 @@ print '</table><br>';

 $dbosc->close();

-llxFooter("<em>Derni&egrave;re modification $Date: 2011/08/03 00:45:44 $ r&eacute;vision $Revision: 1.24 $</em>");
+llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
 ?>
--- a/htdocs/boutique/commande/index.php
+++ b/htdocs/boutique/commande/index.php
@@ -13,16 +13,17 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 *
- * $Id: index.php,v 1.23 2011/08/03 00:45:43 eldy Exp $
+ * $Id$
 */

 /**
 	    \file       htdocs/boutique/commande/index.php
 		\ingroup    boutique
 		\brief      Page gestion commandes OSCommerce
-		\version    $Revision: 1.23 $
+		\version    $Revision$
 */

 require("../../main.inc.php");
@@ -91,5 +92,5 @@ else

 $dbosc->close();

-llxFooter("<em>Derni&egrave;re modification $Date: 2011/08/03 00:45:43 $ r&eacute;vision $Revision: 1.23 $</em>");
+llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
 ?>
--- a/htdocs/boutique/critiques/bestproduct.php
+++ b/htdocs/boutique/critiques/bestproduct.php
@@ -14,17 +14,18 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 *
- * $Id: bestproduct.php,v 1.10 2011/08/03 00:45:46 eldy Exp $
- * $Source: /cvsroot/dolibarr/dolibarr/htdocs/boutique/critiques/bestproduct.php,v $
+ * $Id$
+ * $Source$
 */

 /**
 	    \file       htdocs/boutique/critiques/bestproduct.php
 		\ingroup    boutique
 		\brief      Page affichage meilleures critiques OS Commerce
-		\version    $Revision: 1.10 $
+		\version    $Revision$
 */

 require("../../main.inc.php");
@@ -98,5 +99,5 @@ print "</TABLE>";

 $dbosc->close();

-llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.10 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/boutique/critiques/class/critique.class.php
+++ b/htdocs/boutique/critiques/class/critique.class.php
@@ -12,14 +12,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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *		\file       htdocs/boutique/critiques/class/critique.class.php
 *		\ingroup    osc
 *		\brief      Fichier de la classe des critiques OSCommerce
- *		\version    $Id: critique.class.php,v 1.4 2011/08/03 00:45:42 eldy Exp $
+ *		\version    $Id$
 */


--- a/htdocs/boutique/critiques/fiche.php
+++ b/htdocs/boutique/critiques/fiche.php
@@ -13,16 +13,17 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 *
- * $Id: fiche.php,v 1.5 2011/08/03 00:45:46 eldy Exp $
+ * $Id$
 */

 /**
 	    \file       htdocs/boutique/critiques/fiche.php
 		\ingroup    boutique
 		\brief      Page fiche critique OS Commerce
-		\version    $Revision: 1.5 $
+		\version    $Revision$
 */

 require("../../main.inc.php");
@@ -80,6 +81,6 @@ print '</table><br>';

 $dbosc->close();

-llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.5 $');
+llxFooter('$Date$ - $Revision$');

 ?>
--- a/htdocs/boutique/critiques/index.php
+++ b/htdocs/boutique/critiques/index.php
@@ -13,16 +13,17 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 *
- * $Id: index.php,v 1.10 2011/08/03 00:45:46 eldy Exp $
+ * $Id$
 */

 /**
 	    \file       htdocs/boutique/critiques/index.php
 		\ingroup    boutique
 		\brief      Page gestion critiques OSCommerce
-		\version    $Revision: 1.10 $
+		\version    $Revision$
 */

 require("../../main.inc.php");
@@ -91,5 +92,5 @@ print "</TABLE>";

 $dbosc->close();

-llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.10 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/boutique/index.php
+++ b/htdocs/boutique/index.php
@@ -13,14 +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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
- *	\file       htdocs/boutique/index.php
- *	\ingroup    boutique
- *	\brief      Page accueil zone boutique
- *	\version    $Id: index.php,v 1.17 2011/08/03 01:17:17 eldy Exp $
+ \file       htdocs/boutique/index.php
+ \ingroup    boutique
+ \brief      Page accueil zone boutique
+ \version    $Id$
 */

 require("../main.inc.php");
@@ -238,5 +239,5 @@ print '</tr></table>';

 $dbosc->close();

-llxFooter('$Date: 2011/08/03 01:17:17 $ - $Revision: 1.17 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/boutique/notification/fiche.php
+++ b/htdocs/boutique/notification/fiche.php
@@ -13,14 +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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 	    \file       htdocs/boutique/notification/fiche.php
 		\ingroup    boutique
 		\brief      Page fiche notification OS Commerce
-		\version    $Id: fiche.php,v 1.17 2011/08/03 00:45:42 eldy Exp $
+		\version    $Id$
 */

 require("../../main.inc.php");
@@ -149,5 +150,5 @@ print '</div>';

 $dbosc->close();

-llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.17 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/boutique/notification/index.php
+++ b/htdocs/boutique/notification/index.php
@@ -14,16 +14,17 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 *
- * $Id: index.php,v 1.19 2011/08/03 00:45:42 eldy Exp $
+ * $Id$
 */

 /**
 	    \file       htdocs/boutique/notification/index.php
 		\ingroup    boutique
 		\brief      Page gestion notification OS Commerce
-		\version    $Revision: 1.19 $
+		\version    $Revision$
 */

 require("../../main.inc.php");
@@ -88,5 +89,5 @@ else

 $dbosc->close();

-llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.19 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/boutique/notification/produits.php
+++ b/htdocs/boutique/notification/produits.php
@@ -14,16 +14,17 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 *
- * $Id: produits.php,v 1.16 2011/08/03 00:45:42 eldy Exp $
+ * $Id$
 */

 /**
 	    \file       htdocs/boutique/notification/produits.php
 		\ingroup    boutique
 		\brief      Page fiche notification produits OS Commerce
-		\version    $Revision: 1.16 $
+		\version    $Revision$
 */

 require("../../main.inc.php");
@@ -94,5 +95,5 @@ else

 $dbosc->close();

-llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.16 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/boutique/osc_master.inc.php
+++ b/htdocs/boutique/osc_master.inc.php
@@ -12,14 +12,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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
- *       \file       htdocs/boutique/osc_master.inc.php
- *       \brief      Fichier de preparation de l'environnement Dolibarr pour OSCommerce
- *       \version    $Id: osc_master.inc.php,v 1.6 2011/08/03 01:17:17 eldy Exp $
- */
+        \file       htdocs/boutique/osc_master.inc.php
+        \brief      Fichier de preparation de l'environnement Dolibarr pour OSCommerce
+        \version    $Id$
+*/

 require_once(DOL_DOCUMENT_ROOT ."/lib/databases/".$conf->db->type.".lib.php");

--- a/htdocs/boutique/produits/index.php
+++ b/htdocs/boutique/produits/index.php
@@ -13,16 +13,17 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 *
- * $Id: index.php,v 1.8 2011/08/03 00:45:45 eldy Exp $
+ * $Id$
 */

 /**
 		\file 		htdocs/boutique/produits/index.php
 		\ingroup    boutique
 		\brief      Page gestion produits du module OsCommerce
-		\version    $Revision: 1.8 $
+		\version    $Revision$
 */

 require("../../main.inc.php");
@@ -87,5 +88,5 @@ else

 $dbosc->close();

-llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.8 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/boutique/produits/osc-liste.php
+++ b/htdocs/boutique/produits/osc-liste.php
@@ -13,16 +13,17 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 *
- * $Id: osc-liste.php,v 1.10 2011/08/03 00:45:45 eldy Exp $
+ * $Id$
 */

 /**
 		\file 		htdocs/boutique/produits/osc-liste.php
 		\ingroup    boutique
 		\brief      Page gestion produits du module OsCommerce
-		\version    $Revision: 1.10 $
+		\version    $Revision$
 */

 require("../../main.inc.php");
@@ -105,5 +106,5 @@ print "</TABLE>";

 $dbosc->close();

-llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.10 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/boutique/promotion/class/promotion.class.php
+++ b/htdocs/boutique/promotion/class/promotion.class.php
@@ -12,9 +12,10 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 *
- * $Id: promotion.class.php,v 1.3 2011/08/03 00:45:46 eldy Exp $
+ * $Id$
 */

 class Promotion {
--- a/htdocs/boutique/promotion/index.php
+++ b/htdocs/boutique/promotion/index.php
@@ -13,14 +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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 	    \file       htdocs/boutique/promotion/index.php
 		\ingroup    boutique
 		\brief      Page gestion promotions OSCommerce
-		\version    $Id: index.php,v 1.14 2011/08/03 00:45:42 eldy Exp $
+		\version    $Id$
 */

 require("../../main.inc.php");
@@ -116,6 +117,6 @@ else
 }
 $dbosc->close();

-llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.14 $');
+llxFooter('$Date$ - $Revision$');

 ?>
--- a/htdocs/boutique/sql/emulate_oscommerce/llx_osc_categories.sql
+++ b/htdocs/boutique/sql/emulate_oscommerce/llx_osc_categories.sql
@@ -12,9 +12,10 @@
 -- GNU General Public License for more details.
 --
 -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+-- 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_osc_categories.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $
+-- $Id$
 -- ===================================================================

 CREATE TABLE llx_osc_categories (
--- a/htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.key.sql
+++ b/htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.key.sql
@@ -12,9 +12,10 @@
 -- GNU General Public License for more details.
 --
 -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+-- 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_osc_customer.key.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $
+-- $Id$
 -- ===================================================================


--- a/htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.sql
+++ b/htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.sql
@@ -12,9 +12,10 @@
 -- GNU General Public License for more details.
 --
 -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+-- 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_osc_customer.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $
+-- $Id$
 -- ===================================================================

 CREATE TABLE llx_osc_customer (
--- a/htdocs/boutique/sql/emulate_oscommerce/llx_osc_order.sql
+++ b/htdocs/boutique/sql/emulate_oscommerce/llx_osc_order.sql
@@ -12,9 +12,10 @@
 -- GNU General Public License for more details.
 --
 -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+-- 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_osc_order.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $
+-- $Id$
 -- ===================================================================

 CREATE TABLE llx_osc_order (
--- a/htdocs/boutique/sql/emulate_oscommerce/llx_osc_product.sql
+++ b/htdocs/boutique/sql/emulate_oscommerce/llx_osc_product.sql
@@ -12,9 +12,10 @@
 -- GNU General Public License for more details.
 --
 -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+-- 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_osc_product.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $
+-- $Id$
 -- ===================================================================

 CREATE TABLE llx_osc_product (
--- a/htdocs/boxes.php
+++ b/htdocs/boxes.php
@@ -22,7 +22,7 @@
 *	\brief      File of class to manage widget boxes
 *	\author     Rodolphe Qiedeville
 *	\author	    Laurent Destailleur
- *	\version    $Id: boxes.php,v 1.55 2011/08/01 13:26:21 hregis Exp $
+ *	\version    $Id: boxes.php,v 1.54 2011/07/31 23:19:04 eldy Exp $
 */


@@ -220,7 +220,7 @@ class InfoBox
 					{
 						$boxname = $regs[1];
 						$module = $regs[2];
-						$sourcefile = dol_buildpath("/".$module."/includes/boxes/".$boxname.".php");
+						$sourcefile = dol_buildpath("/".$module."/inc/boxes/".$boxname.".php");
 					}
 					else
 					{
@@ -281,7 +281,7 @@ class InfoBox
 					{
 						$boxname = $regs[1];
 						$module = $regs[2];
-						$sourcefile = "/".$module."/includes/boxes/".$boxname.".php";
+						$sourcefile = "/".$module."/inc/boxes/".$boxname.".php";
 					}
 					else
 					{
--- a/htdocs/cashdesk/admin/cashdesk.php
+++ b/htdocs/cashdesk/admin/cashdesk.php
@@ -12,14 +12,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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *	\file       htdocs/cashdesk/admin/cashdesk.php
 *	\ingroup    cashdesk
 *	\brief      Setup page for cashdesk module
- *	\version    $Id: cashdesk.php,v 1.7 2011/08/03 00:46:38 eldy Exp $
+ *	\version    $Id$
 */

 require("../../main.inc.php");
@@ -128,5 +129,5 @@ print '<center><input type="submit" class="button" value="'.$langs->trans("Save"

 print "</form>\n";

-llxFooter('$Date: 2011/08/03 00:46:38 $ - $Revision: 1.7 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/cashdesk/class/Auth.class.php
+++ b/htdocs/cashdesk/class/Auth.class.php
@@ -13,7 +13,8 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */


--- a/htdocs/cashdesk/class/Facturation.class.php
+++ b/htdocs/cashdesk/class/Facturation.class.php
@@ -14,7 +14,8 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
--- a/htdocs/cashdesk/include/environnement.php
+++ b/htdocs/cashdesk/include/environnement.php
@@ -13,7 +13,8 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 // This file initializes more variables to already initialized variables with main.inc.php
--- a/htdocs/cashdesk/include/fonctions.php
+++ b/htdocs/cashdesk/include/fonctions.php
@@ -12,7 +12,8 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 	// Cr<43>ation al<61>atoire de chaines de caract<63>res de longueur $taille pass<73>e en argument
--- a/htdocs/cashdesk/javascript/facturation1.js
+++ b/htdocs/cashdesk/javascript/facturation1.js
@@ -12,7 +12,8 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 // Calcul et affichage en temps reel des informations sur le produit en cours
--- a/htdocs/cashdesk/tpl/facturation1.tpl.php
+++ b/htdocs/cashdesk/tpl/facturation1.tpl.php
@@ -19,9 +19,10 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.

 You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-$Id: facturation1.tpl.php,v 1.15 2011/08/03 01:13:30 eldy Exp $
+$Id$
 -->
 <script type="text/javascript" src="javascript/facturation1.js"></script>
 <script type="text/javascript" src="javascript/dhtml.js"></script>
--- a/htdocs/cashdesk/tpl/liste_articles.tpl.php
+++ b/htdocs/cashdesk/tpl/liste_articles.tpl.php
@@ -23,7 +23,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.

 You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 -->
 <div class="liste_articles_haut">
 <div class="liste_articles_bas">
--- a/htdocs/cashdesk/tpl/menu.tpl.php
+++ b/htdocs/cashdesk/tpl/menu.tpl.php
@@ -15,7 +15,8 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 include_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php');
@@ -62,13 +63,11 @@ $logout='<img class="login" border="0" src="'.DOL_URL_ROOT.'/theme/'.$conf->them

 print '<div class="menu_bloc">';
 print '<ul class="menu">';
-// Link to new sell
 print '<li class="menu_choix1"><a href="affIndex.php?menu=facturation&id=NOUV"><span>'.$langs->trans("NewSell").'</span></a></li>';
-// Open new tab on backoffice (this is not a disconnect from POS)
-print '<li class="menu_choix2"><a href=".." target="backoffice"><span>'.$langs->trans("BackOffice").'</span></a></li>';
-// Disconnect
-print '<li class="menu_choix0">'.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom'];
-print ' <a href="deconnexion.php">'.$logout.'</a><br>';
+
+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("CashDeskBankCB").': '.$bankcbLink.'<br>';
--- a/htdocs/cashdesk/tpl/ticket.tpl.php
+++ b/htdocs/cashdesk/tpl/ticket.tpl.php
@@ -15,7 +15,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.

 You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 -->
 <html>
 <head>
--- a/htdocs/cashdesk/tpl/validation1.tpl.php
+++ b/htdocs/cashdesk/tpl/validation1.tpl.php
@@ -15,7 +15,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.

 You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 -->
 <fieldset class="cadre_facturation"><legend class="titre1"><?php echo $langs->trans("Summary"); ?></legend>

@@ -39,9 +40,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 		?>
 		<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
+		<?php 
 		switch ($obj_facturation->mode_reglement())
-		{
+		{	
 			case 'ESP':
 				echo $langs->trans("Cash");
 				$filtre='courant=2';
@@ -52,7 +53,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 				echo $langs->trans("CreditCard");
 				$filtre='courant=1';
 				if (!empty($conf->global->CASHDESK_ID_BANKACCOUNT_CB))
-					$selected = $conf->global->CASHDESK_ID_BANKACCOUNT_CB;
+					$selected = $conf->global->CASHDESK_ID_BANKACCOUNT_CB;		
 				break;
 			case 'CHQ':
 				echo $langs->trans("Cheque");
@@ -64,16 +65,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 				echo $langs->trans("Reported");
 				$filtre='courant=1 OR courant=2';
 				$selected='';
-				break;
+				break;	
 			default:
 				$filtre='courant=1 OR courant=2';
 				$selected='';
 		}
-
+			
 		?>
 		</td></tr>
-
-		<?php
+		
+		<?php 	
 			// Affichage des infos en fonction du mode de paiement
 			if ( $obj_facturation->mode_reglement() == 'DIF' ) {

@@ -99,10 +100,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 	<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
+			<?php	
 				echo $langs->trans("BankToPay"). "<br>";
 				$html = new Form($db);
-				$html->select_comptes($selected,'cashdeskbank',0,$filtre);
+				$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>
--- a/htdocs/cashdesk/tpl/validation2.tpl.php
+++ b/htdocs/cashdesk/tpl/validation2.tpl.php
@@ -14,7 +14,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.

 You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 -->
 <h3 class="titre1"><?php echo $langs->trans("SellFinished"); ?></h3>

--- a/htdocs/categories/categorie.php
+++ b/htdocs/categories/categorie.php
@@ -17,14 +17,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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *  \file       htdocs/categories/categorie.php
 *  \ingroup    category
 *  \brief      Page to show category tab
- *  \version    $Id: categorie.php,v 1.65 2011/08/03 00:46:32 eldy Exp $
+ *  \version    $Id$
 */

 require("../main.inc.php");
@@ -534,5 +535,5 @@ function formCategory($db,$object,$typeid)

 $db->close();

-llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.65 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -17,14 +17,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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *	\file       htdocs/categories/class/categorie.class.php
 *	\ingroup    categorie
 *	\brief      File of class to manage categories
- *	\version	$Id: categorie.class.php,v 1.18 2011/08/03 00:46:39 eldy Exp $
+ *	\version	$Id: categorie.class.php,v 1.17 2011/07/04 09:54:02 eldy Exp $
 */

 require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
--- a/htdocs/categories/docreate.php
+++ b/htdocs/categories/docreate.php
@@ -13,16 +13,17 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 *
- * $Id: docreate.php,v 1.9 2011/08/03 00:46:32 eldy Exp $
+ * $Id$
 */

 /**
 * 		\file       htdocs/categories/docreate.php
 * 		\ingroup    category
 * 		\brief      Page de creation categorie
- * 		\version    $Revision: 1.9 $
+ * 		\version    $Revision$
 */

 require("../main.inc.php");
--- a/htdocs/categories/domodif.php
+++ b/htdocs/categories/domodif.php
@@ -12,14 +12,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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 		\file       htdocs/categories/domodif.php
 		\ingroup    category
 		\brief      Page de modification categorie
-		\version    $Revision: 1.6 $
+		\version    $Revision$
 */

 require("../main.inc.php");
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -15,14 +15,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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *      \file       htdocs/categories/edit.php
 *      \ingroup    category
 *      \brief      Page d'edition de categorie produit
- *      \version    $Id: edit.php,v 1.39 2011/08/03 00:46:31 eldy Exp $
+ *      \version    $Id$
 */

 require("../main.inc.php");
@@ -151,5 +152,5 @@ print '</td></tr></table>';

 $db->close();

-llxFooter('$Date: 2011/08/03 00:46:31 $ - $Revision: 1.39 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/categories/fiche.php
+++ b/htdocs/categories/fiche.php
@@ -15,14 +15,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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *		\file       htdocs/categories/fiche.php
 *		\ingroup    category
 *		\brief      Page to create a new category
- *		\version	$Id: fiche.php,v 1.85 2011/08/03 00:46:32 eldy Exp $
+ *		\version	$Id: fiche.php,v 1.84 2011/07/04 09:54:02 eldy Exp $
 */

 require("../main.inc.php");
@@ -234,5 +235,5 @@ if ($user->rights->categorie->creer)

 $db->close();

-llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.85 $');
+llxFooter('$Date: 2011/07/04 09:54:02 $ - $Revision: 1.84 $');
 ?>
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -16,14 +16,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, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *      \file       htdocs/categories/index.php
 *      \ingroup    category
 *      \brief      Home page of category area
- *	 	\version	$Id: index.php,v 1.55 2011/08/03 00:46:32 eldy Exp $
+ *	 	\version	$Id: index.php,v 1.54 2011/07/20 19:03:34 eldy Exp $
 */

 require("../main.inc.php");
@@ -312,5 +313,5 @@ print "</table>";

 $db->close();

-llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.55 $');
+llxFooter('$Date: 2011/07/20 19:03:34 $ - $Revision: 1.54 $');
 ?>
--- a/Show More
+++ b/Show More