Fix: Avoid errors into rpm packages

2011-08-03 00:45:22 +00:00
parent 2fc9021da1
commit 6a745c245c
210 changed files with 970 additions and 881 deletions
--- a/build/deb/README
+++ b/build/deb/README
@@ -22,12 +22,13 @@ 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 package
+# dpkg -b                                To build binary only 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
--- 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
    
- -- Laurent Destailleur <eldy@users.sourceforge.net>  Mon, 30 Jul 2011 12:00:00 +0100     
+ -- Dolibarr team <contact@dolibarr.org>  Mon, 30 Jul 2011 12:00:00 +0100     

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

 # Rotate old configuration
-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
-
+#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


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


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

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

 Package: dolibarr
-Depends: ${misc:Depends}, xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl
+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
 Architecture: all
 Section: web
 Priority: optional
--- a/build/deb/control.debianbin
+++ b/build/deb/control.debianbin
--- a/build/deb/copyright
+++ b/build/deb/copyright
@@ -44,7 +44,9 @@ 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
@@ -64,6 +66,9 @@ 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.lintian-overrides
+++ b/build/deb/dolibarr.lintian-overrides
@@ -0,0 +1,9 @@
+# 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,4 +1,5 @@
 etc/dolibarr/apache.conf
+etc/dolibarr/lighttpd.conf
 usr/share/applications/dolibarr.desktop
 usr/share/doc/dolibarr
 usr/share/dolibarr
--- a/build/deb/lighttpd.conf
+++ b/build/deb/lighttpd.conf
@@ -0,0 +1,22 @@
+# 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-07-27 19:49+0200\n"
+"POT-Creation-Date: 2011-08-01 18:17+0200\n"
 "PO-Revision-Date: 2011-07-29 22:45+0100\n"
 "Last-Translator: Laurent Destailleur <eldy@users.sourceforge.net>\n"
 "Language-Team: Laurent Destailleur <eldy@users.sourceforge.net>\n"
@@ -25,10 +25,26 @@ 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:1001
+#: ../templates:2001
 #, fuzzy
 msgid "Delete database and uploaded files ?"
 msgstr "Effacer la base de donnée et les fichiers uploadés ?"
@@ -36,7 +52,7 @@ msgstr "Effacer la base de donnée et les fichiers uploadés ?"
 #
 #. Type: boolean
 #. Description
-#: ../templates:1001
+#: ../templates:2001
 #, 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-07-27 19:52+0200\n"
+"POT-Creation-Date: 2011-08-01 18:17+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,15 +17,29 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"

-#. Type: boolean
+#. 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
 msgid "Delete database and uploaded files ?"
 msgstr ""

 #. Type: boolean
 #. Description
-#: ../templates:1001
+#: ../templates:2001
 msgid ""
 "Answer if you want to removed the Dolibarr MySQL database and all other "
 "datas (datas related to this question are the Dolibarr DBMS account, all "
--- a/build/deb/postinst
+++ b/build/deb/postinst
@@ -1,7 +1,5 @@
 #!/bin/sh
 # postinst script for dolibarr
-#
-# see: dh_installdeb(1)

 set -e

@@ -16,6 +14,31 @@ 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
@@ -27,8 +50,6 @@ echo Run the dolibarr postinst script
 # Define vars
 docdir='/var/lib/dolibarr/documents'
 #docdir='/usr/share/dolibarr/documents'
-apachefileorig="/usr/share/dolibarr/build/deb/apache.conf"
-apacheconfig="/etc/dolibarr/apache.conf"
 installfileorig="/usr/share/dolibarr/build/deb/install.forced.php.install"
 installconfig="/etc/dolibarr/install.forced.php"
 #config="/usr/share/dolibarr/htdocs/conf/conf.php"
@@ -44,10 +65,6 @@ case "$1" in
        chmod -R 775 $docdir
        chmod -R g+s $docdir

-		# Copy apache.conf file into target directory
-		#mkdir -p /etc/dolibarr
-		#cp -p $apachefileorig $apacheconfig
-
 		# Copy install config file (with matching Debian) values into target directory
 		superuserlogin=''
 		superuserpassword=''
@@ -74,21 +91,15 @@ case "$1" in
 	    	chmod -R 660 $config
 		fi

-		# Get the web server type (use db_get for interactive mode).
-		#db_reset "dolibarr/webserver"
-		#db_get "dolibarr/webserver"		# Read value for webserver.
-		#webserver="$RET"
 	
