Work on 3.1 packaging

2011-07-30 14:56:11 +00:00
parent 62ec1460d1
commit 8d5617a943
339 changed files with 1570 additions and 2806 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
@@ -1,9 +1,8 @@
-dolibarr (3.1.0-1.1) unstable; urgency=low
+dolibarr (3.1.0) unstable; urgency=low

-  * Non-maintainer upload
  * New upstream release.
    closes: bug#634783
    
- -- Laurent Destailleur <eldy@users.sourceforge.net>  Mon, 30 Jul 2011 12:00:00 +0100     
+ -- Laurent Destailleur <eldy@users.sourceforge.net>  Mon, 18 Jul 2011 12:00:00 +0100     

-# For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. 
+# More information into /usr/share/dolibarr/ChangeLog file. 
--- a/build/deb/control.DEBIAN
+++ b/build/deb/control.DEBIAN
@@ -1,46 +0,0 @@
-Package: dolibarr
-Version: __VERSION__
-Architecture: all
-Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
-Installed-Size: 61200
-Depends: xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl
-Section: web
-Priority: optional
-Homepage: http://www.dolibarr.org
-Description: Easy to use web based ERP & CRM software
- Dolibarr ERP & CRM is an easy to use open source/free software for small 
- and medium companies, foundations or freelances. It includes different 
- features for Enterprise Resource Planning (ERP) and Customer Relationship
- Management (CRM) but also for different other activities.
- It's a web software you can install as a standalone program or on any web
- hosting provider to use it from anywhere with any web browser.
- Dolibarr was designed to provide only features you need and be easy to use.
- .
- Only features you need are visible, depending on which module were activated.
- Most common used modules are:
- .
- Customers, Suppliers or Prospects directory,
- Contacts directory,
- Orders management,
- Commercial proposals management,
- Invoices management,
- Products and services catalog,
- Stock management,
- Foundations members management,
- Bank accounts management,
- Point of Sale,
- Payments management,
- Commercial actions management,
- Contracts management,
- Standing orders management,
- Shipping management,
- Donations management,
- Bookmarks management,
- Mass Emailings,
- Reports,
- Wizards to export and import data,
- LDAP connectivity,
- PDF exports,
- And a lot of more modules...
- .
- You can also add third parties external modules or develop yours.
--- 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/dolibarr.desktop
+++ b/build/deb/dolibarr.desktop
@@ -3,10 +3,14 @@
 # It must be saved into directory /usr/share/applications
 Version=1.0
 Name=Dolibarr ERP & CRM
+Name[es]=Dolibarr ERP & CRM
 Name[fr]=Dolibarr ERP & CRM
+Name[it]=Dolibarr ERP & CRM
 GenericName=Dolibarr ERP & CRM
 Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations
+Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones
 Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations
+Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti
 # Command to open an URL
 # For Fedora: xdg-open 
 # For Debian/Ubuntu: xdg-open or x-www-browser
--- a/build/deb/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/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/postrm
+++ b/build/deb/postrm
@@ -30,7 +30,6 @@ 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=""
@@ -44,32 +43,6 @@ esac


 case "$1" in
-
-    # Call when we upgrade
-	upgrade)
-	;;
-
-    # Call when we uninstall
-	remove)
-		rm -f $lockfile
-
-		# Remove include files
-		export restart=""
-		for server in $webservers ; do
-			export conffile="/etc/$server/conf.d/dolibarr.conf"
-            if [ -f $conffile ] ;
-            then
-               echo Delete link $conffile
-	           rm -f $conffile
-	           status=purge
-		    fi
-			
-			if [ "x$status" = "xpurge" ] ;
-				then restart="$restart $server"
-			fi
-		done
-	;;
-
    # Call when we uninstall and purge
 	purge)
 		echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig"
@@ -225,6 +198,30 @@ case "$1" in
 		#db_purge
 	;;

+    # Call when we uninstall
+	remove)
+		rm -f /usr/share/dolibarr/install.lock
+
+		# Remove include files
+		export restart=""
+		for server in $webservers ; do
+			export conffile="/etc/$server/conf.d/dolibarr.conf"
+            if [ -f $conffile ] ;
+            then
+               echo Delete link $conffile
+	           rm -f $conffile
+	           status=purge
+		    fi
+			
+			if [ "x$status" = "xpurge" ] ;
+				then restart="$restart $server"
+			fi
+		done
+	;;
+
+	upgrade)
+	;;
+
 	failed-upgrade|abort-install|abort-upgrade|disappear)
 	;;

--- 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.123 2011/07/30 14:56:12 eldy Exp $
 # \author       (c)2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
 #----------------------------------------------------------------------------

@@ -11,7 +11,7 @@ use Cwd;
 $PROJECT="dolibarr";
 $MAJOR="3";
 $MINOR="1";
-$BUILD="0-beta";		# Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
+$BUILD="0-dev";		# Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
 $RPMSUBVERSION="auto";	# auto use value found into BUILD

@LISTETARGET=("TGZ","ZIP","RPM","DEB","APS","EXEDOLIWAMP","SNAPSHOT");   # Possible packages
@@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") {


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


