Fix: Avoid errors into rpm packages

build/deb/control.DEBIAN

@@ -1,46 +0,0 @@
-Package: dolibarr
-Version: __VERSION__
-Architecture: all
-Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
-Installed-Size: 61200
-Depends: xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl
-Section: web
-Priority: optional
-Homepage: http://www.dolibarr.org
-Description: Easy to use web based ERP & CRM software
- Dolibarr ERP & CRM is an easy to use open source/free software for small 
- and medium companies, foundations or freelances. It includes different 
- features for Enterprise Resource Planning (ERP) and Customer Relationship
- Management (CRM) but also for different other activities.
- It's a web software you can install as a standalone program or on any web
- hosting provider to use it from anywhere with any web browser.
- Dolibarr was designed to provide only features you need and be easy to use.
- .
- Only features you need are visible, depending on which module were activated.
- Most common used modules are:
- .
- Customers, Suppliers or Prospects directory,
- Contacts directory,
- Orders management,
- Commercial proposals management,
- Invoices management,
- Products and services catalog,
- Stock management,
- Foundations members management,
- Bank accounts management,
- Point of Sale,
- Payments management,
- Commercial actions management,
- Contracts management,
- Standing orders management,
- Shipping management,
- Donations management,
- Bookmarks management,
- Mass Emailings,
- Reports,
- Wizards to export and import data,
- LDAP connectivity,
- PDF exports,
- And a lot of more modules...
- .
- You can also add third parties external modules or develop yours.

build/deb/control.debian

@@ -4,10 +4,16 @@ Standards-Version: 3.9.1
 Section: web
 Priority: optional
 Homepage: http://www.dolibarr.org
-Build-Depends: debhelper, po-debconf
+Build-Depends: debhelper (>= 7), po-debconf
 
 Package: dolibarr
-Depends: ${misc:Depends}, xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl
+Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5,
+    php5-mysql | php5-mysqli, 
+    php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime,
+    ${misc:Depends}, xdg-utils,
+    mysql-server, perl
+Recommends: apache2 | lighttpd | httpd, mysql-client
+Suggests: www-browser
 Architecture: all
 Section: web
 Priority: optional

build/deb/dolibarr.desktop

@@ -3,10 +3,14 @@
 # It must be saved into directory /usr/share/applications
 Version=1.0
 Name=Dolibarr ERP & CRM
+Name[es]=Dolibarr ERP & CRM
 Name[fr]=Dolibarr ERP & CRM
+Name[it]=Dolibarr ERP & CRM
 GenericName=Dolibarr ERP & CRM
 Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations
+Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones
 Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations
+Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti
 # Command to open an URL
 # For Fedora: xdg-open 
 # For Debian/Ubuntu: xdg-open or x-www-browser

build/deb/install

@@ -1,4 +1,5 @@
 etc/dolibarr/apache.conf
+etc/dolibarr/lighttpd.conf
 usr/share/applications/dolibarr.desktop
 usr/share/doc/dolibarr
 usr/share/dolibarr

build/deb/po/fr.po

@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 19:49+0200\n"
+"POT-Creation-Date: 2011-08-01 18:17+0200\n"
 "PO-Revision-Date: 2011-07-29 22:45+0100\n"
 "Last-Translator: Laurent Destailleur <eldy@users.sourceforge.net>\n"
 "Language-Team: Laurent Destailleur <eldy@users.sourceforge.net>\n"
@@ -25,10 +25,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Project-Id: dolibarr\n"
 
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid "Web server to reconfigure automatically:"
+msgstr "Seveur web à reconfigurer automatiquement:"
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Please choose the web server that should be automatically configured to run "
+"dolibarr."
+msgstr ""
+"Selectionnez le serveur web à configurer automatiquement pour utiliser "
+"dolibarr."
+
 #
 #. Type: boolean
 #. Description
-#: ../templates:1001
+#: ../templates:2001
 #, fuzzy
 msgid "Delete database and uploaded files ?"
 msgstr "Effacer la base de donnée et les fichiers uploadés ?"
@@ -36,7 +52,7 @@ msgstr "Effacer la base de donnée et les fichiers uploadés ?"
 #
 #. Type: boolean
 #. Description
-#: ../templates:1001
+#: ../templates:2001
 #, fuzzy
 msgid ""
 "Answer if you want to removed the Dolibarr MySQL database and all other "

build/deb/po/templates.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 19:52+0200\n"
+"POT-Creation-Date: 2011-08-01 18:17+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,15 +17,29 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: boolean
+#. Type: multiselect
 #. Description
 #: ../templates:1001
+msgid "Web server to reconfigure automatically:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Please choose the web server that should be automatically configured to run "
+"dolibarr."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
 msgid "Delete database and uploaded files ?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:1001
+#: ../templates:2001
 msgid ""
 "Answer if you want to removed the Dolibarr MySQL database and all other "
 "datas (datas related to this question are the Dolibarr DBMS account, all "

build/deb/templates

@@ -1,3 +1,10 @@
+Template: dolibarr/reconfigure-webserver
+Type: multiselect
+Choices: apache2, lighttpd
+_Description: Web server to reconfigure automatically:
+ Please choose the web server that should be automatically configured
+ to run dolibarr.
+
 Template: dolibarr/postrm
 Type: boolean
 Default: true

build/makepack-dolibarr.pl

