Fix: Avoid errors into rpm packages

2011-08-03 00:45:22 +00:00
parent a69b422c94
commit dae4ed2909
326 changed files with 2629 additions and 1363 deletions
--- a/build/deb/dolibarr.desktop
+++ b/build/deb/dolibarr.desktop
@@ -3,14 +3,10 @@
 # It must be saved into directory /usr/share/applications
 Version=1.0
 Name=Dolibarr ERP & CRM
-Name[es]=Dolibarr ERP & CRM
 Name[fr]=Dolibarr ERP & CRM
-Name[it]=Dolibarr ERP & CRM
 GenericName=Dolibarr ERP & CRM
 Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations
-Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones
 Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations
-Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti
 # Command to open an URL
 # For Fedora: xdg-open 
 # For Debian/Ubuntu: xdg-open or x-www-browser
--- a/build/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.131 2011/08/03 01:43:26 eldy Exp $
+# \version      $Id: makepack-dolibarr.pl,v 1.129 2011/08/01 18:22:26 eldy Exp $
 # \author       (c)2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
 #----------------------------------------------------------------------------

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


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


@@ -306,23 +306,21 @@ if ($nboftargetok) {
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/CVS*  $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/*/CVS*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/blank.html`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/.svn`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`;
        $ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`;
+        $ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/includes/smarty`;
 	    #$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`;
 	    #$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`;
        #$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`;
        #$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/ttf2ufm`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`;
        $ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33`;
        $ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-20100919`;
        $ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`;
+        #$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`;
+        #$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`;
 	}
    
    # Build package for each target
@@ -445,60 +443,57 @@ if ($nboftargetok) {

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

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

 			# Apache conf files
-    		print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/httpd-dolibarr.conf\n";
-    		$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`;
-    		$ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`;
-    		$ret=`cp "$SOURCE/build/rpm/file_contexts.dolibarr" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/file_contexts.dolibarr"`;
+    		#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
@@ -523,21 +518,21 @@ if ($nboftargetok) {
 		    $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`;
 		    $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; ";
            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.php' -type f -exec chmod 755 {} \\; ";
+            $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.php' -type f -exec chmod 755 {} \\; ";
            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.pl' -type f -exec chmod 755 {} \\; ";
+            $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.pl' -type f -exec chmod 755 {} \\; ";
            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev -name '*.php' -type f -exec chmod 755 {} \\; ";
+            $cmd="find $BUILDROOT/$FILENAMETGZ2/dev -name '*.php' -type f -exec chmod 755 {} \\; ";
            $ret=`$cmd`;
-            $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/translation/langAutoParser.class.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_page.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/modMyModule.class.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_class.class.php`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
+            $ret=`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/var/www/$PROJECT/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; ";
+            $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; ";
            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; ";
+            $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
@@ -613,7 +608,7 @@ if ($nboftargetok) {
            $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN/po/CVS*"`;
            
            print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n";
-            open (SPECFROM,"<$SOURCE/build/deb/control.debianbin") || die "Error";
+            open (SPECFROM,"<$SOURCE/build/deb/control.DEBIAN") || die "Error";
            open (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error";
            while (<SPECFROM>) {
                $_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/;
@@ -667,7 +662,6 @@ if ($nboftargetok) {
 		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/iso-normes`;
 		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpcheckstyle`;
 		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpunit`;
-		    $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/*/README`;
 		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/flyer`;
 		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/font`;
 		    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/tshirt`;
@@ -687,7 +681,7 @@ if ($nboftargetok) {
 		    $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`;
 		    $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`;
            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
            # To remove once stable
            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`;

--- a/build/rpm/dolibarr.spec
+++ b/build/rpm/dolibarr.spec
@@ -5,11 +5,6 @@
 # file to build a package for your own distributions and 
 # edit it if you need to match your rules.
 # --------------------------------------------------------
-
-#%define is_mandrake %(test -e /etc/mandrake-release && echo 1 || echo 0)
-#%define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0)
-#%define is_fedora %(test -e /etc/fedora-release && echo 1 || echo 0)
-
 %define name dolibarr
 %define version	__VERSION__
 %define release __RELEASE__
@@ -17,12 +12,9 @@
 Name: %{name}
 Version: %{version}
 Release: %{release}
-Summary: ERP and CRM software for small and medium companies or foundations 
-Summary(es): Software ERP y CRM para pequeñas y medianas empresas o, asociaciones o autónomos
-Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs ou associations
-Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti
+Summary: Dolibarr

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

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

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

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


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

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

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

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

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


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


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


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


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

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

 # Create install.forced.php into Dolibarr install directory
 superuserlogin=''
@@ -214,39 +205,36 @@ 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
+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
+if [ ! -f $seconfig ]; then
+  	 echo Create se config file $seconfig
+     cp $sefileorig $seconfig
+#     chmod a-x $apacheconfig
+#     chmod go-w $apacheconfig
 fi

 # Create a config link dolibarr.conf
@@ -257,13 +245,25 @@ 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
+chown -R $apacheuser:$apachegroup $docdir
+chmod -R o-w $docdir
+
+# Set SE Linux on OS SE is enabled
+if [ "x$os" = "xfedora-redhat" -a -s /usr/bin/chcon ]; then
+    echo Set SELinux permissions
+    # Warning: chcon seems not cumulative 
+    #chcon -R -h -t httpd_sys_content_t $targetdir
+    #chcon -R -h -t httpd_sys_content_t $docdir
+    chcon -R -h -t httpd_sys_script_rw_t $targetdir
+    chcon -R -h -t httpd_sys_script_rw_t $docdir
+    chcon -R -h -t httpd_sys_script_rw_t %{_sysconfdir}/dolibarr
+    #chcon -R -h -t httpd_sys_script_exec_t $targetdir
+fi

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

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


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

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

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

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

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

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

 $db->close();

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

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

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

 $db->close();

-llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $');
+llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.41 $');
 ?>
--- a/htdocs/boutique/index.php
+++ b/htdocs/boutique/index.php
@@ -17,10 +17,10 @@
 */

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

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

 $dbosc->close();

-llxFooter('$Date: 2011/08/03 01:17:17 $ - $Revision: 1.17 $');
+llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.16 $');
 ?>
--- a/htdocs/cashdesk/css/style.css
+++ b/htdocs/cashdesk/css/style.css
@@ -11,10 +11,11 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, 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.
 */ 
 
-/*	\version   $Id: style.css,v 1.4 2011/08/03 01:35:18 eldy Exp $ */
+/*	\version   $Id$ */

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

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

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

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

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

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

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

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

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

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

 $db->close();

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

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

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

 $db->close();

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

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

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

 $db->close();

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

 /**
 *	\file       htdocs/core/class/cookie.class.php
 *	\ingroup    core
- *	\version	$Id: cookie.class.php,v 1.6 2011/07/30 08:56:26 eldy Exp $
+ *	\version	$Id: cookie.class.php,v 1.7 2011/07/31 23:45:13 eldy Exp $
 *	\brief      File of class to manage cookies
 */

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

 /**
 *	\file       htdocs/filefunc.inc.php
 * 	\ingroup	core
 *  \brief      File that include conf.php file and functions.lib.php
- *  \version    $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $
+ *  \version    $Id: filefunc.inc.php,v 1.21 2011/07/31 23:19:04 eldy Exp $
 */

 define('DOL_VERSION','3.1.0-beta');	// Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
@@ -65,7 +64,7 @@ $conffiletoshowshort = "conf.php";
 # Define localization of conf file
 $conffile = "conf/conf.php";
 $conffiletoshow = "htdocs/conf/conf.php";
-# For debian like systems
+# For debian/redhat like systems
 #$conffile = "/etc/dolibarr/conf.php";
 #$conffiletoshow = "/etc/dolibarr/conf.php";

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

 /**
 *      \file       htdocs/imports/import.php
 *      \ingroup    import
 *      \brief      Pages of import Wizard
- *      \version    $Id: import.php,v 1.68 2011/07/29 22:31:37 eldy Exp $
+ *      \version    $Id: import.php,v 1.69 2011/07/31 23:46:39 eldy Exp $
 */

 require_once("../main.inc.php");
@@ -1669,7 +1668,7 @@ print '<br>';

 $db->close();

-llxFooter('$Date: 2011/07/29 22:31:37 $ - $Revision: 1.68 $');
+llxFooter('$Date: 2011/07/31 23:46:39 $ - $Revision: 1.69 $');


 /*
--- a/htdocs/includes/modules/export/export_csv.modules.php
+++ b/htdocs/includes/modules/export/export_csv.modules.php
@@ -13,6 +13,7 @@
 *
 * 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/
 */

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

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

 /**
@@ -20,7 +21,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.28 2011/08/03 01:38:53 eldy Exp $
+ *	\version    $Id: export_excel.modules.php,v 1.27 2011/07/31 23:28:18 eldy Exp $
 */

 require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php");
@@ -63,7 +64,7 @@ class ExportExcel extends ModeleExports
 		$this->desc='<b>Excel</b> file format (.xls)<br>This is native Excel 95 format.';
 		$this->extension='xls';             // Extension for generated file by this driver
        $this->picto='mime/xls';					// Picto
-		$ver=explode(' ','$Revision: 1.28 $');
+		$ver=explode(' ','$Revision: 1.27 $');
 		$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,7 +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, 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.
+* or see http://www.gnu.org/
 */

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

 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php");
@@ -59,7 +61,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: 1.14 $');
+        $ver=explode(' ','$Revision$');
        $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,13 +14,14 @@
 *
 * 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.25 2011/08/03 01:38:52 eldy Exp $
+ *	\version    $Id: modules_export.php,v 1.24 2011/07/31 23:28:18 eldy Exp $
 */

 require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php');
--- 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,7 +484,8 @@ 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, see <http://www.gnu.org/licenses/>.
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 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,7 +484,8 @@ 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, see <http://www.gnu.org/licenses/>.
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

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

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

 /**
 *	\file       htdocs/index.php
 *	\brief      Dolibarr home page
- *	\version    $Id: index.php,v 1.199 2011/07/30 10:23:24 eldy Exp $
+ *	\version    $Id: index.php,v 1.200 2011/07/31 23:19:05 eldy Exp $
 */

 define('NOCSRFCHECK',1);	// This is login page. We must be able to go on it from another web site.
@@ -574,7 +573,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING))

 $db->close();

-llxFooter('$Date: 2011/07/30 10:23:24 $ - $Revision: 1.199 $');
+llxFooter('$Date: 2011/07/31 23:19:05 $ - $Revision: 1.200 $');


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

 /**
 *	\file       htdocs/install/check.php
 *	\ingroup    install
 *	\brief      Test if file conf can be modified and if does not exists, test if install process can create it
- *	\version    $Id: check.php,v 1.86 2011/07/30 14:56:43 eldy Exp $
+ *	\version    $Id: check.php,v 1.87 2011/07/31 23:26:19 eldy Exp $
 */
 include_once("./inc.php");

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

 body {
--- a/htdocs/install/etape0.php
+++ b/htdocs/install/etape0.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/install/etape0.php
 *	\ingroup	install
 *	\brief      Show and ask charset for database
- *	\version    $Id: etape0.php,v 1.41 2011/07/30 14:56:43 eldy Exp $
+ *	\version    $Id: etape0.php,v 1.42 2011/07/31 23:26:25 eldy Exp $
 */

 define('DONOTLOADCONF',1);	// To avoid loading conf by file inc.php
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/etape1.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/install/etape1.php
 *		\ingroup	install
 *		\brief      Build conf file on disk
- *		\version    $Id: etape1.php,v 1.135 2011/07/30 14:56:42 eldy Exp $
+ *		\version    $Id: etape1.php,v 1.136 2011/07/31 23:26:18 eldy Exp $
 */

 define('DONOTLOADCONF',1);	// To avoid loading conf by file inc.php
--- a/htdocs/install/etape2.php
+++ b/htdocs/install/etape2.php
@@ -13,15 +13,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 /**
 *      \file       htdocs/install/etape2.php
 *		\ingroup	install
 *      \brief      Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data
- *      \version    $Id: etape2.php,v 1.105 2011/07/30 14:56:43 eldy Exp $
+ *      \version    $Id: etape2.php,v 1.106 2011/07/31 23:26:19 eldy Exp $
 */

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

 /**
 *	\file       htdocs/install/etape4.php
 *	\ingroup	install
 *	\brief      Ask login and password of Dolibarr admin user
- *	\version    $Id: etape4.php,v 1.37 2011/07/30 14:56:43 eldy Exp $
+ *	\version    $Id: etape4.php,v 1.38 2011/07/31 23:26:26 eldy Exp $
 */


--- a/htdocs/install/etape5.php
+++ b/htdocs/install/etape5.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/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.107 2011/07/31 23:26:19 eldy Exp $
 */

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

 /**
 *       \file       htdocs/install/fileconf.php
 *       \ingroup    install
 *       \brief      Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page)
- *       \version    $Id: fileconf.php,v 1.93 2011/07/30 14:56:43 eldy Exp $
+ *       \version    $Id: fileconf.php,v 1.94 2011/07/31 23:26:27 eldy Exp $
 */
 include_once("./inc.php");

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

 /**	    \file       htdocs/install/inc.php
 * 		\ingroup	core
 *		\brief      File that define environment for install pages
- *		\version    $Id: inc.php,v 1.136 2011/07/30 10:23:25 eldy Exp $
+ *		\version    $Id: inc.php,v 1.137 2011/07/31 23:26:18 eldy Exp $
 */

 define('DOL_VERSION','3.1.0-beta');	// Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z)
@@ -75,10 +74,12 @@ $conffiletoshowshort = "conf.php";
 # Define localization of conf file
 $conffile = "../conf/conf.php";
 $conffiletoshow = "htdocs/conf/conf.php";
-# For debian like systems
+$lockfile = '../../install.lock';
+# For debian/redhat like systems
 #$conffile = "/etc/dolibarr/conf.php";
 #$conffiletoshow = "/etc/dolibarr/conf.php";
-
+#$lockfile = '/etc/dolibarr/install.lock';    # Web has no permission to write here
+$lockfile = '../../install.lock';

 if (! defined('DONOTLOADCONF') && file_exists($conffile))
 {
@@ -178,7 +179,7 @@ if (preg_match('/install.lock/i',$_SERVER["SCRIPT_FILENAME"]))
    }
 	exit;
 }
-if (file_exists('../../install.lock'))
+if (file_exists($lockfile))
 {
 	print 'Install pages have been disabled for security reason (by lock file install.lock into dolibarr root directory).<br>';
 	if (! empty($dolibarr_main_url_root))
--- a/htdocs/install/licence.php
+++ b/htdocs/install/licence.php
@@ -13,15 +13,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 /**
 *	 \file       htdocs/install/licence.php
 *   \ingroup    install
 *	 \brief      Page to show licence (Removed from install process to save time)
- *	 \version    $Id: licence.php,v 1.20 2011/07/30 14:56:42 eldy Exp $
+ *	 \version    $Id: licence.php,v 1.21 2011/07/31 23:26:22 eldy Exp $
 */

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

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

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

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

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

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

 --
--- a/htdocs/install/mysql/data/llx_c_availability.sql
+++ b/htdocs/install/mysql/data/llx_c_availability.sql
@@ -11,9 +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, see <http://www.gnu.org/licenses/>.
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
-- $Id: llx_c_availability.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $
+-- $Id$
 --

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 --
@@ -33,4 +34,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,9 +17,10 @@
 -- GNU General Public License for more details.
 --
 -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
-- $Id: llx_c_stcomm.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $
+-- $Id$
 --

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

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

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

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

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

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

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


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

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

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


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


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


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

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


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


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

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


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

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


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

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

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

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


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

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

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

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

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


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

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


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

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


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

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


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

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


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

 create table llx_boxes_def
--- a/Show More
+++ b/Show More