-		case $webserver in
-			Apache)		webservers="apache2" ;;
-			Apache-SSL)	webservers="apache2-ssl" ;;
-			Both)		webservers="apache2 apache2-ssl" ;;
-			*)		    webservers="apache2 apache2-ssl" ;;
-		esac
+		db_get dolibarr/reconfigure-webserver
+	
+		webservers="$RET"
 	
 		# Set up web server.
-		for server in $webservers ; do
-			echo Complete config of server $server
+		for webserver in $webservers ; do
+			webserver=${webserver%,}
+			echo Complete config of server $webserver
 			
 			# Detect webuser and webgroup
 			webuser=
@@ -106,27 +117,32 @@ case "$1" in
 			# Set permissions to web server
 			chown -R $webuser:$webgroup /usr/share/dolibarr
            chown -R root:$webgroup $config
-
-			# 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 servers
-		servers="apache2-ssl apache2 mysql"
-		# Another way to restart
-		for server in $servers ; do
+		# 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 $server reload || true
+	                invoke-rc.d $webserver reload 3>/dev/null || true
 	            else
 	                echo Restart web server $server using $server reload
-    	    	/etc/init.d/$server reload || true
+	                /etc/init.d/$webserver reload 3>/dev/null || true
+	            fi
 	        fi
 		done

+		
 		echo ----------
 		echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr."
 		echo ----------
@@ -136,13 +152,13 @@ case "$1" in
 	;;

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

-db_stop
-
 #DEBHELPER#

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


-. /usr/share/debconf/confmodule
+
+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

 db_version 2.0

@@ -26,63 +55,62 @@ echo Run the dolibarr postrm script

 docdir='/var/lib/dolibarr/documents'
 #docdir='/usr/share/dolibarr/documents'
-apachefileorig="/usr/share/dolibarr/build/deb/apache.conf"
-apacheconfig="/etc/dolibarr/apache.conf"
 #config="/usr/share/dolibarr/htdocs/conf/conf.php"
 config="/etc/dolibarr/conf.php"
 lockfile="/usr/share/dolibarr/install.lock"


-export webserver=""
-# Allows us to loop and substitute in one pass
-case $webserver in
-	Apache)		webservers="apache2" ;;
-	Apache-SSL)	webservers="apache2-ssl" ;;
-	Both)		webservers="apache2 apache2-ssl" ;;
-	*)		    webservers="apache2 apache2-ssl" ;;
-esac
-

 case "$1" in

    # Call when we upgrade
 	upgrade)
+		echo "postrm upgrade"
 	;;

    # Call when we uninstall
 	remove)
+		echo "postrm remove"
 		rm -f $lockfile

-		# Remove include files
-		export restart=""
-		for server in $webservers ; do
-			export conffile="/etc/$server/conf.d/dolibarr.conf"
-            if [ -f $conffile ] ;
-            then
-               echo Delete link $conffile
-	           rm -f $conffile
-	           status=purge
-		    fi
+		# Reconfigure web server
+		db_get dolibarr/reconfigure-webserver

-			if [ "x$status" = "xpurge" ] ;
-				then restart="$restart $server"
+		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 webservers=$webservers apacheconfig=$apacheconfig"
+		echo "postrm purge"

 		# 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
@@ -185,41 +213,12 @@ 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
-		
 		# We clean variable (we ignore errors because db_reset can fails if var was never set)
        set +e
-		db_reset "dolibarr/postrm"
+		db_reset dolibarr/reconfigure-webserver
+		db_reset dolibarr/postrm
        set -e

 		#db_purge
@@ -229,7 +228,7 @@ case "$1" in
 	;;

 	*)
-		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,3 +1,10 @@
+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.128 2011/07/31 22:08:13 eldy Exp $
+# \version      $Id: makepack-dolibarr.pl,v 1.129 2011/08/01 18:22:26 eldy Exp $
 # \author       (c)2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
 #----------------------------------------------------------------------------

@@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") {


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


@@ -318,6 +318,9 @@ if ($nboftargetok) {
        $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`;
+        $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`;
 	}
    
    # Build package for each target