@@ -254,11 +254,9 @@ if ($nboftargetok) {

        $ret=`rm -f  $BUILDROOT/$PROJECT/build/DoliW*-*`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/build/DoliM*-*`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.changes`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.deb`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.deb`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.dsc`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.tar.gz`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.deb`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.rpm`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tar`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tar.gz`;
@@ -276,10 +274,6 @@ if ($nboftargetok) {
        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/Veranda*.ttf`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/fckeditor.py`;
 	    
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/mssql/README`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/mysql/README`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`;
-
        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/spec`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`;
@@ -416,19 +410,14 @@ if ($nboftargetok) {
    	}
    
    	if ($target eq 'RPM') {                 # Linux only
-    		#$ARCH='i386';
-    		$ARCH='noarch';
+    		$ARCH='i386';
 			if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; }
           	$newbuild = $BUILD;
-           	# For fedora
-            $newbuild =~ s/(dev|alpha)/0.1.a/gi;			# dev
-            $newbuild =~ s/beta/0.2.beta1/gi;				# beta
-            $newbuild =~ s/rc./0.3.rc1/gi;					# rc
+            $newbuild =~ s/(dev|alpha)/0/gi;				# dev
+            $newbuild =~ s/beta/1/gi;						# beta
+            $newbuild =~ s/rc./2/gi;						# rc
            if ($newbuild !~ /-/) { $newbuild.='-3'; }		# finale
-            #$newbuild =~ s/(dev|alpha)/0/gi;				# dev
-            #$newbuild =~ s/beta/1/gi;						# beta
-            #$newbuild =~ s/rc./2/gi;						# rc
-            #if ($newbuild !~ /-/) { $newbuild.='-3'; }		# finale
+            # now newbuild is 0-0 or 0-3 for example
            $REL1 = $newbuild; $REL1 =~ s/-.*$//gi;
            if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; }
            print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";
@@ -446,93 +435,16 @@ if ($nboftargetok) {

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

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

@@ -560,10 +472,6 @@ if ($nboftargetok) {
   		    print "Move $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\n";
   		    $cmd="mv \"$RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\"";
    		$ret=`$cmd`;
-   		    print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\n";
-   		    $cmd="mv \"$RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\"";
-    		$ret=`$cmd`;
-
    		next;
    	}
    	
@@ -700,7 +608,17 @@ if ($nboftargetok) {
            print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT\n";
            $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT"`;
            
-			# Set owners
+    		#print "Copy README file into $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
+            #$ret=`cp "$SOURCE/README" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/README"`;
+
+			# copyright (to build binary package directly without sources. Useless if we build from sources)
+    		#print "Copy copyright file into $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright\n";
+            #$ret=`cp "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright"`;
+
+            # changelog (to build binary package directly without sources. Useless if we build from sources)
+            #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`;
+            #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.gz`;
+
            print "Set owners on files/dir\n";
 		    $ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`;

@@ -757,7 +675,7 @@ if ($nboftargetok) {
            $ret=`cp -f  "$SOURCE/build/deb/compat"         "$BUILDROOT/$PROJECT.tmp/debian/compat"`;
            $ret=`cp -f  "$SOURCE/build/deb/format"         "$BUILDROOT/$PROJECT.tmp/debian/source/format"`;
            $ret=`cp -fr "$SOURCE/build/deb/po"             "$BUILDROOT/$PROJECT.tmp/debian/po"`;
-			$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/debian/po/CVS"`;
+			$ret=`rm -fr "$SOURCE/build/deb/po/CVS"`;
            # Add files also required to build binary package with dpkg-buildpackages
            $ret=`cp -f  "$SOURCE/build/deb/config"         "$BUILDROOT/$PROJECT.tmp/debian"`;
            $ret=`cp -f  "$SOURCE/build/deb/postinst"       "$BUILDROOT/$PROJECT.tmp/debian"`;
@@ -778,18 +696,12 @@ if ($nboftargetok) {
            if ($OS =~ /windows/i)
            {
                print "Move *_all.deb to $DESTI\n";
-                $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`;
-                $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`;
-                $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`;
-                $ret=`mv $BUILDROOT/*.changes "$DESTI/"`;
+                $ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`;
            }
            else
            {
                print "Move *_all.deb to $DESTI\n";
-                $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`;
-                $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`;
-                $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`;
-                $ret=`mv $BUILDROOT/*.changes "$DESTI/"`;
+                $ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`;
            }
        	next;
        }
--- a/build/rpm/README
+++ b/build/rpm/README
@@ -5,17 +5,24 @@ RPM Package tools

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


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

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

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

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

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


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

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

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

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

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


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


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


 #---- post (after unzip during install)
@@ -154,11 +163,11 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install"
 export installconfig="%{_sysconfdir}/dolibarr/install.forced.php"
 export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf"
 export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf"
-export sefileorig="$targetdir/build/rpm/file_contexts.dolibarr"
+export sefileorig="%{_sysconfdir}/dolibarr/file_contexts.dolibarr"
 export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr"
-#config="/usr/share/dolibarr/htdocs/conf/conf.php"
-config="%{_sysconfdir}/dolibarr/conf.php"
-lockfile="/usr/share/dolibarr/install.lock"
+#export config="/usr/share/dolibarr/htdocs/conf/conf.php"
+export config="%{_sysconfdir}/dolibarr/conf.php"
+export lockfile="/usr/share/dolibarr/install.lock"


 # Detect OS
@@ -192,8 +201,8 @@ echo OS detected: $os

 # Create empty directory for uploaded files and generated documents 
 echo Create document directory $docdir
-mkdir -p $docdir
-mkdir -p %{_sysconfdir}/dolibarr
+%{__mkdir} -p $docdir
+%{__mkdir} -p %{_sysconfdir}/dolibarr

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

 # Create an empty conf.php with permission to web server
 if [ ! -f $config ]
 then 
 	echo Create empty file $config		
 	touch $config
-	chown -R root:$apachegroup $config
-	chmod -R 660 $config
+	%{__chown} -R root:$apachegroup $config
+	%{__chmod} -R 660 $config
 fi

 # Create config file for apache $apacheconfig
-if [ ! -f $apacheconfig ]; then
-  	 echo Create dolibarr web server config file $apacheconfig
-     cp $apachefileorig $apacheconfig
-     chmod a-x $apacheconfig
-     chmod go-w $apacheconfig
-fi
-
-# Create config file for se $seconfig
-if [ ! -f $seconfig ]; then
-  	 echo Create se config file $seconfig
-     cp $sefileorig $seconfig
+#if [ ! -f $apacheconfig ]; then
+#  	 echo Create dolibarr web server config file $apacheconfig
+#     cp $apachefileorig $apacheconfig
 #     chmod a-x $apacheconfig
 #     chmod go-w $apacheconfig
+#fi
+
+# Create config file for se $seconfig
+if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon -a ! -f $seconfig ]; then
+  	 echo Add SE Linux permission from file $sefileorig
+	 semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)"
+	 semanage fcontext -a -t httpd_sys_script_rw_t "/usr/share/dolibarr(/.*?)"
+	 semanage fcontext -a -t httpd_sys_script_rw_t "/var/www/dolibarr/install.lock"
+     restorecon -R -v /etc/dolibarr
+     restorecon -R -v /usr/share/dolibarr
+     restorecon -v /var/www/dolibarr/install.lock
 fi

 # Create a config link dolibarr.conf
@@ -245,25 +257,13 @@ fi

 # Set permissions
 echo Set permission to $apacheuser:$apachegroup on $targetdir
-chown -R $apacheuser:$apachegroup $targetdir
-chmod -R a-w $targetdir
-chmod u+w $targetdir
+%{__chown} -R $apacheuser:$apachegroup $targetdir
+%{__chmod} -R a-w $targetdir
+%{__chmod} u+w $targetdir

 echo Set permission to $apacheuser:$apachegroup on $docdir
-chown -R $apacheuser:$apachegroup $docdir
-chmod -R o-w $docdir
-
-# Set SE Linux on OS SE is enabled
-if [ "x$os" = "xfedora-redhat" -a -s /usr/bin/chcon ]; then
-    echo Set SELinux permissions
-    # Warning: chcon seems not cumulative 
-    #chcon -R -h -t httpd_sys_content_t $targetdir
-    #chcon -R -h -t httpd_sys_content_t $docdir
-    chcon -R -h -t httpd_sys_script_rw_t $targetdir
-    chcon -R -h -t httpd_sys_script_rw_t $docdir
-    chcon -R -h -t httpd_sys_script_rw_t %{_sysconfdir}/dolibarr
-    #chcon -R -h -t httpd_sys_script_exec_t $targetdir
-fi
+%{__chown} -R $apacheuser:$apachegroup $docdir
+%{__chmod} -R o-w $docdir

 # Restart web server
 echo Restart web server
@@ -274,6 +274,12 @@ if [ -f %{_sysconfdir}/init.d/apache2 ]; then
    %{_sysconfdir}/init.d/apache2 restart
 fi

+# Restart mysql
+echo Restart mysql
+if [ -f /etc/init.d/mysqld ]; then
+	/etc/init.d/mysqld restart
+fi
+
 # Show result
 echo
 echo "----- Dolibarr %version - (c) Dolibarr dev team -----"
@@ -301,9 +307,9 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install"
 export installconfig="%{_sysconfdir}/dolibarr/install.forced.php"
 export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf"
 export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf"
-#config="/usr/share/dolibarr/htdocs/conf/conf.php"
-config="%{_sysconfdir}/dolibarr/conf.php"
-lockfile="$targetdir/install.lock"
+#export config="/usr/share/dolibarr/htdocs/conf/conf.php"
+export config="%{_sysconfdir}/dolibarr/conf.php"
+export lockfile="$targetdir/install.lock"


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

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

 # Removed dirs after apache restart
-echo Removed remaining $apacheconfig
-rm -f $apacheconfig
 echo Removed remaining $config
-rm -f $config
+%{__rm} -f $config
 echo Removed remaining $installconfig
-rm -f $installconfig
+%{__rm} -f $installconfig
 echo Removed remaining $lockfile
-rm -f $lockfile
+%{__rm} -f $lockfile
 echo Removed remaining dir $targetdir/doc
 rmdir $targetdir/doc >/dev/null 2>&1
-#echo Removed remaining dir $targetdir/htdocs
-#rmdir $targetdir/htdocs >/dev/null 2>&1	# Already removed by rpm
+

 %changelog
 * Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1
--- a/build/rpm/file_contexts.dolibarr
+++ b/build/rpm/file_contexts.dolibarr
@@ -1,3 +1,3 @@
-/etc/dolibarr/.*	system_u:object_r:httpd_sys_script_rw_t:s0
-/var/www/dolibarr/.*	system_u:object_r:httpd_sys_script_rw_t:s0
-/usr/share/dolibarr/.*	system_u:object_r:httpd_sys_script_rw_t:s0
+/etc/dolibarr(/.*?)     	system_u:object_r:httpd_sys_script_rw_t:s0
+/var/www/dolibarr(/.*?)		system_u:object_r:httpd_sys_script_rw_t:s0
+/usr/share/dolibarr(/.*?)  	system_u:object_r:httpd_sys_script_rw_t:s0
--- a/build/rpm/install.forced.php.install
+++ b/build/rpm/install.forced.php.install
@@ -3,11 +3,10 @@ $force_install_noedit=2;
 $force_install_message='KeepDefaultValuesDeb';
 $force_install_main_data_root='/usr/share/dolibarr/documents';
 $force_install_type='mysqli';
-$force_install_dbserver='localhost';
 $force_install_port='3306';
-$force_install_database='dolibarrrpm';
+$force_install_database='dolibarr';
 $force_install_createdatabase='1';
-$force_install_databaselogin='dolibarrrpm';
+$force_install_databaselogin='dolibarrmysql';
 $force_install_databasepass='';
 $force_install_createuser='1';
 $force_install_databaserootlogin='__SUPERUSERLOGIN__';
--- 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/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/proxy.php
+++ b/htdocs/admin/proxy.php
@@ -12,14 +12,15 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *   	\file       htdocs/admin/proxy.php
 *      \ingroup    core
 *		\brief      Page  setup proxy to use for external web access
- *		\version    $Id: proxy.php,v 1.7 2011/07/31 22:23:24 eldy Exp $
+ *		\version    $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $
 */

 require("../main.inc.php");
@@ -205,5 +206,5 @@ dol_htmloutput_mesg($mesg);

 $db->close();

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

 /**
 *	    \file       htdocs/admin/security_other.php
 *      \ingroup    core
 *      \brief      Security options setup
- *		\version    $Id: security_other.php,v 1.41 2011/07/31 22:23:22 eldy Exp $
+ *		\version    $Id: security_other.php,v 1.40 2011/07/29 21:04:27 eldy Exp $
 */

 require("../main.inc.php");
@@ -347,5 +348,5 @@ $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs-

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.41 $');
+llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $');
 ?>
--- a/htdocs/admin/system/constall.php
+++ b/htdocs/admin/system/constall.php
@@ -14,13 +14,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *		\file 		htdocs/admin/system/constall.php
 *		\brief      Page to show all Dolibarr setup (config file and database constants)
- *		\version    $Id: constall.php,v 1.24 2011/07/31 22:23:14 eldy Exp $
+ *		\version    $Id: constall.php,v 1.23 2011/07/30 10:23:26 eldy Exp $
 */

 require("../../main.inc.php");
--- 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/css/style.css
+++ b/htdocs/cashdesk/css/style.css
@@ -11,11 +11,10 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */ 
 
-/*	\version   $Id$ */
+/*	\version   $Id: style.css,v 1.4 2011/08/03 01:35:18 eldy Exp $ */

 body {
 	background: #eee;
--- a/htdocs/cashdesk/javascript/dhtml.js
+++ b/htdocs/cashdesk/javascript/dhtml.js
@@ -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/>.
 */

 // Instanciation et initialisation de l'objet xmlhttprequest
--- a/htdocs/cashdesk/tpl/validation1.tpl.php
+++ b/htdocs/cashdesk/tpl/validation1.tpl.php
@@ -15,8 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.

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

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

 /**
 *  \file       htdocs/compta/bank/bankid_fr.php
 *  \ingroup    banque
 *  \brief      Fiche creation compte bancaire
- *  \version    $Id: bankid_fr.php,v 1.28 2011/07/31 22:23:20 eldy Exp $
+ *  \version    $Id: bankid_fr.php,v 1.27 2011/07/29 20:47:35 eldy Exp $
 */

 require("./pre.inc.php");
@@ -385,5 +386,5 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure

 $db->close();

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

 /**
 *	    \file       htdocs/compta/bank/fiche.php
 *      \ingroup    banque
 *		\brief      Page to create/view a bank account
- *		\version    $Id: fiche.php,v 1.78 2011/07/31 22:23:16 eldy Exp $
+ *		\version    $Id: fiche.php,v 1.77 2011/07/29 20:47:35 eldy Exp $
 */

 require("./pre.inc.php");
@@ -607,5 +608,5 @@ else

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.78 $');
+llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.77 $');
 ?>
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -14,15 +14,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 /**
 *	\file       htdocs/compta/index.php
 *	\ingroup    compta
 *	\brief      Main page of accountancy area
- *	\version    $Id: index.php,v 1.183 2011/07/26 23:11:52 eldy Exp $
+ *	\version    $Id: index.php,v 1.184 2011/08/03 00:46:24 eldy Exp $
 */

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


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

 /**
 *	\file       htdocs/compta/paiement.php
 *	\ingroup    compta
 *	\brief      Page to create a payment
- *	\version    $Id: paiement.php,v 1.112 2011/07/27 08:00:45 cdelambert Exp $
+ *	\version    $Id: paiement.php,v 1.113 2011/08/03 00:46:23 eldy Exp $
 */

 require('../main.inc.php');
@@ -673,5 +672,5 @@ if (! GETPOST('action'))

 $db->close();

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

 /**
 *	\file       htdocs/compta/prelevement/create.php
 *	\brief      Prelevement
- *	\version    $Id: create.php,v 1.35 2011/07/31 22:23:29 eldy Exp $
+ *	\version    $Id: create.php,v 1.34 2011/07/29 21:15:39 eldy Exp $
 */

 require("../bank/pre.inc.php");
@@ -275,5 +276,5 @@ else

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.35 $');
+llxFooter('$Date: 2011/07/29 21:15:39 $ - $Revision: 1.34 $');
 ?>
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -23,15 +23,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 /**
 *	\file       htdocs/core/class/html.form.class.php
 *  \ingroup    core
 *	\brief      File of class with all html predefined components
- *	\version	$Id: html.form.class.php,v 1.192 2011/07/27 23:37:01 eldy Exp $
+ *	\version	$Id: html.form.class.php,v 1.193 2011/07/31 23:45:14 eldy Exp $
 */


@@ -161,8 +160,10 @@ class Form
        $htmltext=str_replace("\n","",$htmltext);

       	$htmltext=str_replace('"',"&quot;",$htmltext);
-       	$paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip
-       	$paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag
+       	if ($tooltipon == 2 || $tooltipon == 3) $paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip
+        else $paramfortooltipimg =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag
+       	if ($tooltipon == 1 || $tooltipon == 3) $paramfortooltiptd=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip
+        else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag

       	$s="";
        if (empty($notabs)) $s.='<table class="nobordernopadding" summary=""><tr>';
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -14,15 +14,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 /**
 *   \file		    htdocs/core/class/interfaces.class.php
 *   \ingroup		core
 *   \brief			Fichier de la classe de gestion des triggers
- *   \version		$Id: interfaces.class.php,v 1.8 2011/07/28 10:36:43 eldy Exp $
+ *   \version		$Id: interfaces.class.php,v 1.9 2011/07/31 23:45:13 eldy Exp $
 */


--- a/htdocs/includes/modules/export/export_csv.modules.php
+++ b/htdocs/includes/modules/export/export_csv.modules.php
@@ -13,7 +13,6 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * or see http://www.gnu.org/
 */

 /**
@@ -21,7 +20,7 @@
 *		\ingroup    export
 *		\brief      File of class to build exports with CSV format
 *		\author	    Laurent Destailleur
- *		\version    $Id: export_csv.modules.php,v 1.30 2011/07/31 23:28:18 eldy Exp $
+ *		\version    $Id: export_csv.modules.php,v 1.31 2011/08/03 01:38:53 eldy Exp $
 */

 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php");
@@ -65,7 +64,7 @@ class ExportCsv extends ModeleExports
 		$this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape);
 		$this->extension='csv';         // Extension for generated file by this driver
 		$this->picto='mime/other';		// Picto
-		$ver=explode(' ','$Revision: 1.30 $');
+		$ver=explode(' ','$Revision: 1.31 $');
 		$this->version=$ver[2];         // Driver version

 		// If driver use an external library, put its name here
--- a/htdocs/includes/modules/export/export_excel.modules.php
+++ b/htdocs/includes/modules/export/export_excel.modules.php
@@ -13,7 +13,6 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * or see http://www.gnu.org/
 */

 /**
@@ -21,7 +20,7 @@
 *	\ingroup    export
 *	\brief      File of class to generate export file with Excel format
 *	\author	    Laurent Destailleur
- *	\version    $Id: export_excel.modules.php,v 1.27 2011/07/31 23:28:18 eldy Exp $
+ *	\version    $Id: export_excel.modules.php,v 1.28 2011/08/03 01:38:53 eldy Exp $
 */

 require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php");
@@ -64,7 +63,7 @@ class ExportExcel extends ModeleExports
 		$this->desc='<b>Excel</b> file format (.xls)<br>This is native Excel 95 format.';
 		$this->extension='xls';             // Extension for generated file by this driver
        $this->picto='mime/xls';					// Picto
-		$ver=explode(' ','$Revision: 1.27 $');
+		$ver=explode(' ','$Revision: 1.28 $');
 		$this->version=$ver[2];             // Driver version

 		// If driver use an external library, put its name here
--- a/htdocs/includes/modules/export/export_tsv.modules.php
+++ b/htdocs/includes/modules/export/export_tsv.modules.php
@@ -12,9 +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.
-* or see http://www.gnu.org/
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 /**
@@ -22,7 +20,7 @@
 *		\ingroup    export
 *		\brief      File of class to build export files with format TSV
 *		\author	    Laurent Destailleur
- *		\version    $Id$
+ *		\version    $Id: export_tsv.modules.php,v 1.14 2011/08/03 01:38:52 eldy Exp $
 */

 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php");
@@ -61,7 +59,7 @@ class ExportTsv extends ModeleExports
        $this->desc='<b>Tab Separated Value</b> file format (.tsv)<br>This is a text file format where fields are separated by separator [tab].';
        $this->extension='tsv';         // Extension for generated file by this driver
        $this->picto='mime/other';		// Picto
-        $ver=explode(' ','$Revision$');
+        $ver=explode(' ','$Revision: 1.14 $');
        $this->version=$ver[2];         // Driver version

        // If driver use an external library, put its name here
--- a/htdocs/includes/modules/export/modules_export.php
+++ b/htdocs/includes/modules/export/modules_export.php
@@ -14,14 +14,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * or see http://www.gnu.org/
 */

 /**
 *	\file       htdocs/includes/modules/export/modules_export.php
 *	\ingroup    export
 *	\brief      File of parent class for export modules
- *	\version    $Id: modules_export.php,v 1.24 2011/07/31 23:28:18 eldy Exp $
+ *	\version    $Id: modules_export.php,v 1.25 2011/08/03 01:38:52 eldy Exp $
 */

 require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php');
--- a/htdocs/includes/modules/modWorkflow.class.php
+++ b/htdocs/includes/modules/modWorkflow.class.php
@@ -19,7 +19,7 @@
 /**
 *      \defgroup   workflow     Module workflow
 *      \brief      Workflow management
- *      \version    $Id: modWorkflow.class.php,v 1.10 2011/07/31 23:28:10 eldy Exp $
+ *      \version    $Id: modWorkflow.class.php,v 1.11 2011/08/01 13:26:22 hregis Exp $
 */

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

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

        // Data directories to create when module is enabled
--- a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt
+++ b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt
@@ -55,7 +55,7 @@ modified by someone else and passed on, the recipients should know
 that what they have is not the original version, so that the original
 author's reputation will not be affected by problems that might be
 introduced by others.
-
+
  Finally, software patents pose a constant threat to the existence of
 any free program.  We wish to make sure that a company cannot
 effectively restrict the users of a free program by obtaining a
@@ -484,8 +484,7 @@ convey the exclusion of warranty; and each file should have at least the
    Lesser General Public License for more details.

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

 Also add information on how to contact you by electronic and paper mail.

--- a/htdocs/includes/php_writeexcel/LICENSE
+++ b/htdocs/includes/php_writeexcel/LICENSE
@@ -484,8 +484,7 @@ convey the exclusion of warranty; and each file should have at least the
    Lesser General Public License for more details.

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

 Also add information on how to contact you by electronic and paper mail.

--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -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: default.css,v 1.24 2011/08/03 01:32:42 eldy Exp $
 */

 body {
--- a/htdocs/install/etape5.php
+++ b/htdocs/install/etape5.php
@@ -24,7 +24,7 @@
 *       \file      htdocs/install/etape5.php
 *	 	 \ingroup	install
 *       \brief     Last page of upgrade or install process
- *       \version   $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $
+ *       \version   $Id: etape5.php,v 1.104 2011/07/30 14:56:43 eldy Exp $
 */

 include_once("./inc.php");
@@ -315,6 +315,7 @@ if ($action == "set")
 		if (! empty($force_install_lockinstall))
 		{
 			// Install is finished, we create the lock file
+			$lockfile="../../install.lock";
 			$fp = @fopen($lockfile, "w");
 			if ($fp)
 			{
@@ -364,6 +365,7 @@ elseif (preg_match('/upgrade/i',$action))
 		if (! empty($force_install_lockinstall))
 		{
 			// Upgrade is finished, we create the lock file
+			$lockfile="../../install.lock";
 			$fp = @fopen($lockfile, "w");
 			if ($fp)
 			{
--- a/htdocs/install/mysql/data/llx_00_c_pays.sql
+++ b/htdocs/install/mysql/data/llx_00_c_pays.sql
@@ -17,10 +17,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: llx_00_c_pays.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $
 --

 --
--- a/htdocs/install/mysql/data/llx_10_c_regions.sql
+++ b/htdocs/install/mysql/data/llx_10_c_regions.sql
@@ -18,10 +18,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: llx_10_c_regions.sql,v 1.13 2011/07/31 12:31:00 eldy Exp $
+-- $Id: llx_10_c_regions.sql,v 1.14 2011/08/03 01:25:45 eldy Exp $
 --

 --
--- a/htdocs/install/mysql/data/llx_20_c_departements.sql
+++ b/htdocs/install/mysql/data/llx_20_c_departements.sql
@@ -18,10 +18,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: llx_20_c_departements.sql,v 1.15 2011/07/31 12:31:00 eldy Exp $
+-- $Id: llx_20_c_departements.sql,v 1.16 2011/08/03 01:25:45 eldy Exp $
 --

 --
--- a/htdocs/install/mysql/data/llx_accounting.sql
+++ b/htdocs/install/mysql/data/llx_accounting.sql
@@ -17,10 +17,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: llx_accounting.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $
 --

 --
--- a/htdocs/install/mysql/data/llx_c_action_trigger.sql
+++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql
@@ -18,10 +18,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: llx_c_action_trigger.sql,v 1.5 2011/08/03 01:25:45 eldy Exp $
 --

 --
--- a/htdocs/install/mysql/data/llx_c_actioncomm.sql
+++ b/htdocs/install/mysql/data/llx_c_actioncomm.sql
@@ -17,10 +17,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: llx_c_actioncomm.sql,v 1.7 2011/08/03 01:25:45 eldy Exp $
 --

 --
--- a/htdocs/install/mysql/data/llx_c_availability.sql
+++ b/htdocs/install/mysql/data/llx_c_availability.sql
@@ -11,10 +11,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: llx_c_availability.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $
 --

 --
--- a/htdocs/install/mysql/data/llx_c_barcode_type.sql
+++ b/htdocs/install/mysql/data/llx_c_barcode_type.sql
@@ -17,10 +17,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: llx_c_barcode_type.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $
 --

 --
--- a/htdocs/install/mysql/data/llx_c_chargesociales.sql
+++ b/htdocs/install/mysql/data/llx_c_chargesociales.sql
@@ -17,10 +17,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: llx_c_chargesociales.sql,v 1.8 2011/08/03 01:25:44 eldy Exp $
 --

 --
--- a/htdocs/install/mysql/data/llx_c_civilite.sql
+++ b/htdocs/install/mysql/data/llx_c_civilite.sql
@@ -17,10 +17,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: llx_c_civilite.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $
 --

 --
--- a/htdocs/install/mysql/data/llx_c_currencies.sql
+++ b/htdocs/install/mysql/data/llx_c_currencies.sql
@@ -17,10 +17,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: llx_c_currencies.sql,v 1.7 2011/07/28 18:34:46 eldy Exp $
+-- $Id: llx_c_currencies.sql,v 1.8 2011/08/03 01:25:46 eldy Exp $
 --

 --
--- a/htdocs/install/mysql/data/llx_c_ecotaxe.sql
+++ b/htdocs/install/mysql/data/llx_c_ecotaxe.sql
@@ -17,10 +17,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: llx_c_ecotaxe.sql,v 1.3 2011/08/03 01:25:44 eldy Exp $
 --

 --
--- a/htdocs/install/mysql/data/llx_c_effectif.sql
+++ b/htdocs/install/mysql/data/llx_c_effectif.sql
@@ -17,10 +17,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: llx_c_effectif.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $
 --

 --
--- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql
+++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql
@@ -18,10 +18,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: llx_c_forme_juridique.sql,v 1.5 2011/07/28 15:09:53 simnandez Exp $
+-- $Id: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:45 eldy Exp $
 --

 --
--- a/htdocs/install/mysql/data/llx_c_input_method.sql
+++ b/htdocs/install/mysql/data/llx_c_input_method.sql
@@ -17,10 +17,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: llx_c_input_method.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $
 --

 --
--- a/htdocs/install/mysql/data/llx_c_input_reason.sql
+++ b/htdocs/install/mysql/data/llx_c_input_reason.sql
@@ -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: llx_c_input_reason.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $
 --

 --
--- a/htdocs/install/mysql/data/llx_c_paiement.sql
+++ b/htdocs/install/mysql/data/llx_c_paiement.sql
@@ -17,10 +17,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: llx_c_paiement.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $
 --

 --
--- a/htdocs/install/mysql/data/llx_c_paper_format.sql
+++ b/htdocs/install/mysql/data/llx_c_paper_format.sql
@@ -17,10 +17,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: llx_c_paper_format.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $
 --

 --
--- a/htdocs/install/mysql/data/llx_c_payment_term.sql
+++ b/htdocs/install/mysql/data/llx_c_payment_term.sql
@@ -17,10 +17,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: llx_c_payment_term.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $
 --

 --
--- a/htdocs/install/mysql/data/llx_c_propalst.sql
+++ b/htdocs/install/mysql/data/llx_c_propalst.sql
@@ -17,10 +17,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: llx_c_propalst.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $
 --

 --
--- a/htdocs/install/mysql/data/llx_c_prospectlevel.sql
+++ b/htdocs/install/mysql/data/llx_c_prospectlevel.sql
@@ -17,10 +17,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: llx_c_prospectlevel.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $
 --

 --
--- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql
+++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql
@@ -17,10 +17,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: llx_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:44 eldy Exp $
 --

 --
@@ -34,4 +33,4 @@
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1);
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1);
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0);
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre max','Courrier suivi et lettre max',0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max',0);
--- a/htdocs/install/mysql/data/llx_c_stcomm.sql
+++ b/htdocs/install/mysql/data/llx_c_stcomm.sql
@@ -17,10 +17,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: llx_c_stcomm.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $
 --

 --
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -18,10 +18,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: llx_c_tva.sql,v 1.26 2011/07/28 18:34:46 eldy Exp $
+-- $Id: llx_c_tva.sql,v 1.27 2011/08/03 01:25:44 eldy Exp $
 --

 --
--- a/htdocs/install/mysql/data/llx_c_type_contact.sql
+++ b/htdocs/install/mysql/data/llx_c_type_contact.sql
@@ -17,10 +17,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: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $
 --

 --
--- a/htdocs/install/mysql/data/llx_c_type_fees.sql
+++ b/htdocs/install/mysql/data/llx_c_type_fees.sql
@@ -17,10 +17,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: llx_c_type_fees.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $
 --

 --
--- a/htdocs/install/mysql/data/llx_c_typent.sql
+++ b/htdocs/install/mysql/data/llx_c_typent.sql
@@ -17,10 +17,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: llx_c_typent.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $
 --

 --
--- a/htdocs/install/mysql/data/llx_const.sql
+++ b/htdocs/install/mysql/data/llx_const.sql
@@ -17,10 +17,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: llx_const.sql,v 1.22 2011/08/03 01:25:44 eldy Exp $
 --

 --
--- a/htdocs/install/mysql/functions/functions.sql
+++ b/htdocs/install/mysql/functions/functions.sql
@@ -12,10 +12,9 @@
 -- GNU General Public License for more details.
 --
 -- You should have received a copy of the GNU General Public License
-- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
-- $Id$
+-- $Id: functions.sql,v 1.2 2011/08/03 01:22:37 eldy Exp $
 --
 -- ============================================================================

--- a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql
+++ b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql
@@ -13,10 +13,9 @@
 -- GNU General Public License for more details.
 --
 -- You should have received a copy of the GNU General Public License
-- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
-- $Id$
+-- $Id: llx_accountingaccount.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $
 -- ===========================================================================


--- a/htdocs/install/mysql/tables/llx_accountingaccount.sql
+++ b/htdocs/install/mysql/tables/llx_accountingaccount.sql
@@ -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: llx_accountingaccount.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $
 -- Table of "accounts" for accountancy expert module
 -- ============================================================================

--- a/htdocs/install/mysql/tables/llx_accountingdebcred.sql
+++ b/htdocs/install/mysql/tables/llx_accountingdebcred.sql
@@ -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: llx_accountingdebcred.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $
 -- Table of "records" for accountancy expert module
 -- ============================================================================

--- a/htdocs/install/mysql/tables/llx_accountingsystem.sql
+++ b/htdocs/install/mysql/tables/llx_accountingsystem.sql
@@ -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: llx_accountingsystem.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $
 -- Table of "Plan de comptes" for accountancy expert module
 -- ============================================================================

--- a/htdocs/install/mysql/tables/llx_accountingtransaction.sql
+++ b/htdocs/install/mysql/tables/llx_accountingtransaction.sql
@@ -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: llx_accountingtransaction.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $
 -- Table of "transactions" for accountancy expert module (1 transaction = 2+ records)
 -- ============================================================================

--- a/htdocs/install/mysql/tables/llx_actioncomm.key.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm.key.sql
@@ -13,10 +13,9 @@
 -- GNU General Public License for more details.
 --
 -- You should have received a copy of the GNU General Public License
-- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
-- $Id$
+-- $Id: llx_actioncomm.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $
 -- ===========================================================================


--- a/htdocs/install/mysql/tables/llx_actioncomm.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm.sql
@@ -14,10 +14,9 @@
 -- GNU General Public License for more details.
 --
 -- You should have received a copy of the GNU General Public License
-- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
-- $Id$
+-- $Id: llx_actioncomm.sql,v 1.9 2011/08/03 01:25:33 eldy Exp $
 --
 -- Actions commerciales
 -- ========================================================================
--- a/htdocs/install/mysql/tables/llx_adherent.key.sql
+++ b/htdocs/install/mysql/tables/llx_adherent.key.sql
@@ -13,10 +13,9 @@
 -- GNU General Public License for more details.
 --
 -- You should have received a copy of the GNU General Public License
-- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
-- $Id$
+-- $Id: llx_adherent.key.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $
 -- ============================================================================


--- a/htdocs/install/mysql/tables/llx_adherent.sql
+++ b/htdocs/install/mysql/tables/llx_adherent.sql
@@ -15,10 +15,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: llx_adherent.sql,v 1.12 2011/08/03 01:25:27 eldy Exp $
 -- ===================================================================
 --
 -- statut
--- a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql
@@ -15,10 +15,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: llx_adherent_extrafields.key.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $
 -- ===================================================================


--- a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql
@@ -14,10 +14,9 @@
 -- GNU General Public License for more details.
 --
 -- You should have received a copy of the GNU General Public License
-- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
-- $Id$
+-- $Id: llx_adherent_extrafields.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $
 -- ===================================================================

 create table llx_adherent_extrafields
--- a/htdocs/install/mysql/tables/llx_adherent_type.key.sql
+++ b/htdocs/install/mysql/tables/llx_adherent_type.key.sql
@@ -13,10 +13,9 @@
 -- GNU General Public License for more details.
 --
 -- You should have received a copy of the GNU General Public License
-- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
-- $Id$
+-- $Id: llx_adherent_type.key.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $
 -- ============================================================================


--- a/htdocs/install/mysql/tables/llx_adherent_type.sql
+++ b/htdocs/install/mysql/tables/llx_adherent_type.sql
@@ -14,10 +14,9 @@
 -- GNU General Public License for more details.
 --
 -- You should have received a copy of the GNU General Public License
-- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
-- $Id$
+-- $Id: llx_adherent_type.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $
 -- ===================================================================
 --
 -- statut
--- a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql
@@ -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: llx_advanced_extrafields.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $
 -- ============================================================================


--- a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql
@@ -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: llx_advanced_extrafields.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $
 -- ===================================================================

 create table llx_advanced_extrafields
--- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql
+++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql
@@ -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: llx_advanced_extrafields_options.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $
 -- ============================================================================


--- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql
+++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql
@@ -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: llx_advanced_extrafields_options.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $
 -- ===================================================================

 create table llx_advanced_extrafields_options
--- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql
+++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql
@@ -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: llx_advanced_extrafields_values.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $
 -- ============================================================================


--- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql
+++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql
@@ -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: llx_advanced_extrafields_values.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $
 -- ===================================================================

 create table llx_advanced_extrafields_values
--- a/htdocs/install/mysql/tables/llx_bank.key.sql
+++ b/htdocs/install/mysql/tables/llx_bank.key.sql
@@ -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: llx_bank.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $
 -- ===================================================================

 ALTER TABLE llx_bank ADD INDEX idx_bank_datev(datev);
--- a/htdocs/install/mysql/tables/llx_bank.sql
+++ b/htdocs/install/mysql/tables/llx_bank.sql
@@ -13,10 +13,9 @@
 -- GNU General Public License for more details.
 --
 -- You should have received a copy of the GNU General Public License
-- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
-- $Id$
+-- $Id: llx_bank.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $
 -- ===================================================================

 create table llx_bank
--- a/htdocs/install/mysql/tables/llx_bank_account.key.sql
+++ b/htdocs/install/mysql/tables/llx_bank_account.key.sql
@@ -13,10 +13,9 @@
 -- GNU General Public License for more details.
 --
 -- You should have received a copy of the GNU General Public License
-- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
-- $Id$
+-- $Id: llx_bank_account.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $
 -- ============================================================================


--- a/htdocs/install/mysql/tables/llx_bank_account.sql
+++ b/htdocs/install/mysql/tables/llx_bank_account.sql
@@ -14,10 +14,9 @@
 -- GNU General Public License for more details.
 --
 -- You should have received a copy of the GNU General Public License
-- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
-- $Id$
+-- $Id: llx_bank_account.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $
 -- =============================================================================

 -- courant : type de compte: 0 epargne, 1 courant, 2 caisse
--- a/htdocs/install/mysql/tables/llx_bank_categ.sql
+++ b/htdocs/install/mysql/tables/llx_bank_categ.sql
@@ -13,10 +13,9 @@
 -- GNU General Public License for more details.
 --
 -- You should have received a copy of the GNU General Public License
-- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
-- $Id$
+-- $Id: llx_bank_categ.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $
 -- ===================================================================

 create table llx_bank_categ
--- a/htdocs/install/mysql/tables/llx_bank_class.key.sql
+++ b/htdocs/install/mysql/tables/llx_bank_class.key.sql
@@ -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: llx_bank_class.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $
 -- ===================================================================

 ALTER TABLE llx_bank_class ADD UNIQUE INDEX uk_bank_class_lineid (lineid, fk_categ);
--- a/htdocs/install/mysql/tables/llx_bank_class.sql
+++ b/htdocs/install/mysql/tables/llx_bank_class.sql
@@ -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: llx_bank_class.sql,v 1.4 2011/08/03 01:25:27 eldy Exp $
 -- ===================================================================

 create table llx_bank_class
--- a/htdocs/install/mysql/tables/llx_bank_url.key.sql
+++ b/htdocs/install/mysql/tables/llx_bank_url.key.sql
@@ -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: llx_bank_url.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $
 -- ===================================================================


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