@@ -2,7 +2,7 @@
 #----------------------------------------------------------------------------
 # \file         build/makepack-dolibarr.pl
 # \brief        Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
-# \version      $Id: makepack-dolibarr.pl,v 1.128 2011/07/31 22:08:13 eldy Exp $
+# \version      $Id: makepack-dolibarr.pl,v 1.127 2011/07/31 18:06:36 eldy Exp $
 # \author       (c)2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
 #----------------------------------------------------------------------------
 
@@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") {
 
 
 use vars qw/ $REVISION $VERSION /;
-$REVISION='$Revision: 1.128 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
+$REVISION='$Revision: 1.127 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
 $VERSION="1.0 (build $REVISION)";
 
 
@@ -254,11 +254,9 @@ if ($nboftargetok) {
 
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/DoliW*-*`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/DoliM*-*`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.changes`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.deb`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.deb`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.dsc`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.tar.gz`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.deb`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.rpm`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tar`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tar.gz`;
@@ -446,93 +444,17 @@ if ($nboftargetok) {
 
  			print "Remove other files\n";
             $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/README`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/README`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/aps`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README-FR`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/aps`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/dmg`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/pad/README`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/tgz/README`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb/README`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/doap`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`;
-            $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/$PROJECT/COPYING`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
-            # To remove once stable
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/htdocs/theme/bureau2crea`;
-
-			# Apache conf files
-    		#print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf\n";
-    		#$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`;
-    		#$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`;
-
-			# Dolibarr conf files
-			# TODO
-
-			# dolibarr.desktop
-	   		#print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/applications\n";
-    		#$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/applications"`;
-    		#print "Copy desktop file into $BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop\n";
-    		#$ret=`cp "$SOURCE/build/rpm/dolibarr.desktop" "$BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop"`;
-            
-            # pixmap
-	   		#print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps\n";
-    		#$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps"`;
-    		#print "Copy pixmap file into $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm\n";
-    		#$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm"`;
-
-			# Set owners
-            print "Set owners on files/dir\n";
-		    $ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`;
-
-            print "Set permissions on files/dir\n";
-		    $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`;
-		    $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.php' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.pl' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/dev -name '*.php' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/translation/langAutoParser.class.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_page.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/modMyModule.class.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_class.class.php`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-
-			# Build tgz
     		print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n";
     		$ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`;
 
@@ -700,7 +622,17 @@ if ($nboftargetok) {
             print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT\n";
             $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT"`;
             
-			# Set owners
+    		#print "Copy README file into $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
+            #$ret=`cp "$SOURCE/README" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/README"`;
+
+			# copyright (to build binary package directly without sources. Useless if we build from sources)
+    		#print "Copy copyright file into $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright\n";
+            #$ret=`cp "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright"`;
+
+            # changelog (to build binary package directly without sources. Useless if we build from sources)
+            #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`;
+            #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.gz`;
+
             print "Set owners on files/dir\n";
 		    $ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`;
 

build/rpm/README

@@ -10,8 +10,6 @@ with format RPM (for Redhat, Mandriva, ...).
 
 # This is standard command to work on Debian packaging:
 #
-# rpmlint file.rpm				    Test a package
-#
 # On Fedora
 # rpm -i --test dolibarr-...rpm     To list dependencies of RPM   
 # yum install dolibarr-...rpm       To install package and dependencies   
@@ -42,9 +40,7 @@ different features for Enterprise Resource Planning (ERP) and Customer
 Relationship Management (CRM) but also for different other activities.
 I am author of other already packaged OpenSources packages (awstats) but this
 is my first package to maintain myself. So i'm seeking a sponsor.
+
 - Edit field "Block" and add FE-NEEDSPONSOR
+
 - Check bug is into database by searching with id on https://bugzilla.redhat.com/  
-- Install fedora packager tools: yum install fedora-packager
-- Setup fedora packagers tools: fedora-packager-setup
-- Send your package: koji build --scratch f16 path_to_source_RPM
-- Check if package is available: http://koji.fedoraproject.org/koji/  

build/rpm/dolibarr.spec

@@ -48,7 +48,7 @@ AutoReqProv: no
 
 
 %description
-An easy to use CRM & ERP open source/free software for small  
+Dolibarr ERP & CRM is an easy to use open source/free software for small  
 and medium companies, foundations or freelances. It includes different 
 features for Enterprise Resource Planning (ERP) and Customer Relationship 
 Management (CRM) but also for different other activities.
@@ -56,7 +56,7 @@ Dolibarr was designed to provide only features you need and be easy to
 use.
 
 %description -l es
-Un software ERP y CRM open source/gratis para pequeñas y
+Dolibarr ERP y CRM es un software 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
@@ -65,13 +65,13 @@ 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, 
+Dolibarr ERP & CRM est un logiciel de gestion de PME/PMI, autoentrepreneurs, 
 artisans ou associations. Il permet de gérer vos clients, prospect, 
 fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings
 et bien d'autres choses dans une interface pensée pour la simplicité.
 
 %description -l it
-Un programma gestionale open source e gratuito per piccole e medie
+Dolibarr è 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à. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno 
@@ -101,7 +101,6 @@ 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
 cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -154,8 +153,6 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install"
 export installconfig="%{_sysconfdir}/dolibarr/install.forced.php"
 export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf"
 export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf"
-export sefileorig="$targetdir/build/rpm/file_contexts.dolibarr"
-export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr"
 #config="/usr/share/dolibarr/htdocs/conf/conf.php"
 config="%{_sysconfdir}/dolibarr/conf.php"
 lockfile="/usr/share/dolibarr/install.lock"
@@ -221,7 +218,7 @@ then
 	chmod -R 660 $config
 fi
 
-# Create config file for apache $apacheconfig
+# Create a config file $apacheconfig
 if [ ! -f $apacheconfig ]; then
   	 echo Create dolibarr web server config file $apacheconfig
      cp $apachefileorig $apacheconfig
@@ -229,15 +226,7 @@ if [ ! -f $apacheconfig ]; then
      chmod go-w $apacheconfig
 fi
 
-# Create config file for se $seconfig
+# Create a config link dolibarr.conf for Fedora or Redhat
-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
 if [ ! -f $apachelink ]; then
     echo Create dolibarr web server config link $apachelink
     ln -fs $apacheconfig $apachelink
@@ -370,5 +359,5 @@ rmdir $targetdir/doc >/dev/null 2>&1
 #rmdir $targetdir/htdocs >/dev/null 2>&1	# Already removed by rpm
 
 %changelog
-* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1
+* Wed Jul 31 2011 Laurent Destailleur 3.1.0
-- Initial version (#723326)
+- Initial upstream (#723326)

dev/skeletons/modMyModule.class.php

@@ -27,7 +27,7 @@
  *      \file       htdocs/includes/modules/modMyModule.class.php
  *      \ingroup    mymodule
  *      \brief      Description and activation file for module MyModule
- *		\version	$Id: modMyModule.class.php,v 1.66 2011/07/31 22:21:58 eldy Exp $
+ *		\version	$Id: modMyModule.class.php,v 1.67 2011/08/01 13:26:21 hregis Exp $
  */
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
 
@@ -72,7 +72,7 @@ class modMyModule extends DolibarrModules
 		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
 		$this->picto='generic';
 
-		// Defined if the directory /mymodule/inc/triggers/ contains triggers or not
+		// Defined if the directory /mymodule/includes/triggers/ contains triggers or not
 		$this->triggers = 0;
 
 		// Data directories to create when module is enabled.

htdocs/admin/boxes.php

@@ -20,7 +20,7 @@
 /**
  *   \file       htdocs/admin/boxes.php
  *   \brief      Page to setup boxes
- *   \version    $Id: boxes.php,v 1.72 2011/07/31 22:23:22 eldy Exp $
+ *   \version    $Id: boxes.php,v 1.73 2011/08/01 13:26:22 hregis Exp $
  */
 
 require("../main.inc.php");
@@ -278,7 +278,7 @@ if ($resql)
 		{
 			$boxname = $regs[1];
 			$module = $regs[2];
-			$sourcefile = "/".$module."/inc/boxes/".$boxname.".php";
+			$sourcefile = "/".$module."/includes/boxes/".$boxname.".php";
 		}
 		else
 		{
@@ -394,7 +394,7 @@ if ($resql)
 		{
 			$boxname = $regs[1];
 			$module = $regs[2];
-			$sourcefile = "/".$module."/inc/boxes/".$boxname.".php";
+			$sourcefile = "/".$module."/includes/boxes/".$boxname.".php";
 		}
 		else
 		{
@@ -470,5 +470,5 @@ print '</table>';
 
 $db->close();
 
-llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.72 $');
+llxFooter('$Date: 2011/08/01 13:26:22 $ - $Revision: 1.73 $');
 ?>

htdocs/admin/modules.php

@@ -3,7 +3,7 @@
  * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
  * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2010 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2011 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
 /**
  *  \file       htdocs/admin/modules.php
  *  \brief      Page to activate/disable all modules
- *  \version    $Id: modules.php,v 1.156 2011/07/31 22:23:22 eldy Exp $
+ *  \version    $Id: modules.php,v 1.157 2011/08/01 12:25:15 hregis Exp $
  */
 
 require("../main.inc.php");
@@ -79,12 +79,35 @@ $modules = array();
 $orders = array();
 $categ = array();
 $dirmod = array();
+$modulesdir = array();
 $i = 0;	// is a sequencer of modules found
 $j = 0;	// j is module number. Automatically affected if module number not defined.
-foreach ($conf->file->dol_document_root as $dirroot)
-{
-	$dir = $dirroot . "/includes/modules/";
 
+foreach ($conf->file->dol_document_root as $type => $dirroot)
+{
+	$modulesdir[] = $dirroot . "/includes/modules/";
+	
+	if ($type == 'alt')
+	{	
+		$althandle=@opendir($dirroot);
+		if (is_resource($althandle))
+		{
+			while (($file = readdir($althandle))!==false)
+			{
+			    if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
+			    {
+			    	if (is_dir($dirroot . '/' . $file . '/includes/modules/'))
+			    	{
+			    		$modulesdir[] = $dirroot . '/' . $file . '/includes/modules/';
+			    	}
+			    }
+			}
+		}
+	}
+}
+
+foreach ($modulesdir as $dir)
+{
 	// Load modules attributes in arrays (name, numero, orders) from dir directory
 	//print $dir."\n<br>";
 	dol_syslog("Scan directory ".$dir." for modules");
@@ -449,5 +472,5 @@ print '</div>';
 
 $db->close();
 
-llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.156 $');
+llxFooter('$Date: 2011/08/01 12:25:15 $ - $Revision: 1.157 $');
 ?>

htdocs/admin/perms.php

@@ -21,7 +21,7 @@
  *   	\file       htdocs/admin/perms.php
  *      \ingroup    core
  *		\brief      Page d'administration/configuration des permissions par defaut
- *		\version    $Id: perms.php,v 1.42 2011/07/31 22:23:26 eldy Exp $
+ *		\version    $Id: perms.php,v 1.43 2011/08/01 12:53:37 hregis Exp $
  */
 
 require("../main.inc.php");
@@ -76,10 +76,34 @@ $db->begin();
 
 // Charge les modules soumis a permissions
 $modules = array();
-foreach ($conf->file->dol_document_root as $dirroot)
+$modulesdir = array();
-{
-	$dir = $dirroot . "/includes/modules/";
 
+foreach ($conf->file->dol_document_root as $type => $dirroot)
+{
+	$modulesdir[] = $dirroot . "/includes/modules/";
+	
+	if ($type == 'alt')
+	{	
+		$handle=@opendir($dirroot);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle))!==false)
+			{
+			    if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
+			    {
+			    	if (is_dir($dirroot . '/' . $file . '/includes/modules/'))
+			    	{
+			    		$modulesdir[] = $dirroot . '/' . $file . '/includes/modules/';
+			    	}
+			    }
+			}
+			closedir($handle);
+		}
+	}
+}
+
+foreach ($modulesdir as $dir)
+{
 	// Load modules attributes in arrays (name, numero, orders) from dir directory
 	//print $dir."\n<br>";
 	$handle=@opendir($dir);
@@ -194,5 +218,5 @@ print '</div>';
 
 $db->close();
 
-llxFooter('$Date: 2011/07/31 22:23:26 $ - $Revision: 1.42 $');
+llxFooter('$Date: 2011/08/01 12:53:37 $ - $Revision: 1.43 $');
 ?>

htdocs/admin/proxy.php

@@ -12,14 +12,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *   	\file       htdocs/admin/proxy.php
  *      \ingroup    core
  *		\brief      Page  setup proxy to use for external web access
- *		\version    $Id: proxy.php,v 1.7 2011/07/31 22:23:24 eldy Exp $
+ *		\version    $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -205,5 +206,5 @@ dol_htmloutput_mesg($mesg);
 
 $db->close();
 
-llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.7 $');
+llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.6 $');
 ?>

htdocs/admin/security_other.php

@@ -13,14 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	    \file       htdocs/admin/security_other.php
  *      \ingroup    core
  *      \brief      Security options setup
- *		\version    $Id: security_other.php,v 1.41 2011/07/31 22:23:22 eldy Exp $
+ *		\version    $Id: security_other.php,v 1.40 2011/07/29 21:04:27 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -347,5 +348,5 @@ $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs-
 
 $db->close();
 
-llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.41 $');
+llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $');
 ?>

htdocs/admin/system/constall.php

@@ -14,13 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *		\file 		htdocs/admin/system/constall.php
  *		\brief      Page to show all Dolibarr setup (config file and database constants)
- *		\version    $Id: constall.php,v 1.24 2011/07/31 22:23:14 eldy Exp $
+ *		\version    $Id: constall.php,v 1.23 2011/07/30 10:23:26 eldy Exp $
  */
 
 require("../../main.inc.php");

htdocs/boxes.php

@@ -22,7 +22,7 @@
  *	\brief      File of class to manage widget boxes
  *	\author     Rodolphe Qiedeville
  *	\author	    Laurent Destailleur
- *	\version    $Id: boxes.php,v 1.54 2011/07/31 23:19:04 eldy Exp $
+ *	\version    $Id: boxes.php,v 1.55 2011/08/01 13:26:21 hregis Exp $
  */
 
 
@@ -220,7 +220,7 @@ class InfoBox
 					{
 						$boxname = $regs[1];
 						$module = $regs[2];
-						$sourcefile = dol_buildpath("/".$module."/inc/boxes/".$boxname.".php");
+						$sourcefile = dol_buildpath("/".$module."/includes/boxes/".$boxname.".php");
 					}
 					else
 					{
@@ -281,7 +281,7 @@ class InfoBox
 					{
 						$boxname = $regs[1];
 						$module = $regs[2];
-						$sourcefile = "/".$module."/inc/boxes/".$boxname.".php";
+						$sourcefile = "/".$module."/includes/boxes/".$boxname.".php";
 					}
 					else
 					{

htdocs/cashdesk/css/style.css

@@ -11,11 +11,10 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */ 
  
-/*	\version   $Id$ */
+/*	\version   $Id: style.css,v 1.4 2011/08/03 01:35:18 eldy Exp $ */
 
 body {
 	background: #eee;

htdocs/cashdesk/javascript/dhtml.js

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

htdocs/cashdesk/validation_verif.php

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

htdocs/compta/ajaxpayment.php

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

htdocs/compta/bank/bankid_fr.php

@@ -15,14 +15,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *  \file       htdocs/compta/bank/bankid_fr.php
  *  \ingroup    banque
  *  \brief      Fiche creation compte bancaire
- *  \version    $Id: bankid_fr.php,v 1.28 2011/07/31 22:23:20 eldy Exp $
+ *  \version    $Id: bankid_fr.php,v 1.27 2011/07/29 20:47:35 eldy Exp $
  */
 
 require("./pre.inc.php");
@@ -385,5 +386,5 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure
 
 $db->close();
 
-llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.28 $');
+llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.27 $');
 ?>

htdocs/compta/bank/fiche.php

@@ -15,14 +15,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	    \file       htdocs/compta/bank/fiche.php
  *      \ingroup    banque
  *		\brief      Page to create/view a bank account
- *		\version    $Id: fiche.php,v 1.78 2011/07/31 22:23:16 eldy Exp $
+ *		\version    $Id: fiche.php,v 1.77 2011/07/29 20:47:35 eldy Exp $
  */
 
 require("./pre.inc.php");
@@ -607,5 +608,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.78 $');
+llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.77 $');
 ?>

htdocs/compta/index.php

@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/compta/index.php
  *	\ingroup    compta
  *	\brief      Main page of accountancy area
- *	\version    $Id: index.php,v 1.183 2011/07/26 23:11:52 eldy Exp $
+ *	\version    $Id: index.php,v 1.184 2011/08/03 00:46:24 eldy Exp $
  */
 
 require('../main.inc.php');
@@ -1032,5 +1031,5 @@ print '</table>';
 $db->close();
 
 
-llxFooter('$Date: 2011/07/26 23:11:52 $ - $Revision: 1.183 $');
+llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.184 $');
 ?>

htdocs/compta/journal/sellsjournal.php

@@ -14,7 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 require("../../main.inc.php");
@@ -203,5 +204,5 @@ print "</table>";
 
 // End of page
 $db->close();
-llxFooter('$Date: 2011/07/31 22:08:25 $ - $Revision: 1.10 $');
+llxFooter('$Date: 2011/07/31 21:26:51 $ - $Revision: 1.9 $');
 ?>

htdocs/compta/paiement.php

@@ -16,15 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/compta/paiement.php
  *	\ingroup    compta
  *	\brief      Page to create a payment
- *	\version    $Id: paiement.php,v 1.112 2011/07/27 08:00:45 cdelambert Exp $
+ *	\version    $Id: paiement.php,v 1.113 2011/08/03 00:46:23 eldy Exp $
  */
 
 require('../main.inc.php');
@@ -673,5 +672,5 @@ if (! GETPOST('action'))
 
 $db->close();
 
-llxFooter('$Date: 2011/07/27 08:00:45 $ - $Revision: 1.112 $');
+llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.113 $');
 ?>

htdocs/compta/prelevement/create.php

@@ -15,13 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/compta/prelevement/create.php
  *	\brief      Prelevement
- *	\version    $Id: create.php,v 1.35 2011/07/31 22:23:29 eldy Exp $
+ *	\version    $Id: create.php,v 1.34 2011/07/29 21:15:39 eldy Exp $
  */
 
 require("../bank/pre.inc.php");
@@ -275,5 +276,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.35 $');
+llxFooter('$Date: 2011/07/29 21:15:39 $ - $Revision: 1.34 $');
 ?>

htdocs/contrat/fiche.php

@@ -23,7 +23,7 @@
  *       \file       htdocs/contrat/fiche.php
  *       \ingroup    contrat
  *       \brief      Page of a contract
- *       \version    $Id: fiche.php,v 1.197 2011/07/31 23:46:54 eldy Exp $
+ *       \version    $Id: fiche.php,v 1.198 2011/08/02 12:44:20 simnandez Exp $
  */
 
 require ("../main.inc.php");
@@ -757,7 +757,7 @@ else
 
 				$var=!$var;
 
-				if ($action != 'editline' || $_GET["rowid"] != $objp->rowid)
+				if ($_REQUEST["action"] != 'editline' || $_GET["rowid"] != $objp->rowid)
 				{
 					print '<tr '.$bc[$var].' valign="top">';
 					// Libelle
@@ -1286,5 +1286,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/31 23:46:54 $ - $Revision: 1.197 $');
+llxFooter('$Date: 2011/08/02 12:44:20 $ - $Revision: 1.198 $');
 ?>

htdocs/core/class/conf.class.php

@@ -16,7 +16,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.
  */
 
 /**
@@ -24,7 +25,7 @@
  *	\ingroup		core
  *  \brief      	File of class to manage storage of current setup
  *  				Config is stored into file conf.php
- *  \version    	$Id: conf.class.php,v 1.63 2011/07/31 23:45:13 eldy Exp $
+ *  \version    	$Id: conf.class.php,v 1.62 2011/07/30 10:23:26 eldy Exp $
  */
 
 

htdocs/core/class/cookie.class.php

@@ -12,13 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/core/class/cookie.class.php
  *	\ingroup    core
- *	\version	$Id: cookie.class.php,v 1.7 2011/07/31 23:45:13 eldy Exp $
+ *	\version	$Id: cookie.class.php,v 1.6 2011/07/30 08:56:26 eldy Exp $
  *	\brief      File of class to manage cookies
  */
 

htdocs/core/class/translate.class.php

@@ -23,7 +23,7 @@
  *		\brief      File for Tanslate class
  *		\author	    Eric Seigne
  *		\author	    Laurent Destailleur
- *		\version    $Id: translate.class.php,v 1.48 2011/07/31 23:45:14 eldy Exp $
+ *		\version    $Id: translate.class.php,v 1.49 2011/08/01 22:03:50 eldy Exp $
  */
 
 
@@ -512,9 +512,10 @@ class Translate {
 	 *  Return list of all available languages
 	 * 	@param		langdir		Directory to scan
 	 *  @param      maxlength   Max length for each value in combo box (will be truncated)
+	 *  @param		usecode		Show code instead of country name for language variant
 	 *  @return     array     	List of languages
 	 */
-	function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0)
+	function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0,$usecode=0)
 	{
 		global $conf;
 
@@ -527,7 +528,7 @@ class Translate {
 			{
 				$this->load("languages");
 
-				if (isset($conf->global->MAIN_SHOW_LANGUAGE_CODE) && $conf->global->MAIN_SHOW_LANGUAGE_CODE)
+				if ($usecode || ! empty($conf->global->MAIN_SHOW_LANGUAGE_CODE))
 				{
 					$langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir),$maxlength);
 				}

htdocs/filefunc.inc.php

@@ -20,14 +20,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/filefunc.inc.php
  * 	\ingroup	core
  *  \brief      File that include conf.php file and functions.lib.php
- *  \version    $Id: filefunc.inc.php,v 1.21 2011/07/31 23:19:04 eldy Exp $
+ *  \version    $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $
  */
 
 define('DOL_VERSION','3.1.0-beta');	// Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
@@ -64,7 +65,7 @@ $conffiletoshowshort = "conf.php";
 # Define localization of conf file
 $conffile = "conf/conf.php";
 $conffiletoshow = "htdocs/conf/conf.php";
-# For debian/redhat like systems
+# For debian like systems
 #$conffile = "/etc/dolibarr/conf.php";
 #$conffiletoshow = "/etc/dolibarr/conf.php";
 

htdocs/imports/import.php

@@ -13,14 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       htdocs/imports/import.php
  *      \ingroup    import
  *      \brief      Pages of import Wizard
- *      \version    $Id: import.php,v 1.69 2011/07/31 23:46:39 eldy Exp $
+ *      \version    $Id: import.php,v 1.68 2011/07/29 22:31:37 eldy Exp $
  */
 
 require_once("../main.inc.php");
@@ -1668,7 +1669,7 @@ print '<br>';
 
 $db->close();
 
-llxFooter('$Date: 2011/07/31 23:46:39 $ - $Revision: 1.69 $');
+llxFooter('$Date: 2011/07/29 22:31:37 $ - $Revision: 1.68 $');
 
 
 /*

htdocs/includes/modules/export/export_csv.modules.php

@@ -13,7 +13,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * or see http://www.gnu.org/
  */
 
 /**
@@ -21,7 +20,7 @@
  *		\ingroup    export
  *		\brief      File of class to build exports with CSV format
  *		\author	    Laurent Destailleur
- *		\version    $Id: export_csv.modules.php,v 1.30 2011/07/31 23:28:18 eldy Exp $
+ *		\version    $Id: export_csv.modules.php,v 1.31 2011/08/03 01:38:53 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php");
@@ -65,7 +64,7 @@ class ExportCsv extends ModeleExports
 		$this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape);
 		$this->extension='csv';         // Extension for generated file by this driver
 		$this->picto='mime/other';		// Picto
-		$ver=explode(' ','$Revision: 1.30 $');
+		$ver=explode(' ','$Revision: 1.31 $');
 		$this->version=$ver[2];         // Driver version
 
 		// If driver use an external library, put its name here

htdocs/includes/modules/export/export_excel.modules.php

@@ -13,7 +13,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * or see http://www.gnu.org/
  */
 
 /**
@@ -21,7 +20,7 @@
  *	\ingroup    export
  *	\brief      File of class to generate export file with Excel format
  *	\author	    Laurent Destailleur
- *	\version    $Id: export_excel.modules.php,v 1.27 2011/07/31 23:28:18 eldy Exp $
+ *	\version    $Id: export_excel.modules.php,v 1.28 2011/08/03 01:38:53 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php");
@@ -64,7 +63,7 @@ class ExportExcel extends ModeleExports
 		$this->desc='<b>Excel</b> file format (.xls)<br>This is native Excel 95 format.';
 		$this->extension='xls';             // Extension for generated file by this driver
         $this->picto='mime/xls';					// Picto
-		$ver=explode(' ','$Revision: 1.27 $');
+		$ver=explode(' ','$Revision: 1.28 $');
 		$this->version=$ver[2];             // Driver version
 
 		// If driver use an external library, put its name here

htdocs/includes/modules/export/export_tsv.modules.php

@@ -12,9 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-* or see http://www.gnu.org/
 */
 
 /**
@@ -22,7 +20,7 @@
  *		\ingroup    export
  *		\brief      File of class to build export files with format TSV
  *		\author	    Laurent Destailleur
- *		\version    $Id$
+ *		\version    $Id: export_tsv.modules.php,v 1.14 2011/08/03 01:38:52 eldy Exp $
 */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php");
@@ -61,7 +59,7 @@ class ExportTsv extends ModeleExports
         $this->desc='<b>Tab Separated Value</b> file format (.tsv)<br>This is a text file format where fields are separated by separator [tab].';
         $this->extension='tsv';         // Extension for generated file by this driver
         $this->picto='mime/other';		// Picto
-        $ver=explode(' ','$Revision$');
+        $ver=explode(' ','$Revision: 1.14 $');
         $this->version=$ver[2];         // Driver version
 
         // If driver use an external library, put its name here

htdocs/includes/modules/export/modules_export.php

@@ -14,14 +14,13 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * or see http://www.gnu.org/
  */
 
 /**
  *	\file       htdocs/includes/modules/export/modules_export.php
  *	\ingroup    export
  *	\brief      File of parent class for export modules
- *	\version    $Id: modules_export.php,v 1.24 2011/07/31 23:28:18 eldy Exp $
+ *	\version    $Id: modules_export.php,v 1.25 2011/08/03 01:38:52 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php');

htdocs/includes/modules/modWorkflow.class.php

@@ -19,7 +19,7 @@
 /**
  *      \defgroup   workflow     Module workflow
  *      \brief      Workflow management
- *      \version    $Id: modWorkflow.class.php,v 1.10 2011/07/31 23:28:10 eldy Exp $
+ *      \version    $Id: modWorkflow.class.php,v 1.11 2011/08/01 13:26:22 hregis Exp $
  */
 
 /**
@@ -68,7 +68,7 @@ class modWorkflow extends DolibarrModules
         // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
         $this->picto='technic';
 
-        // Defined if the directory /mymodule/inc/triggers/ contains triggers or not
+        // Defined if the directory /mymodule/includes/triggers/ contains triggers or not
         $this->triggers = 1;
 
         // Data directories to create when module is enabled

htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt

@@ -55,7 +55,7 @@ modified by someone else and passed on, the recipients should know
 that what they have is not the original version, so that the original
 author's reputation will not be affected by problems that might be
 introduced by others.
-
+
   Finally, software patents pose a constant threat to the existence of
 any free program.  We wish to make sure that a company cannot
 effectively restrict the users of a free program by obtaining a
@@ -484,8 +484,7 @@ convey the exclusion of warranty; and each file should have at least the
     Lesser General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
+    License along with this library; If not, see <http://www.gnu.org/licenses/>.
-    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.
 

htdocs/includes/php_writeexcel/LICENSE

@@ -484,8 +484,7 @@ convey the exclusion of warranty; and each file should have at least the
     Lesser General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
+    License along with this library; If not, see <http://www.gnu.org/licenses/>.
-    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.
 

htdocs/index.php

@@ -14,13 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/index.php
  *	\brief      Dolibarr home page
- *	\version    $Id: index.php,v 1.200 2011/07/31 23:19:05 eldy Exp $
+ *	\version    $Id: index.php,v 1.199 2011/07/30 10:23:24 eldy Exp $
  */
 
 define('NOCSRFCHECK',1);	// This is login page. We must be able to go on it from another web site.
@@ -573,7 +574,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING))
 
 $db->close();
 
-llxFooter('$Date: 2011/07/31 23:19:05 $ - $Revision: 1.200 $');
+llxFooter('$Date: 2011/07/30 10:23:24 $ - $Revision: 1.199 $');
 
 
 /**

htdocs/install/check.php

@@ -15,14 +15,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/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.87 2011/07/31 23:26:19 eldy Exp $
+ *	\version    $Id: check.php,v 1.86 2011/07/30 14:56:43 eldy Exp $
  */
 include_once("./inc.php");
 

htdocs/install/default.css

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

htdocs/install/etape0.php

@@ -14,14 +14,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/install/etape0.php
  *	\ingroup	install
  *	\brief      Show and ask charset for database
- *	\version    $Id: etape0.php,v 1.42 2011/07/31 23:26:25 eldy Exp $
+ *	\version    $Id: etape0.php,v 1.41 2011/07/30 14:56:43 eldy Exp $
  */
 
 define('DONOTLOADCONF',1);	// To avoid loading conf by file inc.php

htdocs/install/etape1.php

@@ -16,14 +16,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *		\file       htdocs/install/etape1.php
  *		\ingroup	install
  *		\brief      Build conf file on disk
- *		\version    $Id: etape1.php,v 1.136 2011/07/31 23:26:18 eldy Exp $
+ *		\version    $Id: etape1.php,v 1.135 2011/07/30 14:56:42 eldy Exp $
  */
 
 define('DONOTLOADCONF',1);	// To avoid loading conf by file inc.php

htdocs/install/etape2.php

@@ -13,14 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       htdocs/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.106 2011/07/31 23:26:19 eldy Exp $
+ *      \version    $Id: etape2.php,v 1.105 2011/07/30 14:56:43 eldy Exp $
  */
 
 include("./inc.php");

htdocs/install/etape4.php

@@ -15,14 +15,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/install/etape4.php
  *	\ingroup	install
  *	\brief      Ask login and password of Dolibarr admin user
- *	\version    $Id: etape4.php,v 1.38 2011/07/31 23:26:26 eldy Exp $
+ *	\version    $Id: etape4.php,v 1.37 2011/07/30 14:56:43 eldy Exp $
  */
 
 

htdocs/install/etape5.php

@@ -16,14 +16,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *       \file      htdocs/install/etape5.php
  *	 	 \ingroup	install
  *       \brief     Last page of upgrade or install process
- *       \version   $Id: etape5.php,v 1.107 2011/07/31 23:26:19 eldy Exp $
+ *       \version   $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $
  */
 
 include_once("./inc.php");

htdocs/install/fileconf.php

@@ -17,14 +17,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *       \file       htdocs/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.94 2011/07/31 23:26:27 eldy Exp $
+ *       \version    $Id: fileconf.php,v 1.93 2011/07/30 14:56:43 eldy Exp $
  */
 include_once("./inc.php");
 

htdocs/install/inc.php

@@ -15,13 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**	    \file       htdocs/install/inc.php
  * 		\ingroup	core
  *		\brief      File that define environment for install pages
- *		\version    $Id: inc.php,v 1.137 2011/07/31 23:26:18 eldy Exp $
+ *		\version    $Id: inc.php,v 1.136 2011/07/30 10:23:25 eldy Exp $
  */
 
 define('DOL_VERSION','3.1.0-beta');	// Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z)
@@ -74,12 +75,10 @@ $conffiletoshowshort = "conf.php";
 # Define localization of conf file
 $conffile = "../conf/conf.php";
 $conffiletoshow = "htdocs/conf/conf.php";
-$lockfile = '../../install.lock';
+# For debian like systems
-# 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))
 {
@@ -179,7 +178,7 @@ if (preg_match('/install.lock/i',$_SERVER["SCRIPT_FILENAME"]))
     }
 	exit;
 }
-if (file_exists($lockfile))
+if (file_exists('../../install.lock'))
 {
 	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))

htdocs/install/licence.php

@@ -13,14 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	 \file       htdocs/install/licence.php
  *   \ingroup    install
  *	 \brief      Page to show licence (Removed from install process to save time)
- *	 \version    $Id: licence.php,v 1.21 2011/07/31 23:26:22 eldy Exp $
+ *	 \version    $Id: licence.php,v 1.20 2011/07/30 14:56:42 eldy Exp $
  */
 
 include_once("./inc.php");

htdocs/install/mysql/data/llx_00_c_pays.sql

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

htdocs/install/mysql/data/llx_accounting.sql

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

htdocs/install/mysql/data/llx_c_action_trigger.sql

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

htdocs/install/mysql/data/llx_c_actioncomm.sql

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

htdocs/install/mysql/data/llx_c_availability.sql

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

htdocs/install/mysql/data/llx_c_barcode_type.sql

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

htdocs/install/mysql/data/llx_c_chargesociales.sql

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

htdocs/install/mysql/data/llx_c_civilite.sql

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

htdocs/install/mysql/data/llx_c_ecotaxe.sql

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

htdocs/install/mysql/data/llx_c_effectif.sql

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

htdocs/install/mysql/data/llx_c_forme_juridique.sql

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

htdocs/install/mysql/data/llx_c_input_method.sql

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

htdocs/install/mysql/data/llx_c_input_reason.sql

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

htdocs/install/mysql/data/llx_c_paiement.sql

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

htdocs/install/mysql/data/llx_c_paper_format.sql

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

htdocs/install/mysql/data/llx_c_payment_term.sql

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

htdocs/install/mysql/data/llx_c_propalst.sql

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

htdocs/install/mysql/data/llx_c_prospectlevel.sql

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

htdocs/install/mysql/data/llx_c_shipment_mode.sql

@@ -17,10 +17,9 @@
 -- GNU General Public License for more details.
 --
 -- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- $Id$
+-- $Id: llx_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:44 eldy Exp $
 --
 
 --
@@ -34,4 +33,4 @@
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1);
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1);
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0);
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre max','Courrier suivi et lettre max',0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max',0);

htdocs/install/mysql/data/llx_c_stcomm.sql

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

htdocs/install/mysql/data/llx_c_type_contact.sql

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

htdocs/install/mysql/data/llx_c_type_fees.sql

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

htdocs/install/mysql/data/llx_c_typent.sql

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

htdocs/install/mysql/data/llx_const.sql

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

htdocs/install/mysql/functions/functions.sql

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

htdocs/install/mysql/tables/llx_accountingaccount.key.sql

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

htdocs/install/mysql/tables/llx_accountingaccount.sql

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

htdocs/install/mysql/tables/llx_accountingdebcred.sql

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

htdocs/install/mysql/tables/llx_accountingsystem.sql

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

htdocs/install/mysql/tables/llx_accountingtransaction.sql

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

htdocs/install/mysql/tables/llx_actioncomm.key.sql

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

htdocs/install/mysql/tables/llx_actioncomm.sql

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

htdocs/install/mysql/tables/llx_adherent.key.sql

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

htdocs/install/mysql/tables/llx_adherent.sql

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

htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql

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

htdocs/install/mysql/tables/llx_adherent_extrafields.sql

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

htdocs/install/mysql/tables/llx_adherent_type.key.sql

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

htdocs/install/mysql/tables/llx_adherent_type.sql

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

htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql

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

htdocs/install/mysql/tables/llx_advanced_extrafields.sql

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

htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql

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

htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql

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

htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql

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

htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql

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

htdocs/install/mysql/tables/llx_bank.key.sql

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

htdocs/install/mysql/tables/llx_bank.sql

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

htdocs/install/mysql/tables/llx_bank_account.key.sql

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

htdocs/install/mysql/tables/llx_bank_account.sql

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