@@ -569,6 +572,8 @@ if ($nboftargetok) {
    	
    	if ($target eq 'DEB') 
    	{
+            $olddir=getcwd();
+
            $newbuild = $BUILD;
            $newbuild =~ s/(dev|alpha)/1/gi;                # dev
            $newbuild =~ s/beta/2/gi;                       # beta
@@ -671,19 +676,22 @@ 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 conf files
+			# Apache and lighttpd conf files
    		print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n";
    		$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`;
    		$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf"`;
-
-			# Dolibarr conf files
-			# TODO
+    		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";
@@ -729,17 +737,15 @@ 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`;
            
-     		print "Go to directory $BUILDROOT\n";
-            $olddir=getcwd();
-     		chdir("$BUILDROOT");
- 
             # Creation of binary package (to build without sources)
+     		#print "Go to directory $BUILDROOT\n";
+     		#chdir("$BUILDROOT");
    		#$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb";
    		#print "Launch DEB build ($cmd)\n";
    		#$ret=`$cmd`;
    		#print $ret."\n";

-            # Creation of source package
+            # Prepare source package
            print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n";
            $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`;
            $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`;
@@ -751,6 +757,7 @@ if ($nboftargetok) {
            $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"`;
@@ -766,6 +773,9 @@ if ($nboftargetok) {
            
            $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";
--- 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.66 2011/07/31 22:21:58 eldy Exp $
+ *		\version	$Id: modMyModule.class.php,v 1.67 2011/08/01 13:26:21 hregis 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/inc/triggers/ contains triggers or not
+		// Defined if the directory /mymodule/includes/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,5 +12,3 @@ 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,15 +12,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

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


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

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


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

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

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

 print '<br>';

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



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

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

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

 $db->close();

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

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

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

 $db->close();

-llxFooter('$Date: 2011/07/05 20:39:36 $ - $Revision: 1.2 $');
+llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.3 $');
 ?>
--- a/htdocs/adherents/cartes/carte.php
+++ b/htdocs/adherents/cartes/carte.php
@@ -14,15 +14,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

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

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

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

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

 /**
 *	\file       htdocs/adherents/class/adherent.class.php
 *	\ingroup    member
 *	\brief      File of class to manage members of a foundation
- *	\version    $Id: adherent.class.php,v 1.44 2011/07/03 16:55:31 eldy Exp $
+ *	\version    $Id: adherent.class.php,v 1.45 2011/08/03 00:45:44 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,8 +14,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 /**
@@ -23,7 +22,7 @@
 *	\ingroup    member
 *	\brief      File of class to manage members types
 *	\author     Rodolphe Quiedeville
- *	\version    $Id: adherent_type.class.php,v 1.11 2011/07/05 08:08:16 eldy Exp $
+ *	\version    $Id: adherent_type.class.php,v 1.12 2011/08/03 00:45:44 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,15 +14,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 /**
 *	\file       htdocs/adherents/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.2 2011/07/04 10:30:01 eldy Exp $
+ *	\version    $Id: adherentstats.class.php,v 1.3 2011/08/03 00:45:44 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,15 +13,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

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

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

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

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

 $db->close();

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

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

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

 $db->close();

-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.10 $');
 ?>
--- 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.72 2011/07/31 22:23:22 eldy Exp $
+ *   \version    $Id: boxes.php,v 1.73 2011/08/01 13:26:22 hregis Exp $
 */

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

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.72 $');
+llxFooter('$Date: 2011/08/01 13:26:22 $ - $Revision: 1.73 $');
 ?>
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -3,7 +3,7 @@
 * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
 * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
 * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2010 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2011 Regis Houssin        <regis@dolibarr.fr>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
 /**
 *  \file       htdocs/admin/modules.php
 *  \brief      Page to activate/disable all modules
- *  \version    $Id: modules.php,v 1.156 2011/07/31 22:23:22 eldy Exp $
+ *  \version    $Id: modules.php,v 1.157 2011/08/01 12:25:15 hregis Exp $
 */

 require("../main.inc.php");
@@ -79,12 +79,35 @@ $modules = array();
 $orders = array();
 $categ = array();
 $dirmod = array();
+$modulesdir = array();
 $i = 0;	// is a sequencer of modules found
 $j = 0;	// j is module number. Automatically affected if module number not defined.
-foreach ($conf->file->dol_document_root as $dirroot)
-{
-	$dir = $dirroot . "/includes/modules/";

+foreach ($conf->file->dol_document_root as $type => $dirroot)
+{
+	$modulesdir[] = $dirroot . "/includes/modules/";
+	
+	if ($type == 'alt')
+	{	
+		$althandle=@opendir($dirroot);
+		if (is_resource($althandle))
+		{
+			while (($file = readdir($althandle))!==false)
+			{
+			    if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
+			    {
+			    	if (is_dir($dirroot . '/' . $file . '/includes/modules/'))
+			    	{
+			    		$modulesdir[] = $dirroot . '/' . $file . '/includes/modules/';
+			    	}
+			    }
+			}
+		}
+	}
+}
+
+foreach ($modulesdir as $dir)
+{
 	// Load modules attributes in arrays (name, numero, orders) from dir directory
 	//print $dir."\n<br>";
 	dol_syslog("Scan directory ".$dir." for modules");
@@ -449,5 +472,5 @@ print '</div>';

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.156 $');
+llxFooter('$Date: 2011/08/01 12:25:15 $ - $Revision: 1.157 $');
 ?>
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -21,7 +21,7 @@
 *   	\file       htdocs/admin/perms.php
 *      \ingroup    core
 *		\brief      Page d'administration/configuration des permissions par defaut
- *		\version    $Id: perms.php,v 1.42 2011/07/31 22:23:26 eldy Exp $
+ *		\version    $Id: perms.php,v 1.43 2011/08/01 12:53:37 hregis Exp $
 */

 require("../main.inc.php");
@@ -76,10 +76,34 @@ $db->begin();

 // Charge les modules soumis a permissions
 $modules = array();
-foreach ($conf->file->dol_document_root as $dirroot)
-{
-	$dir = $dirroot . "/includes/modules/";
+$modulesdir = array();

+foreach ($conf->file->dol_document_root as $type => $dirroot)
+{
+	$modulesdir[] = $dirroot . "/includes/modules/";
+	
+	if ($type == 'alt')
+	{	
+		$handle=@opendir($dirroot);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle))!==false)
+			{
+			    if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
+			    {
+			    	if (is_dir($dirroot . '/' . $file . '/includes/modules/'))
+			    	{
+			    		$modulesdir[] = $dirroot . '/' . $file . '/includes/modules/';
+			    	}
+			    }
+			}
+			closedir($handle);
+		}
+	}
+}
+
+foreach ($modulesdir as $dir)
+{
 	// Load modules attributes in arrays (name, numero, orders) from dir directory
 	//print $dir."\n<br>";
 	$handle=@opendir($dir);
@@ -194,5 +218,5 @@ print '</div>';

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:26 $ - $Revision: 1.42 $');
+llxFooter('$Date: 2011/08/01 12:53:37 $ - $Revision: 1.43 $');
 ?>
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -12,15 +12,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

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

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

 $db->close();

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

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

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

 $db->close();

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

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

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

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


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

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

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

 $time_end = time();

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

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

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

 $db->close();

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

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

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

 $db->close();

-llxFooter('$Date: 2011/07/18 23:28:30 $ - $Revision: 1.31 $');
+llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.32 $');
 ?>
--- a/htdocs/admin/tools/listsessions.php
+++ b/htdocs/admin/tools/listsessions.php
@@ -13,15 +13,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

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

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

 $db->close();

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

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

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


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

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

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

 print '</form>';

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

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

 /**
 *	\file       htdocs/asterisk/wrapper.php
 *  \brief      File that is entry point to call an Asterisk server
- *  \version    $Id$
+ *  \version    $Id: wrapper.php,v 1.9 2011/08/03 00:45:45 eldy Exp $
 *	\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,14 +13,13 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

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

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

 $db->close();

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

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

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

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


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

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


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


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

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

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

 $db->close();

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

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

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

 $db->close();

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

@@ -23,7 +22,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$
+ *      \version    $Revision: 1.2 $
 */

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

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

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

 $dbosc->close();

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

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

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

 $dbosc->close();

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

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

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

 $dbosc->close();

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

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

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

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

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

 $dbosc->close();

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

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

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

 $dbosc->close();

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

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

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

 $dbosc->close();

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

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


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

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

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

 $dbosc->close();

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

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

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

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

 $dbosc->close();

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

 /**
 \file       htdocs/boutique/index.php
 \ingroup    boutique
 \brief      Page accueil zone boutique
- \version    $Id$
+ \version    $Id: index.php,v 1.16 2011/08/03 00:45:46 eldy Exp $
 */

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

 $dbosc->close();

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

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

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

 $dbosc->close();

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

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

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

 $dbosc->close();

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

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

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

 $dbosc->close();

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

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

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

 $dbosc->close();

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

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

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

 $dbosc->close();

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

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

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

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

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

 ?>
--- 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.54 2011/07/31 23:19:04 eldy Exp $
+ *	\version    $Id: boxes.php,v 1.55 2011/08/01 13:26:21 hregis Exp $
 */


@@ -220,7 +220,7 @@ class InfoBox
 					{
 						$boxname = $regs[1];
 						$module = $regs[2];
-						$sourcefile = dol_buildpath("/".$module."/inc/boxes/".$boxname.".php");
+						$sourcefile = dol_buildpath("/".$module."/includes/boxes/".$boxname.".php");
 					}
 					else
 					{
@@ -281,7 +281,7 @@ class InfoBox
 					{
 						$boxname = $regs[1];
 						$module = $regs[2];
-						$sourcefile = "/".$module."/inc/boxes/".$boxname.".php";
+						$sourcefile = "/".$module."/includes/boxes/".$boxname.".php";
 					}
 					else
 					{
--- a/htdocs/cashdesk/admin/cashdesk.php
+++ b/htdocs/cashdesk/admin/cashdesk.php
@@ -12,15 +12,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

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

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

 print "</form>\n";

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


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

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

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

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

 include_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php');
@@ -63,11 +62,13 @@ $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>';
-
-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>';
+// 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 $langs->trans("CashDeskThirdParty").': '.$companyLink.'<br>';
 /*print $langs->trans("CashDeskBankCash").': '.$bankcashLink.'<br>';
 print $langs->trans("CashDeskBankCB").': '.$bankcbLink.'<br>';
--- a/htdocs/categories/categorie.php
+++ b/htdocs/categories/categorie.php
@@ -17,15 +17,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

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

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

 $db->close();

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

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

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

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

 require("../main.inc.php");
--- a/htdocs/categories/domodif.php
+++ b/htdocs/categories/domodif.php
@@ -12,15 +12,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

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

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

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

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

 $db->close();

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

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

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

 $db->close();

-llxFooter('$Date: 2011/07/04 09:54:02 $ - $Revision: 1.84 $');
+llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.85 $');
 ?>
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -16,15 +16,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

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

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

 $db->close();

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

 /**
 *    \file       htdocs/categories/liste.php
 *    \ingroup    category
 *    \brief      Page liste des categories
- *    \version	$Id$
+ *    \version	$Id: liste.php,v 1.10 2011/08/03 00:46:32 eldy Exp $
 */

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

 $db->close();

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

 /**
 *       \file       htdocs/categories/photos.php
 *       \ingroup    category
 *       \brief      Gestion des photos d'une categorie
- *       \version    $Id$
+ *       \version    $Id: photos.php,v 1.13 2011/08/03 00:46:32 eldy Exp $
 */

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

 $db->close();

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

 /**
 *       \file       htdocs/categories/viewcat.php
 *       \ingroup    category
 *       \brief      Page to show a category card
- *       \version    $Revision$
+ *       \version    $Revision: 1.53 $
 */

 require("../main.inc.php");
@@ -364,5 +363,5 @@ if ($object->type == 3)

 $db->close();

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

 /**
 *       \file       htdocs/comm/action/class/actioncomm.class.php
 *       \ingroup    commercial
 *       \brief      File of class to manage agenda events (actions)
- *       \version    $Id: actioncomm.class.php,v 1.42 2011/07/04 09:36:29 eldy Exp $
+ *       \version    $Id: actioncomm.class.php,v 1.43 2011/08/03 00:46:20 eldy Exp $
 */
 require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php');
 require_once(DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php');
--- a/htdocs/comm/action/class/cactioncomm.class.php
+++ b/htdocs/comm/action/class/cactioncomm.class.php
@@ -13,15 +13,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 /**
 *       \file       htdocs/comm/action/class/cactioncomm.class.php
 *       \ingroup    commercial
 *       \brief      File of class to manage type of agenda events
- *       \version    $Id$
+ *       \version    $Id: cactioncomm.class.php,v 1.6 2011/08/03 00:46:21 eldy Exp $
 */


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

 /**
 *       \file       htdocs/comm/action/class/ical.class.php
 *       \ingroup    commercial
 *       \brief      File of class to parse ical calendars
- *       \version    $Id$
+ *       \version    $Id: ical.class.php,v 1.6 2011/08/03 00:46:20 eldy Exp $
 */
 class ical
 {
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -15,15 +15,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 /**
 *	    \file       htdocs/comm/action/rapport/index.php
 *      \ingroup    commercial
 *		\brief      Page with reports of actions
- *		\version    $Id$
+ *		\version    $Id: index.php,v 1.48 2011/08/03 00:46:36 eldy Exp $
 */

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

 $db->close();

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

 /**
 *	\file       htdocs/comm/addpropal.php
 *	\ingroup    propal
 *	\brief      Page to add a new commercial proposal
- *	\version    $Id: addpropal.php,v 1.130 2011/07/17 19:08:33 eldy Exp $
+ *	\version    $Id: addpropal.php,v 1.131 2011/08/03 00:46:26 eldy Exp $
 */

 require("../main.inc.php");
@@ -339,5 +338,5 @@ if ($_GET["action"] == 'create')

 $db->close();

-llxFooter('$Date: 2011/07/17 19:08:33 $ - $Revision: 1.130 $');
+llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.131 $');
 ?>
--- a/htdocs/comm/address.php
+++ b/htdocs/comm/address.php
@@ -14,15 +14,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 /**
 *      \file       htdocs/comm/address.php
 *      \ingroup    societe
 *      \brief      Onglet adresses d'un client
- *      \version    $Id$
+ *      \version    $Id: address.php,v 1.9 2011/08/03 00:46:27 eldy Exp $
 */

 require("../main.inc.php");
@@ -517,5 +516,5 @@ else
 $db->close();


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

 /**
        \file       htdocs/comm/bookmark.php
        \brief      Page affichage des bookmarks
-        \version    $Id$
+        \version    $Id: bookmark.php,v 1.24 2011/08/03 00:46:26 eldy Exp $
 */


@@ -147,5 +146,5 @@ else

 $db->close();

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

 /**
 *	\file       htdocs/comm/clients.php
 *	\ingroup    commercial, societe
 *	\brief      List of customers
- *	\version    $Id$
+ *	\version    $Id: clients.php,v 1.79 2011/08/03 00:46:26 eldy Exp $
 */

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

 $db->close();

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

 /**
        \file       htdocs/comm/contact.php
        \ingroup    commercial
        \brief      Liste des contacts
-        \version    $Id$
+        \version    $Id: contact.php,v 1.50 2011/08/03 00:46:26 eldy Exp $
 */

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

 $db->close();

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

 /**
 *       \file       htdocs/comm/fiche.php
 *       \ingroup    commercial, compta
 *       \brief      Page to show customer card of a third party
- *       \version    $Id: fiche.php,v 1.281 2011/07/18 10:22:22 hregis Exp $
+ *       \version    $Id: fiche.php,v 1.282 2011/08/03 00:46:27 eldy Exp $
 */

 require("../main.inc.php");
@@ -892,5 +891,5 @@ else
 $db->close();


-llxFooter('$Date: 2011/07/18 10:22:22 $ - $Revision: 1.281 $');
+llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.282 $');
 ?>
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -14,15 +14,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 /**
 *	\file       htdocs/comm/index.php
 *	\ingroup    commercial
 *	\brief      Home page of commercial area
- *	\version    $Id$
+ *	\version    $Id: index.php,v 1.171 2011/08/03 00:46:26 eldy Exp $
 */

 require("../main.inc.php");
@@ -632,5 +631,5 @@ print '</table>';
 $db->close();


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

 /**
 *       \file       htdocs/comm/mailing/cibles.php
 *       \ingroup    mailing
 *       \brief      Page to define emailing targets
- *       \version    $Id$
+ *       \version    $Id: cibles.php,v 1.76 2011/08/03 00:46:33 eldy Exp $
 */

 require("../../main.inc.php");
@@ -515,5 +514,5 @@ if ($mil->fetch($_REQUEST["id"]) >= 0)

 $db->close();

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

 /**
 *	\file       htdocs/comm/mailing/class/mailing.class.php
 *	\ingroup    mailing
 *	\brief      Fichier de la classe de gestion des mailings
- *	\version    $Id$
+ *	\version    $Id: mailing.class.php,v 1.3 2011/08/03 00:46:38 eldy Exp $
 */

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

 /**
 *       \file       htdocs/comm/mailing/fiche.php
 *       \ingroup    mailing
 *       \brief      Fiche mailing, onglet general
- *       \version    $Id: fiche.php,v 1.122 2011/07/10 13:33:53 eldy Exp $
+ *       \version    $Id: fiche.php,v 1.123 2011/08/03 00:46:33 eldy Exp $
 */

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

 $db->close();

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

 /**
 *       \file       htdocs/comm/mailing/index.php
 *       \ingroup    mailing
 *       \brief      Page accueil de la zone mailing
- *       \version    $Id$
+ *       \version    $Id: index.php,v 1.37 2011/08/03 00:46:33 eldy Exp $
 */

 require("../../main.inc.php");
@@ -216,6 +215,6 @@ if ($langs->file_exists("html/spam.html",0)) {
 }


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

 ?>
--- a/Show More
+++ b/Show More