From 81064ee3d485a20ac563398c8f92cc7011b02b9f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 10 Jul 2011 21:17:14 +0000
Subject: [PATCH 01/91] Fix: Missing name on form


From 307ae14945a0bbff81c9da58c4d9dcd792988527 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 10 Jul 2011 22:45:44 +0000
Subject: [PATCH 02/91] Work on packaging RPM & DEB

---
 build/rpm/README        |   3 +-
 build/rpm/dolibarr.spec | 101 ++++++++++++++--------------------------
 2 files changed, 36 insertions(+), 68 deletions(-)

diff --git a/build/rpm/README b/build/rpm/README
index d868ed411b8..f2077ceac36 100644
--- a/build/rpm/README
+++ b/build/rpm/README
@@ -11,7 +11,6 @@ with format RPM (for Redhat, Mandriva, ...).
 # This is standard command to work on Debian packaging:
 #
 # On Fedora
-# rpm -i --test dolibarr-...rpm     To list dependencies of RPM   
 # yum install dolibarr-...rpm       To install package and dependencies   
 # yum erase dolibarr                To remove package   
 #
@@ -19,6 +18,6 @@ with format RPM (for Redhat, Mandriva, ...).
 # yast --install dolibarr-...rpm    To install package and dependencies
 # yast --remove  dolibarr           To remove package
 #
-# On Mageia (after su - root)
+# On Mageia
 # urpmi dolibarr-...rpm             To install package and dependencies
 # urpme dolibarr                    To remove package  
\ No newline at end of file
diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec
index 11090951bdd..a9003afcac3 100644
--- a/build/rpm/dolibarr.spec
+++ b/build/rpm/dolibarr.spec
@@ -19,32 +19,20 @@ Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
 Vendor: Dolibarr dev team
 
 URL: http://www.%{name}.org
+#Source: http://sourceforge.net/projects/%{name}/files/Dolibarr%20ERP-CRM/%{version}/%{name}-%{version}.tgz/download
 Source: /usr/src/RPM/SOURCES/%{name}-%{version}.tgz
 #BuildArch: noarch
 #BuildArchitectures: noarch
 BuildRoot: /tmp/%{name}-buildroot
 #Icon: dolibarr_logo1.gif
 
-# For Mandriva-Mageia
+# For Mandrake
 Group: Networking/WWW
 # For all other distrib
 Group: Applications/Internet
 
-# Requires can use lua to be defined dynamically (but still at build time) 
-# %{lua: if posix.access("/aaa") then print("Requires: bidon1 mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql") end }
-
-# Requires for Fedora-Redhat
 Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql 
-# Requires for OpenSuse
-#Requires: mysql-community-server mysql-community-server-client apache2 apache2-mod_php5 php5 php5-gd php5-ldap php5-imap php5-mysql php5-openssl 
-# Requires for Mandriva-Mageia
-#Requires: mysql mysql-client apache-base apache-mod_php php-cgi php-cli php-bz2 php-gd php-ldap php-imap php-mysqli php-openssl 
-
-#Requires(pre):
-#Requires(postun):
-
-# Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse)
-AutoReqProv: no
+AutoReqProv: yes
 
 
 %description
@@ -100,19 +88,32 @@ mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build
 mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc
 mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs
 mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts
+#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/dolibarr
+#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily
 
 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
+cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop
 
-install -m 444 README     $RPM_BUILD_ROOT/var/www/dolibarr/README
+install -m 444 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 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
 
+# menu
+#%{__install} -d $RPM_BUILD_ROOT%{_menudir}
+#%{__cat} <<EOF >$RPM_BUILD_ROOT%{_menudir}/%{name}
+#?package(%{name}):\
+#command="Dolibarr" \
+#section="Office" \
+#title="Dolibarr" \
+#icon="dolibarr_48x48.png" \
+#longtitle="Dolibarr ERP & CRM"
+#EOF
+
 
 #---- clean
 %clean
@@ -180,32 +181,19 @@ fi
 
 
 # Detect OS
-os='unknown';
+os='fedora';
 if [ -d %{_sysconfdir}/httpd/conf.d ]; then
-    export os='fedora-redhat';
+    export os='fedora';
     export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-    export apacheuser='apache';
-    export apachegroup='apache';
+    apacheuser='apache';
+    apachegroup='apache';
 fi
-if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then
+if [ -d %{_sysconfdir}/apache2/conf.d ]; then
     export os='opensuse';
     export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-    export apacheuser='wwwrun';
-    export apachegroup='www';
+    apacheuser='wwwrun';
+    apachegroup='wwwrun';
 fi
-if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then
-    export os='mageia-mandriva';
-    export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-    export apacheuser='apache';
-    export apachegroup='apache';
-fi
-if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -ge 1 ]; then
-    export os='ubuntu-debian';
-    export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-    export apacheuser='www-data';
-    export apachegroup='www-data';
-fi
-echo OS detected: $os
 
 # Create a config link dolibarr.conf for Fedora or Redhat
 if [ ! -f $conffile ]; then
@@ -226,11 +214,11 @@ chmod -R o-w $docdir
 if [ ! -s $targetdir/htdocs/conf/conf.php ]; then
     echo Create empty Dolibarr conf.php file
     touch $targetdir/htdocs/conf/conf.php
-    chown $apacheuser:$apachegroup $targetdir/htdocs/conf/conf.php
+    chown apache.apache $targetdir/htdocs/conf/conf.php
     chmod ug+rw $targetdir/htdocs/conf/conf.php
 fi
 
-if [ "x$os" = "xfedora-redhat" -a -s /usr/bin/chcon ]; then
+if [ "x$os" = "xfedora" -a -s /usr/bin/chcon ]; then
     echo Set SELinux permissions
     # Warning: chcon seems not cumulative 
     #chcon -R -h -t httpd_sys_content_t $targetdir
@@ -265,32 +253,16 @@ echo
 %clean_menus
 
 # Detect OS
-os='unknown';
+os='fedora';
 if [ -d %{_sysconfdir}/httpd/conf.d ]; then
-    export os='fedora-redhat';
+    export os='fedora';
     export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-    export apacheuser='apache';
-    export apachegroup='apache';
 fi
-if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then
+if [ -d %{_sysconfdir}/apache2/conf.d ]; then
     export os='opensuse';
     export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-    export apacheuser='wwwrun';
-    export apachegroup='www';
 fi
-if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then
-    export os='mageia-mandriva';
-    export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-    export apacheuser='apache';
-    export apachegroup='apache';
-fi
-if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -ge 1 ]; then
-    export os='ubuntu-debian';
-    export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-    export apacheuser='www-data';
-    export apachegroup='www-data';
-fi
-echo OS detected: $os
+
 
 # Dolibarr files are stored into /var/www
 export targetdir='/var/www/dolibarr'
@@ -316,12 +288,9 @@ then
     fi
 fi
 
-# Removed dirs after apache restart
-echo Removed remaining dirs
 rm -rf /etc/dolibarr
 rm -rf $targetdir/htdocs/conf
 rm -rf $targetdir/htdocs/install
-rmdir $targetdir/doc >/dev/null 2>&1
-rmdir $targetdir/htdocs >/dev/null 2>&1
+
 
 %changelog

From 074c13f6e8f99319fc08c93b0a6e8463e3ac4a15 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 11 Jul 2011 06:23:22 +0000
Subject: [PATCH 03/91] Fix: need complete object


From 587710d86e30b07dffbf5ce15b210a3e4c0fd440 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 11 Jul 2011 07:50:22 +0000
Subject: [PATCH 04/91] RPM works alos on ubuntu and debian

---
 build/rpm/dolibarr.spec | 57 +++++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 25 deletions(-)

diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec
index a9003afcac3..46c0b734ca3 100644
--- a/build/rpm/dolibarr.spec
+++ b/build/rpm/dolibarr.spec
@@ -32,7 +32,8 @@ Group: Networking/WWW
 Group: Applications/Internet
 
 Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql 
-AutoReqProv: yes
+# Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse)
+AutoReqProv: no
 
 
 %description
@@ -103,17 +104,6 @@ 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
 
-# menu
-#%{__install} -d $RPM_BUILD_ROOT%{_menudir}
-#%{__cat} <<EOF >$RPM_BUILD_ROOT%{_menudir}/%{name}
-#?package(%{name}):\
-#command="Dolibarr" \
-#section="Office" \
-#title="Dolibarr" \
-#icon="dolibarr_48x48.png" \
-#longtitle="Dolibarr ERP & CRM"
-#EOF
-
 
 #---- clean
 %clean
@@ -181,19 +171,26 @@ fi
 
 
 # Detect OS
-os='fedora';
+os='fedora-redhat';
 if [ -d %{_sysconfdir}/httpd/conf.d ]; then
-    export os='fedora';
+    export os='fedora-redhat';
     export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-    apacheuser='apache';
-    apachegroup='apache';
+    export apacheuser='apache';
+    export apachegroup='apache';
 fi
-if [ -d %{_sysconfdir}/apache2/conf.d ]; then
+if [ -d %{_sysconfdir}/apache2/conf.d -a `grep wwwrun /etc/passwd` ]; then
     export os='opensuse';
     export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-    apacheuser='wwwrun';
-    apachegroup='wwwrun';
+    export apacheuser='wwwrun';
+    export apachegroup='wwwrun';
 fi
+if [ -d %{_sysconfdir}/apache2/conf.d -a `grep www-data /etc/passwd` ]; then
+    export os='ubuntu-debian';
+    export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+    export apacheuser='www-data';
+    export apachegroup='www-data';
+fi
+echo OS detected: $os
 
 # Create a config link dolibarr.conf for Fedora or Redhat
 if [ ! -f $conffile ]; then
@@ -214,11 +211,11 @@ chmod -R o-w $docdir
 if [ ! -s $targetdir/htdocs/conf/conf.php ]; then
     echo Create empty Dolibarr conf.php file
     touch $targetdir/htdocs/conf/conf.php
-    chown apache.apache $targetdir/htdocs/conf/conf.php
+    chown $apacheuser:$apachegroup $targetdir/htdocs/conf/conf.php
     chmod ug+rw $targetdir/htdocs/conf/conf.php
 fi
 
-if [ "x$os" = "xfedora" -a -s /usr/bin/chcon ]; then
+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
@@ -253,16 +250,26 @@ echo
 %clean_menus
 
 # Detect OS
-os='fedora';
+os='fedora-redhat';
 if [ -d %{_sysconfdir}/httpd/conf.d ]; then
-    export os='fedora';
+    export os='fedora-redhat';
     export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+    export apacheuser='apache';
+    export apachegroup='apache';
 fi
-if [ -d %{_sysconfdir}/apache2/conf.d ]; then
+if [ -d %{_sysconfdir}/apache2/conf.d -a `grep wwwrun /etc/passwd` ]; then
     export os='opensuse';
     export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+    export apacheuser='wwwrun';
+    export apachegroup='wwwrun';
 fi
-
+if [ -d %{_sysconfdir}/apache2/conf.d -a `grep www-data /etc/passwd` ]; then
+    export os='ubuntu-debian';
+    export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+    export apacheuser='www-data';
+    export apachegroup='www-data';
+fi
+echo OS detected: $os
 
 # Dolibarr files are stored into /var/www
 export targetdir='/var/www/dolibarr'

From 6a6a7e678f0a0bed7451c940dc1b364c2febb708 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Mon, 11 Jul 2011 07:51:31 +0000
Subject: [PATCH 05/91] Trad: add possibility to force mail errors-to to all
 mails sent


From 1df669a86877830db16350d4bcbc2d013bf906ee Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 11 Jul 2011 08:36:11 +0000
Subject: [PATCH 06/91] Work on packaging RPM & DEB

---
 build/rpm/README        |  2 +-
 build/rpm/dolibarr.spec | 24 ++++++++++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/build/rpm/README b/build/rpm/README
index f2077ceac36..c072a212632 100644
--- a/build/rpm/README
+++ b/build/rpm/README
@@ -18,6 +18,6 @@ with format RPM (for Redhat, Mandriva, ...).
 # yast --install dolibarr-...rpm    To install package and dependencies
 # yast --remove  dolibarr           To remove package
 #
-# On Mageia
+# On Mageia (after su - root)
 # urpmi dolibarr-...rpm             To install package and dependencies
 # urpme dolibarr                    To remove package  
\ No newline at end of file
diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec
index 46c0b734ca3..b3aaca1d494 100644
--- a/build/rpm/dolibarr.spec
+++ b/build/rpm/dolibarr.spec
@@ -171,20 +171,26 @@ fi
 
 
 # Detect OS
-os='fedora-redhat';
+os='unknown';
 if [ -d %{_sysconfdir}/httpd/conf.d ]; then
     export os='fedora-redhat';
     export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
     export apacheuser='apache';
     export apachegroup='apache';
 fi
-if [ -d %{_sysconfdir}/apache2/conf.d -a `grep wwwrun /etc/passwd` ]; then
+if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then
     export os='opensuse';
     export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
     export apacheuser='wwwrun';
     export apachegroup='wwwrun';
 fi
-if [ -d %{_sysconfdir}/apache2/conf.d -a `grep www-data /etc/passwd` ]; then
+if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then
+    export os='mageia-mandriva';
+    export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+    export apacheuser='apache';
+    export apachegroup='apache';
+fi
+if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -ge 1 ]; then
     export os='ubuntu-debian';
     export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
     export apacheuser='www-data';
@@ -250,20 +256,26 @@ echo
 %clean_menus
 
 # Detect OS
-os='fedora-redhat';
+os='unknown';
 if [ -d %{_sysconfdir}/httpd/conf.d ]; then
     export os='fedora-redhat';
     export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
     export apacheuser='apache';
     export apachegroup='apache';
 fi
-if [ -d %{_sysconfdir}/apache2/conf.d -a `grep wwwrun /etc/passwd` ]; then
+if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then
     export os='opensuse';
     export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
     export apacheuser='wwwrun';
     export apachegroup='wwwrun';
 fi
-if [ -d %{_sysconfdir}/apache2/conf.d -a `grep www-data /etc/passwd` ]; then
+if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then
+    export os='mageia-mandriva';
+    export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+    export apacheuser='apache';
+    export apachegroup='apache';
+fi
+if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -ge 1 ]; then
     export os='ubuntu-debian';
     export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
     export apacheuser='www-data';

From 53be6c078478e9d975c5ea17934d05c3cee7f1db Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Mon, 11 Jul 2011 08:38:02 +0000
Subject: [PATCH 07/91] Fix: Missing translation


From 14acb898786681d14b6da0300cc164346e897f21 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 11 Jul 2011 08:54:57 +0000
Subject: [PATCH 08/91] Work on packaging RPM & DEB

---
 build/deb/apache.conf         | 2 +-
 build/rpm/httpd-dolibarr.conf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/deb/apache.conf b/build/deb/apache.conf
index fa29149ee59..cfedcbc4dbb 100644
--- a/build/deb/apache.conf
+++ b/build/deb/apache.conf
@@ -4,7 +4,7 @@
 Alias /dolibarr /usr/share/dolibarr/htdocs
 </IfModule>
 
-# You can also use dolibarr as a VirtualHost
+# You can also use phpLDAPadmin as a VirtualHost
 # <VirtualHost *:*>
 #     ServerName mydolibarrhostname.com
 #     ServerAdmin root@example.com
diff --git a/build/rpm/httpd-dolibarr.conf b/build/rpm/httpd-dolibarr.conf
index 4a395f235a2..e1fcb3f77e5 100644
--- a/build/rpm/httpd-dolibarr.conf
+++ b/build/rpm/httpd-dolibarr.conf
@@ -4,7 +4,7 @@
 Alias /dolibarr /var/www/dolibarr/htdocs
 </IfModule>
 
-# You can also use dolibarr as a VirtualHost
+# You can also use phpLDAPadmin as a VirtualHost
 # <VirtualHost *:*>
 #     ServerName mydolibarrhostname.com
 #     ServerAdmin root@example.com

From d33c801ccec7c544af1b64538c7d38d5c8cfd02e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 11 Jul 2011 08:55:53 +0000
Subject: [PATCH 09/91] Work on packaging RPM & DEB

---
 build/deb/apache.conf         | 2 +-
 build/rpm/httpd-dolibarr.conf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/deb/apache.conf b/build/deb/apache.conf
index cfedcbc4dbb..fa29149ee59 100644
--- a/build/deb/apache.conf
+++ b/build/deb/apache.conf
@@ -4,7 +4,7 @@
 Alias /dolibarr /usr/share/dolibarr/htdocs
 </IfModule>
 
-# You can also use phpLDAPadmin as a VirtualHost
+# You can also use dolibarr as a VirtualHost
 # <VirtualHost *:*>
 #     ServerName mydolibarrhostname.com
 #     ServerAdmin root@example.com
diff --git a/build/rpm/httpd-dolibarr.conf b/build/rpm/httpd-dolibarr.conf
index e1fcb3f77e5..4a395f235a2 100644
--- a/build/rpm/httpd-dolibarr.conf
+++ b/build/rpm/httpd-dolibarr.conf
@@ -4,7 +4,7 @@
 Alias /dolibarr /var/www/dolibarr/htdocs
 </IfModule>
 
-# You can also use phpLDAPadmin as a VirtualHost
+# You can also use dolibarr as a VirtualHost
 # <VirtualHost *:*>
 #     ServerName mydolibarrhostname.com
 #     ServerAdmin root@example.com

From 3b26ad762183a93323a1911880965abd697b4a3a Mon Sep 17 00:00:00 2001
From: cdelambert <cdelambert>
Date: Mon, 11 Jul 2011 09:32:35 +0000
Subject: [PATCH 10/91] Correction paiement Ajax


From 57531c1463cb4f65bbc259ee697e38ced9c83309 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Mon, 11 Jul 2011 10:41:29 +0000
Subject: [PATCH 11/91] Trad: add translation


From 11b539928305572983ae9de652b893cad4128eb9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 11 Jul 2011 10:53:37 +0000
Subject: [PATCH 12/91] Fix: Removed install warning


From 127a1003b4be4805b5c9d411111f8af23e30f259 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 11 Jul 2011 11:09:02 +0000
Subject: [PATCH 13/91] Work on packaging RPM & DEB


From 16964c42ec6fd01b80da046a59f1f5f2506f8460 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 11 Jul 2011 12:31:38 +0000
Subject: [PATCH 14/91] Work on packaging RPM & DEB

---
 build/rpm/dolibarr.spec | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec
index b3aaca1d494..44051435047 100644
--- a/build/rpm/dolibarr.spec
+++ b/build/rpm/dolibarr.spec
@@ -31,7 +31,13 @@ Group: Networking/WWW
 # For all other distrib
 Group: Applications/Internet
 
+# Requires for Fedora-Redhat
 Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql 
+# Requires for OpenSuse
+#Requires: mysql-community-server mysql-community-server-client apache2 apache2-mod_php5 php5 php5-gd php5-ldap php5-imap php5-mysql php5-openssl 
+# Requires for Mageia
+#Requires: mysql mysql-client apache-base apache-mod_php php-cgi php-cli php-bz2 php-gd php-ldap php-imap php-mysqli php-openssl 
+
 # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse)
 AutoReqProv: no
 
@@ -182,7 +188,7 @@ if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge
     export os='opensuse';
     export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
     export apacheuser='wwwrun';
-    export apachegroup='wwwrun';
+    export apachegroup='www';
 fi
 if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then
     export os='mageia-mandriva';
@@ -267,7 +273,7 @@ if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge
     export os='opensuse';
     export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
     export apacheuser='wwwrun';
-    export apachegroup='wwwrun';
+    export apachegroup='www';
 fi
 if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then
     export os='mageia-mandriva';
@@ -307,9 +313,12 @@ then
     fi
 fi
 
+# Removed dirs after apache restart
+echo Removed remaining dirs
 rm -rf /etc/dolibarr
 rm -rf $targetdir/htdocs/conf
 rm -rf $targetdir/htdocs/install
-
+rmdir $targetdir/doc >/dev/null 2>&1
+rmdir $targetdir/htdocs >/dev/null 2>&1
 
 %changelog

From ee5abb1886d3f01fddb4f1295d73edbc3cfd7876 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 11 Jul 2011 21:16:25 +0000
Subject: [PATCH 15/91] Work on packaging RPM & DEB

---
 build/rpm/README        |  1 +
 build/rpm/dolibarr.spec | 23 +++++++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/build/rpm/README b/build/rpm/README
index c072a212632..d868ed411b8 100644
--- a/build/rpm/README
+++ b/build/rpm/README
@@ -11,6 +11,7 @@ with format RPM (for Redhat, Mandriva, ...).
 # This is standard command to work on Debian packaging:
 #
 # On Fedora
+# rpm -i --test dolibarr-...rpm     To list dependencies of RPM   
 # yum install dolibarr-...rpm       To install package and dependencies   
 # yum erase dolibarr                To remove package   
 #
diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec
index 44051435047..11090951bdd 100644
--- a/build/rpm/dolibarr.spec
+++ b/build/rpm/dolibarr.spec
@@ -19,25 +19,30 @@ Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
 Vendor: Dolibarr dev team
 
 URL: http://www.%{name}.org
-#Source: http://sourceforge.net/projects/%{name}/files/Dolibarr%20ERP-CRM/%{version}/%{name}-%{version}.tgz/download
 Source: /usr/src/RPM/SOURCES/%{name}-%{version}.tgz
 #BuildArch: noarch
 #BuildArchitectures: noarch
 BuildRoot: /tmp/%{name}-buildroot
 #Icon: dolibarr_logo1.gif
 
-# For Mandrake
+# For Mandriva-Mageia
 Group: Networking/WWW
 # For all other distrib
 Group: Applications/Internet
 
+# Requires can use lua to be defined dynamically (but still at build time) 
+# %{lua: if posix.access("/aaa") then print("Requires: bidon1 mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql") end }
+
 # Requires for Fedora-Redhat
 Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql 
 # Requires for OpenSuse
 #Requires: mysql-community-server mysql-community-server-client apache2 apache2-mod_php5 php5 php5-gd php5-ldap php5-imap php5-mysql php5-openssl 
-# Requires for Mageia
+# Requires for Mandriva-Mageia
 #Requires: mysql mysql-client apache-base apache-mod_php php-cgi php-cli php-bz2 php-gd php-ldap php-imap php-mysqli php-openssl 
 
+#Requires(pre):
+#Requires(postun):
+
 # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse)
 AutoReqProv: no
 
@@ -95,19 +100,17 @@ mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build
 mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc
 mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs
 mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts
-#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/dolibarr
-#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily
 
 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
+cp build/rpm/dolibarr.desktop    $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop
 
-install -m 444 README  $RPM_BUILD_ROOT/var/www/dolibarr/README
+install -m 444 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 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
 
 

From 2df5774614c1fdee740c1a6331bf0423a548aa10 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 12 Jul 2011 07:17:11 +0000
Subject: [PATCH 16/91] Fix: Uniformise code


From 9d9e4863ed9088597b6dff9405149e4afe2b3e63 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Tue, 12 Jul 2011 08:07:59 +0000
Subject: [PATCH 17/91] Fix: update jstree plugin


From 0fab06d0685795f3dba8b59e4bb59b14a0a6ef5b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 12 Jul 2011 20:16:03 +0000
Subject: [PATCH 18/91] Fix: Upgrade detection fails


From 5f07141f1001e19e999ea128489cf416dc9331ec Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 12 Jul 2011 20:48:08 +0000
Subject: [PATCH 19/91] Fix: Upgrade detection fails

---
 htdocs/install/check.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 9de8cdf662d..0f6034488dd 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -23,7 +23,7 @@
  *	\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.84 2011/07/12 20:52:41 eldy Exp $
+ *	\version    $Id: check.php,v 1.83 2011/07/12 20:48:08 eldy Exp $
  */
 include_once("./inc.php");
 
@@ -393,7 +393,7 @@ else
             $dolibarrversiontoarray=preg_split('/[\.-]/',$versionto);
             $version=preg_split('/[\.-]/',DOL_VERSION);
             $newversionfrombis='';
-            if (versioncompare($dolibarrversiontoarray,$version) < -2) $newversionfrombis='/'.$versionto;
+            if (versioncompare($dolibarrversiontoarray,$version) < 2) $newversionfrombis='/'.$versionto;
 			print '<tr><td nowrap="nowrap" align="center"><b>'.$langs->trans("Upgrade").'<br>'.$newversionfrom.' -> '.$newversionto.'</b></td>';
 			print '<td>';
 			print $langs->trans("UpgradeDesc");

From 4454aea328128c91d32789ecea1a070651e7923b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 12 Jul 2011 20:52:41 +0000
Subject: [PATCH 20/91] Fix: Upgrade detection fails

---
 htdocs/install/check.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 0f6034488dd..9de8cdf662d 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -23,7 +23,7 @@
  *	\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.83 2011/07/12 20:48:08 eldy Exp $
+ *	\version    $Id: check.php,v 1.84 2011/07/12 20:52:41 eldy Exp $
  */
 include_once("./inc.php");
 
@@ -393,7 +393,7 @@ else
             $dolibarrversiontoarray=preg_split('/[\.-]/',$versionto);
             $version=preg_split('/[\.-]/',DOL_VERSION);
             $newversionfrombis='';
-            if (versioncompare($dolibarrversiontoarray,$version) < 2) $newversionfrombis='/'.$versionto;
+            if (versioncompare($dolibarrversiontoarray,$version) < -2) $newversionfrombis='/'.$versionto;
 			print '<tr><td nowrap="nowrap" align="center"><b>'.$langs->trans("Upgrade").'<br>'.$newversionfrom.' -> '.$newversionto.'</b></td>';
 			print '<td>';
 			print $langs->trans("UpgradeDesc");

From 07e9d536779b86e03c3e7090a160496be67533cd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 12 Jul 2011 21:07:24 +0000
Subject: [PATCH 21/91] Fix: Type of amount


From 5cdd39678080e898815c655afa39e8e5c36768c0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 12 Jul 2011 22:03:44 +0000
Subject: [PATCH 22/91] Fix: Add civility for all peopal tables


From ce84439052d67368e8968b1075182e2f273b2883 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 12 Jul 2011 22:12:12 +0000
Subject: [PATCH 23/91] Fix: Add civility for all peopal tables


From 295bc37dcecf92b2fee7ebd335c8bd1978784913 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 12 Jul 2011 22:19:02 +0000
Subject: [PATCH 24/91] Fix: Attachment fails if content was empty


From 3751ba4aa415c56abe0049b6817ef146bd5cdf7e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 12 Jul 2011 20:52:41 +0000
Subject: [PATCH 25/91] Fix: Upgrade detection fails


From 1d6dd2a22d1ac7984e5a83f1b85ee7040736b22f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 12 Jul 2011 21:07:24 +0000
Subject: [PATCH 26/91] Fix: Type of amount


From f7181cf6d6fc134160c6248fbcc333a9c4e12ae8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 12 Jul 2011 22:03:44 +0000
Subject: [PATCH 27/91] Fix: Add civility for all peopal tables


From 62f60d73888c10180ba5b5ba8c646501a556b113 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 12 Jul 2011 22:12:12 +0000
Subject: [PATCH 28/91] Fix: Add civility for all peopal tables


From 1f5a03aa8aed54f01cf1f6f4f6d523d8531c82ca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 12 Jul 2011 22:19:02 +0000
Subject: [PATCH 29/91] Fix: Attachment fails if content was empty


From a08e81b77b3408420e46fdb32a76ce7ef79567d7 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Wed, 13 Jul 2011 07:38:10 +0000
Subject: [PATCH 30/91] Fix: possibility to split buttons and files view

---
 htdocs/core/class/html.formfile.class.php     | 12 ++++--
 .../fileupload/jquery.fileupload-ui.js        | 40 ++++++++++++++-----
 2 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 5d928870560..cfd46212a10 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -22,7 +22,7 @@
  *	\file       htdocs/core/class/html.formfile.class.php
  *  \ingroup    core
  *	\brief      File of class to offer components to list and upload files
- *	\version	$Id: html.formfile.class.php,v 1.47 2011/07/10 21:17:14 eldy Exp $
+ *	\version	$Id: html.formfile.class.php,v 1.48 2011/07/13 07:38:11 hregis Exp $
  */
 
 
@@ -845,8 +845,12 @@ class FormFile
 		print '<button type="submit" class="start">'.$langs->trans('StartUpload').'</button>';
 		print '<button type="reset" class="cancel">'.$langs->trans('CancelUpload').'</button>';
 		print '</div></form>';
+		
+		print '</div><!-- end div fileupload -->';
+		
+		print '<div id="fileupload-view">';
 		print '<div class="fileupload-content">';
-
+		
 		print '<table width="100%" class="files">';
 		/*print '<tr>';
 		print '<td>'.$langs->trans("Documents2").'</td>';
@@ -859,8 +863,8 @@ class FormFile
 		// We remove this because there is already individual bars.
 		//print '<div class="fileupload-progressbar"></div>';
 
-		print '</div>';
-		print '</div>';
+		print '</div><!-- end div fileupload-content -->';
+		print '</div><!-- end div fileupload-view -->';
 
 		// Include template
 		include(DOL_DOCUMENT_ROOT.'/core/tpl/ajaxfileupload.tpl.php');
diff --git a/htdocs/includes/jquery/plugins/fileupload/jquery.fileupload-ui.js b/htdocs/includes/jquery/plugins/fileupload/jquery.fileupload-ui.js
index 46b78e29962..291f5dbb5ed 100644
--- a/htdocs/includes/jquery/plugins/fileupload/jquery.fileupload-ui.js
+++ b/htdocs/includes/jquery/plugins/fileupload/jquery.fileupload-ui.js
@@ -65,7 +65,9 @@
                 data.isAdjusted = true;
                 data.isValidated = that._validate(data.files);
                 data.context = that._renderUpload(data.files)
-                    .appendTo($(this).find('.files')).fadeIn(function () {
+                    // DOL_CHANGE
+                	//.appendTo($(this).find('.files')).fadeIn(function () {
+                    .appendTo($('#fileupload-view').find('.files')).fadeIn(function () {
                         // Fix for IE7 and lower:
                         $(this).show();
                     }).data('data', data);
@@ -119,7 +121,9 @@
                 } else {
                     that._renderDownload(data.result)
                         .css('display', 'none')
-                        .appendTo($(this).find('.files'))
+                        // DOL_CHANGE
+                        //.appendTo($(this).find('.files'))
+                        .appendTo($('#fileupload-view').find('.files'))
                         .fadeIn(function () {
                             // Fix for IE7 and lower:
                             $(this).show();
@@ -153,7 +157,9 @@
                     that._adjustMaxNumberOfFiles(-data.files.length);
                     data.context = that._renderUpload(data.files)
                         .css('display', 'none')
-                        .appendTo($(this).find('.files'))
+                        // DOL_CHANGE
+                        //.appendTo($(this).find('.files'))
+                        .appendTo($('#fileupload-view').find('.files'))
                         .fadeIn(function () {
                             // Fix for IE7 and lower:
                             $(this).show();
@@ -487,7 +493,9 @@
         
         _initEventHandlers: function () {
             $.blueimp.fileupload.prototype._initEventHandlers.call(this);
-            var filesList = this.element.find('.files'),
+            // DOL_CHANGE
+            //var filesList = this.element.find('.files'),
+            var filesList = $('#fileupload-view').find('.files'),
                 eventData = {fileupload: this};
             filesList.find('.start button')
                 .live(
@@ -510,7 +518,9 @@
         },
         
         _destroyEventHandlers: function () {
-            var filesList = this.element.find('.files');
+        	// DOL_CHANGE
+            //var filesList = this.element.find('.files'),
+            var filesList = $('#fileupload-view').find('.files');
             filesList.find('.start button')
                 .die('click.' + this.options.namespace);
             filesList.find('.cancel button')
@@ -522,7 +532,9 @@
 
         _initFileUploadButtonBar: function () {
             var fileUploadButtonBar = this.element.find('.fileupload-buttonbar'),
-                filesList = this.element.find('.files'),
+            	// DOL_CHANGE
+            	//filesList = this.element.find('.files'),
+            	filesList = $('#fileupload-view').find('.files'),
                 ns = this.options.namespace;
             fileUploadButtonBar
                 .addClass('ui-widget-header ui-corner-top');
@@ -607,16 +619,24 @@
             this.element
                 .addClass('ui-widget');
             this._initFileUploadButtonBar();
-            this.element.find('.fileupload-content')
+            // DOL_CHANGE
+            //this.element.find('.fileupload-content')
+            $('#fileupload-view').find('.fileupload-content')
                 .addClass('ui-widget-content ui-corner-bottom');
-            this.element.find('.fileupload-progressbar')
+            // DOL_CHANGE
+            //this.element.find('.fileupload-progressbar')
+            $('#fileupload-view').find('.fileupload-progressbar')
                 .hide().progressbar();
         },
         
         destroy: function () {
-            this.element.find('.fileupload-progressbar')
+        	// DOL_CHANGE
+            //this.element.find('.fileupload-progressbar')
+        	$('#fileupload-view').find('.fileupload-progressbar')
                 .progressbar('destroy');
-            this.element.find('.fileupload-content')
+        	// DOL_CHANGE
+            //this.element.find('.fileupload-content')
+        	$('#fileupload-view').find('.fileupload-content')
                 .removeClass('ui-widget-content ui-corner-bottom');
             this._destroyFileUploadButtonBar();
             this.element.removeClass('ui-widget');

From e8f9d5cb99dd9b97aeb23cb1d9fcfd6818b15886 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 08:57:21 +0000
Subject: [PATCH 31/91] Restore hidden param to enable feature for the release
 3.1. I suggest to test it during on version untill making it visible by
 default.

---
 htdocs/compta/paiement.php | 58 +++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 64eaea3a7f4..68419253c60 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -24,7 +24,7 @@
  *	\file       htdocs/compta/paiement.php
  *	\ingroup    compta
  *	\brief      Page to create a payment
- *	\version    $Id: paiement.php,v 1.110 2011/07/11 09:32:35 cdelambert Exp $
+ *	\version    $Id: paiement.php,v 1.111 2011/07/13 08:57:21 eldy Exp $
  */
 
 require('../main.inc.php');
@@ -253,7 +253,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
         	if (! empty($conf->global->PAYPAL_BANK_ACCOUNT)) $accountid=$conf->global->PAYPAL_BANK_ACCOUNT;
         	$paymentnum=$facture->ref_int;
         }
-        if ($conf->use_javascript_ajax)
+        if ($conf->use_javascript_ajax && !empty($conf->global->MAIN_JS_ON_PAYMENT))
         {
             print "\n".'<script type="text/javascript" language="javascript">';
             print 'jQuery(document).ready(function () {';
@@ -272,32 +272,32 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                                 jQuery(\'.fieldrequireddyn\').removeClass(\'fieldrequired\');
                             }
                         });
-        			
+
         			function elemToJson(selector)
             		{
             			var subJson = {};
             			jQuery.map(selector.serializeArray(), function(n,i)
             			{
             				subJson[n["name"]] = n["value"];
-            			}); 
-            			return subJson;        			
+            			});
+            			return subJson;
             		}
             		function callForResult(imgId)
             		{
             		    var json = {};
 		            	var form = jQuery("#payment_form");
-		            	
-		            	json["amountPayment"] = jQuery("#amountpayment").attr("value");            			
+
+		            	json["amountPayment"] = jQuery("#amountpayment").attr("value");
 		            	json["amounts"] = elemToJson(form.find("input[name*=\"amount_\"]"));
-		            	json["remains"] = elemToJson(form.find("input[name*=\"remain_\"]")); 
+		            	json["remains"] = elemToJson(form.find("input[name*=\"remain_\"]"));
 		            	if(imgId != null)json["imgClicked"] = imgId;
-		            	           				
+
             			jQuery.post("ajaxpayment.php", json, function(data)
             			{
-            				json = jQuery.parseJSON(data); 
-            				
+            				json = jQuery.parseJSON(data);
+
             				form.data(json);
-            				            				
+
             				for(var key in json)
             				{
             					if(key == "result")	{
@@ -307,31 +307,31 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
             						} else {
             							jQuery("#"+key).removeAttr("style");
             						}
-            					} else {            					
+            					} else {
             						form.find("input[name*=\""+key+"\"]").each(function() {
             							jQuery(this).attr("value", json[key]);
             						});
-            					}          				
-            				}            				
+            					}
+            				}
             			});
-            			
-            		}  
-            		function callToBreakdown(imgSelector) {        			
+
+            		}
+            		function callToBreakdown(imgSelector) {
 		            	var form = jQuery("#payment_form"), imgId;
-		            	
+
 		            	imgId =  imgSelector.attr("id");
 		            	callForResult(imgId);
             		}
 
             		jQuery("#payment_form").find("img").click(function() {
             				callToBreakdown(jQuery(this));
-                    	}); 
-                    	
-            			jQuery("#payment_form").find("input[name*=\"amount_\"]").change(function() {  
+                    	});
+
+            			jQuery("#payment_form").find("input[name*=\"amount_\"]").change(function() {
             				callForResult();
-                    	}); 
-                    	            		
-            			jQuery("#amountpayment").change(function() {  
+                    	});
+
+            			jQuery("#amountpayment").change(function() {
             				callForResult();
                     	});
              	});
@@ -371,7 +371,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
         print '</tr>';
 
         // Payment amount
-        if ($conf->use_javascript_ajax)
+        if ($conf->use_javascript_ajax && !empty($conf->global->MAIN_JS_ON_PAYMENT))
         {
             print '<tr><td><span class="fieldrequired">'.$langs->trans('AmountPayment').'</span></td>';
             print '<td>';
@@ -460,7 +460,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                 print '<td align="right">'.$langs->trans('RemainderToPay').'</td>';
                 print '<td align="right">'.$langs->trans('PaymentAmount').'</td>';
                 print '<td align="right">&nbsp;</td>';
-                print "</tr>\n";  
+                print "</tr>\n";
 
                 $var=True;
                 $total=0;
@@ -512,7 +512,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
                     if ($action != 'add_paiement')
                     {
-                        if ($conf->use_javascript_ajax)
+                        if ($conf->use_javascript_ajax && !empty($conf->global->MAIN_JS_ON_PAYMENT))
                         {
                             print img_picto($langs->trans('AddRemind'),'rightarrow.png','id="'.$objp->facid.'" "');
                         }
@@ -671,5 +671,5 @@ if (! GETPOST('action'))
 
 $db->close();
 
-llxFooter('$Date: 2011/07/11 09:32:35 $ - $Revision: 1.110 $');
+llxFooter('$Date: 2011/07/13 08:57:21 $ - $Revision: 1.111 $');
 ?>

From b2c9aedbcf575693570834d30c4c15aa78e33d32 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 10:22:54 +0000
Subject: [PATCH 32/91] Fix: Only one message

---
 htdocs/public/members/new.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 5675d02c4c7..035e8848da4 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -22,7 +22,7 @@
  *	\file       htdocs/public/members/new.php
  *	\ingroup    member
  *	\brief      Example of form to add a new member
- *	\version    $Id: new.php,v 1.39 2011/07/05 08:33:34 eldy Exp $
+ *	\version    $Id: new.php,v 1.40 2011/07/13 10:22:54 eldy Exp $
  *
  *  Note that you can add following constant to change behaviour of page
  *  MEMBER_NEWFORM_AMOUNT               Default amount for autosubscribe form
@@ -280,7 +280,7 @@ if ($action == 'added')
     print $langs->trans("NewMemberbyWeb");
     print '</center>';
 
-    llxFooterVierge('$Date: 2011/07/05 08:33:34 $ - $Revision: 1.39 $');
+    llxFooterVierge('$Date: 2011/07/13 10:22:54 $ - $Revision: 1.40 $');
     exit;
 }
 
@@ -301,8 +301,8 @@ llxHeaderVierge($langs->trans("NewSubscription"));
 
 print_titre($langs->trans("NewSubscription"));
 
-print $langs->trans("NewSubscriptionDesc").'<br>';
 if (! empty($conf->global->MEMBER_NEWFORM_TEXT)) print $langs->trans($conf->global->MEMBER_NEWFORM_TEXT)."<br>\n";
+else print $langs->trans("NewSubscriptionDesc",$conf->global->MAIN_INFO_SOCIETE_MAIL)."<br>\n";
 
 dol_htmloutput_errors($errmsg);
 
@@ -528,5 +528,5 @@ print "<br></form>\n";
 
 $db->close();
 
-llxFooterVierge('$Date: 2011/07/05 08:33:34 $ - $Revision: 1.39 $');
+llxFooterVierge('$Date: 2011/07/13 10:22:54 $ - $Revision: 1.40 $');
 ?>

From a26a2f942127dd9fd14b76b31a2533172e627876 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 10:23:05 +0000
Subject: [PATCH 33/91] Fix: Missing email

---
 htdocs/langs/en_US/members.lang | 2 +-
 htdocs/langs/fr_FR/members.lang | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 95e4eb7cddc..3e03924e697 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -76,7 +76,7 @@ EditMember=Edit member
 SubscriptionEndDate=Subscription's end date
 MembersTypeSetup=Members type setup
 NewSubscription=New subscription
-NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead. 
+NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s. 
 Subscription=Subscription
 Subscriptions=Subscriptions
 SubscriptionLate=Late
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 4773e0d4b77..95531c67c0e 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -75,9 +75,12 @@ NewCotisation=Nouvelle adhésion
 PaymentSubscription=Paiement cotisation
 EditMember=Édition adhérent
 SubscriptionEndDate=Date de fin adhésion
+NewAttribute=Nouvel attribut
+AttributeCode=Code de l'attribut
+OptionalFieldsSetup=Configuration des champs optionnels
 MembersTypeSetup=Configuration des types d'adhérents
 NewSubscription=Nouvelle adhésion
-NewSubscriptionDesc=Ce formulaire permet de vous enregistrer comme nouvel adhérent de l'association. Pour un renouvellement si vous êtes déjà adhérent, contacter plutôt l'association.
+NewSubscriptionDesc=Ce formulaire permet de vous enregistrer comme nouvel adhérent de l'association. Pour un renouvellement si vous êtes déjà adhérent, contacter plutôt l'association par mail %s.
 Subscription=Adhésion/cotisation
 Subscriptions=Adhésions/cotisations
 SubscriptionLate=En retard

From cab1483dc947e2d72c7ca573b80cf1566b446926 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 11:14:43 +0000
Subject: [PATCH 34/91] Fix: Message for payment forms

---
 htdocs/public/members/new.php       | 31 +++++++++++++++++++----------
 htdocs/public/paybox/newpayment.php | 19 ++++++++++++------
 htdocs/public/paypal/newpayment.php | 17 +++++++++++-----
 3 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 035e8848da4..d461137eaf6 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -22,7 +22,7 @@
  *	\file       htdocs/public/members/new.php
  *	\ingroup    member
  *	\brief      Example of form to add a new member
- *	\version    $Id: new.php,v 1.40 2011/07/13 10:22:54 eldy Exp $
+ *	\version    $Id: new.php,v 1.41 2011/07/13 11:14:43 eldy Exp $
  *
  *  Note that you can add following constant to change behaviour of page
  *  MEMBER_NEWFORM_AMOUNT               Default amount for autosubscribe form
@@ -182,13 +182,18 @@ if ($action == 'add')
         $langs->load("errors");
         $errmsg .= $langs->trans("ErrorBadDateFormat")."<br>\n";
     }
-    if (isset($public))
+    if (! empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER))
     {
-        $public=1;
-    }else{
-        $public=0;
+        if (GETPOST('budget') <= 0)
+        {
+            $error+=1;
+            $errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("TurnoverOrBudget"))."<br>\n";
+        }
     }
 
+    if (isset($public)) $public=1;
+    else $public=0;
+
     if (! $error)
     {
         // email a peu pres correct et le login n'existe pas
@@ -232,20 +237,24 @@ if ($action == 'add')
             }
 
             if ($backtopage) $urlback=$backtopage;
-            else if ($conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION) $urlback=$conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION;
+            else if ($conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION)
+            {
+                $urlback=$conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION;
+                // TODO Make replacement of __AMOUNT__, etc...
+            }
             else $urlback=$_SERVER["PHP_SELF"]."?action=added";
 
             if (! empty($conf->global->MEMBER_NEWFORM_PAYONLINE))
             {
                 if ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paybox')
                 {
-                    $urlback=DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?source=membersubscription&ref='.$adh->ref;
+                    $urlback=DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?from=membernewform&source=membersubscription&ref='.$adh->ref;
                     if (price2num(GETPOST('amount'))) $urlback.='&amount='.price2num(GETPOST('amount'));
                     if (GETPOST('email')) $urlback.='&email='.urlencode(GETPOST('email'));
                 }
                 else if ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paypal')
                 {
-                    $urlback=DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=membersubscription&ref='.$adh->ref;
+                    $urlback=DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?from=membernewform&source=membersubscription&ref='.$adh->ref;
                     if (price2num(GETPOST('amount'))) $urlback.='&amount='.price2num(GETPOST('amount'));
                     if (GETPOST('email')) $urlback.='&email='.urlencode(GETPOST('email'));
                 }
@@ -280,7 +289,7 @@ if ($action == 'added')
     print $langs->trans("NewMemberbyWeb");
     print '</center>';
 
-    llxFooterVierge('$Date: 2011/07/13 10:22:54 $ - $Revision: 1.40 $');
+    llxFooterVierge('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.41 $');
     exit;
 }
 
@@ -450,7 +459,7 @@ print '</tr>'."\n";
 if (! empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER))
 {
     $arraybudget=array('50'=>'<= 100 000','100'=>'<= 200 000','200'=>'<= 500 000','400'=>'<= 1 500 000','750'=>'<= 3 000 000','1500'=>'<= 5 000 000','2000'=>'5 000 000+');
-    print '<tr id="trbudget" class="trcompany"><td>'.$langs->trans("TurnoverOrBudget").'</td><td>';
+    print '<tr id="trbudget" class="trcompany"><td>'.$langs->trans("TurnoverOrBudget").' <FONT COLOR="red">*</FONT></td><td>';
     print $html->select_array('budget', $arraybudget, GETPOST('budget'), 1);
     print ' € or $';
 
@@ -528,5 +537,5 @@ print "<br></form>\n";
 
 $db->close();
 
-llxFooterVierge('$Date: 2011/07/13 10:22:54 $ - $Revision: 1.40 $');
+llxFooterVierge('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.41 $');
 ?>
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index 7f306f4e8ce..fdec201c31d 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -23,7 +23,7 @@
  *		\ingroup    paybox
  *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
  *		\author	    Laurent Destailleur
- *		\version    $Id: newpayment.php,v 1.56 2011/07/05 08:29:53 eldy Exp $
+ *		\version    $Id: newpayment.php,v 1.57 2011/07/13 11:14:43 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -186,10 +186,17 @@ if ($urllogo)
 	print '</tr>'."\n";
 }
 
-print '<tr><td align="center"><br>'.$langs->trans("WelcomeOnPaymentPage").'<br></td></tr>'."\n";
-
-print '<tr><td align="center"><br>'.$langs->trans("ThisScreenAllowsYouToPay",$creditor).'<br><br></td></tr>'."\n";
+// Output introduction text
+$text='';
+if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT)) $text.=$langs->trans($conf->global->PAYBOX_NEWMEMBER_TEXT)."<br>\n";
+if (empty($text))
+{
+    $text.='<tr><td align="center"><br>'.$langs->trans("WelcomeOnPaymentPage").'<br></td></tr>'."\n";
+    $text.='<tr><td align="center"><br>'.$langs->trans("ThisScreenAllowsYouToPay",$creditor).'<br><br></td></tr>'."\n";
+}
+print $text;
 
+// Output payment summary form
 print '<tr><td align="center">';
 print '<table with="100%">';
 print '<tr class="liste_total"><td align="left" colspan="2">'.$langs->trans("ThisIsInformationOnPayment").' :</td></tr>'."\n";
@@ -678,9 +685,9 @@ if (GETPOST("source") == 'membersubscription')
 	// EMail
 	$var=!$var;
 	print '<tr><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("YourEMail");
-	print ' ('.$langs->trans("ToComplete").')';
     $email=$member->client->email;
     $email=(GETPOST("email")?GETPOST("email"):(isValidEmail($email)?$email:''));
+	if (empty($email)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><input class="flat" type="text" name="email" size="48" value="'.$email.'"></td></tr>'."\n";
 }
 
@@ -716,5 +723,5 @@ html_print_paybox_footer($mysoc,$langs);
 
 $db->close();
 
-llxFooterPayBox('$Date: 2011/07/05 08:29:53 $ - $Revision: 1.56 $');
+llxFooterPayBox('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.57 $');
 ?>
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index c4a390cf1bd..82fd23583a6 100755
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -23,7 +23,7 @@
  *		\ingroup    paypal
  *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
  *		\author	    Laurent Destailleur
- *		\version    $Id: newpayment.php,v 1.21 2011/06/26 12:34:54 eldy Exp $
+ *		\version    $Id: newpayment.php,v 1.22 2011/07/13 11:14:43 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -280,10 +280,17 @@ if ($urllogo)
 	print '</tr>'."\n";
 }
 
-print '<tr><td align="center"><br>'.$langs->trans("WelcomeOnPaymentPage").'<br></td></tr>'."\n";
-
-print '<tr><td align="center"><br>'.$langs->trans("ThisScreenAllowsYouToPay",$creditor).'<br><br></td></tr>'."\n";
+// Output introduction text
+$text='';
+if (! empty($conf->global->PAYPAL_NEWMEMBER_TEXT)) $text.=$langs->trans($conf->global->PAYPAL_NEWMEMBER_TEXT)."<br>\n";
+if (empty($text))
+{
+    $text.='<tr><td align="center"><br>'.$langs->trans("WelcomeOnPaymentPage").'<br></td></tr>'."\n";
+    $text.='<tr><td align="center"><br>'.$langs->trans("ThisScreenAllowsYouToPay",$creditor).'<br><br></td></tr>'."\n";
+}
+print $text;
 
+// Output payment summary form
 print '<tr><td align="center">';
 print '<table with="100%">';
 print '<tr class="liste_total"><td align="left" colspan="2">'.$langs->trans("ThisIsInformationOnPayment").' :</td></tr>'."\n";
@@ -934,5 +941,5 @@ html_print_paypal_footer($mysoc,$langs);
 
 $db->close();
 
-llxFooterPaypal('$Date: 2011/06/26 12:34:54 $ - $Revision: 1.21 $');
+llxFooterPaypal('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.22 $');
 ?>

From bb3e760293b8aa205afc77a378efff51b3c501f8 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Wed, 13 Jul 2011 07:38:10 +0000
Subject: [PATCH 35/91] Fix: possibility to split buttons and files view


From 0f1dec82fa218174b85a69d554a8167ccb1e10b7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 11:23:52 +0000
Subject: [PATCH 36/91] Setup menu visible by default if admin

---
 htdocs/includes/menus/init_menu_auguria.sql | 28 ++++++++++-----------
 htdocs/includes/menus/standard/eldy.lib.php | 26 +++++++++----------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql
index f9b90c48d5f..eabed5dfd26 100644
--- a/htdocs/includes/menus/init_menu_auguria.sql
+++ b/htdocs/includes/menus/init_menu_auguria.sql
@@ -1,6 +1,6 @@
 --
--- $Id: init_menu_auguria.sql,v 1.119 2011/07/03 16:00:20 eldy Exp $
--- $Revision: 1.119 $
+-- $Id: init_menu_auguria.sql,v 1.120 2011/07/13 11:23:53 eldy Exp $
+-- $Revision: 1.120 $
 --
 -- Menu base entries
 -- This file is loaded when a menu handler base is activated (auguria, etc..)
@@ -24,18 +24,18 @@ insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk
 insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', 13__+MAX_llx_menu__, __HANDLER__, 'top', 'members',     '', 0, '/adherents/index.php?mainmenu=members&amp;leftmenu=', 'Members', -1, 'members', '$user->rights->adherent->lire', '', 2, 15, __ENTITY__);
 
 insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 100__+MAX_llx_menu__, 'home', '', 1__+MAX_llx_menu__, '/admin/index.php?leftmenu=setup', 'Setup', 0, 'admin', '', '', 2, 0, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 101__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/company.php?leftmenu=setup', 'MenuCompanySetup', 1, 'admin', '', '', 2, 1, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 102__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/ihm.php?leftmenu=setup', 'GUISetup', 1, 'admin', '', '', 2, 4, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 103__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/modules.php?leftmenu=setup', 'Modules', 1, 'admin', '', '', 2, 2, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 104__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/boxes.php?leftmenu=setup', 'Boxes', 1, 'admin', '', '', 2, 5, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 105__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/menus.php?leftmenu=setup', 'Menus', 1, 'admin', '', '', 2, 3, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 106__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/delais.php?leftmenu=setup', 'Alerts', 1, 'admin', '', '', 2, 6, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 108__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/proxy.php?leftmenu=setup', 'Security', 1, 'admin', '', '', 2, 7, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 110__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/limits.php?leftmenu=setup', 'MenuLimits', 1, 'admin', '', '', 2, 8, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 109__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/mails.php?leftmenu=setup', 'Emails', 1, 'admin', '', '', 2, 9, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\' && $conf->global->MAIN_FEATURES_LEVEL', __HANDLER__, 'left', 113__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/sms.php?leftmenu=setup', 'Sms', 1, 'admin', '', '', 2, 9, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 111__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/dict.php?leftmenu=setup', 'DictionnarySetup', 1, 'admin', '', '', 2, 10, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 112__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/const.php?leftmenu=setup', 'OtherSetup', 1, 'admin', '', '', 2, 11, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 101__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/company.php?leftmenu=setup', 'MenuCompanySetup', 1, 'admin', '', '', 2, 1, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 102__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/ihm.php?leftmenu=setup', 'GUISetup', 1, 'admin', '', '', 2, 4, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 103__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/modules.php?leftmenu=setup', 'Modules', 1, 'admin', '', '', 2, 2, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 104__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/boxes.php?leftmenu=setup', 'Boxes', 1, 'admin', '', '', 2, 5, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 105__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/menus.php?leftmenu=setup', 'Menus', 1, 'admin', '', '', 2, 3, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 106__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/delais.php?leftmenu=setup', 'Alerts', 1, 'admin', '', '', 2, 6, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 108__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/proxy.php?leftmenu=setup', 'Security', 1, 'admin', '', '', 2, 7, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 110__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/limits.php?leftmenu=setup', 'MenuLimits', 1, 'admin', '', '', 2, 8, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 109__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/mails.php?leftmenu=setup', 'Emails', 1, 'admin', '', '', 2, 9, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin && $conf->global->MAIN_FEATURES_LEVEL', __HANDLER__, 'left', 113__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/sms.php?leftmenu=setup', 'Sms', 1, 'admin', '', '', 2, 9, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 111__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/dict.php?leftmenu=setup', 'DictionnarySetup', 1, 'admin', '', '', 2, 10, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 112__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/const.php?leftmenu=setup', 'OtherSetup', 1, 'admin', '', '', 2, 11, __ENTITY__);
 insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 200__+MAX_llx_menu__, 'home', '', 1__+MAX_llx_menu__, '/admin/system/index.php?leftmenu=system', 'SystemInfo', 0, 'admin', '', '', 2, 1, __ENTITY__);
 insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'system\'', __HANDLER__, 'left', 201__+MAX_llx_menu__, 'home', '', 200__+MAX_llx_menu__, '/admin/system/dolibarr.php?leftmenu=system', 'Dolibarr', 1, 'admin', '', '', 2, 0, __ENTITY__);
 insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'system\'', __HANDLER__, 'left', 202__+MAX_llx_menu__, 'home', '', 201__+MAX_llx_menu__, '/admin/system/constall.php?leftmenu=system', 'AllParameters', 2, 'admin', '', '', 2, 1, __ENTITY__);
diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php
index 7c50b92df5a..a3ccfd9a116 100644
--- a/htdocs/includes/menus/standard/eldy.lib.php
+++ b/htdocs/includes/menus/standard/eldy.lib.php
@@ -21,7 +21,7 @@
 /**
  *  \file		htdocs/includes/menus/standard/eldy.lib.php
  *  \brief		Library for file eldy menus
- *  \version	$Id: eldy.lib.php,v 1.55 2011/07/04 11:33:22 eldy Exp $
+ *  \version	$Id: eldy.lib.php,v 1.56 2011/07/13 11:23:52 eldy Exp $
  */
 
 
@@ -629,19 +629,19 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
                 $langs->load("help");
 
                 $newmenu->add("/admin/index.php?leftmenu=setup", $langs->trans("Setup"));
-                if ($leftmenu=="setup") $newmenu->add("/admin/company.php", $langs->trans("MenuCompanySetup"),1);
-                if ($leftmenu=="setup") $newmenu->add("/admin/modules.php", $langs->trans("Modules"),1);
-                if ($leftmenu=="setup") $newmenu->add("/admin/menus.php", $langs->trans("Menus"),1);
-                if ($leftmenu=="setup") $newmenu->add("/admin/ihm.php", $langs->trans("GUISetup"),1);
-                if ($leftmenu=="setup") $newmenu->add("/admin/boxes.php", $langs->trans("Boxes"),1);
-                if ($leftmenu=="setup") $newmenu->add("/admin/delais.php",$langs->trans("Alerts"),1);
+                $newmenu->add("/admin/company.php", $langs->trans("MenuCompanySetup"),1);
+                $newmenu->add("/admin/modules.php", $langs->trans("Modules"),1);
+                $newmenu->add("/admin/menus.php", $langs->trans("Menus"),1);
+                $newmenu->add("/admin/ihm.php", $langs->trans("GUISetup"),1);
+                $newmenu->add("/admin/boxes.php", $langs->trans("Boxes"),1);
+                $newmenu->add("/admin/delais.php",$langs->trans("Alerts"),1);
 
-                if ($leftmenu=="setup") $newmenu->add("/admin/proxy.php", $langs->trans("Security"),1);
-                if ($leftmenu=="setup") $newmenu->add("/admin/limits.php", $langs->trans("MenuLimits"),1);
-                if ($leftmenu=="setup") $newmenu->add("/admin/mails.php", $langs->trans("Emails"),1);
-                if ($leftmenu=="setup" && $conf->global->MAIN_FEATURES_LEVEL) $newmenu->add("/admin/sms.php", $langs->trans("Sms"),1);
-                if ($leftmenu=="setup") $newmenu->add("/admin/dict.php", $langs->trans("DictionnarySetup"),1);
-                if ($leftmenu=="setup") $newmenu->add("/admin/const.php", $langs->trans("OtherSetup"),1);
+                $newmenu->add("/admin/proxy.php", $langs->trans("Security"),1);
+                $newmenu->add("/admin/limits.php", $langs->trans("MenuLimits"),1);
+                $newmenu->add("/admin/mails.php", $langs->trans("Emails"),1);
+                if ($conf->global->MAIN_FEATURES_LEVEL) $newmenu->add("/admin/sms.php", $langs->trans("Sms"),1);
+                $newmenu->add("/admin/dict.php", $langs->trans("DictionnarySetup"),1);
+                $newmenu->add("/admin/const.php", $langs->trans("OtherSetup"),1);
 
                 $newmenu->add("/admin/system/index.php?leftmenu=system", $langs->trans("SystemInfo"));
                 if ($leftmenu=="system") $newmenu->add("/admin/system/dolibarr.php", $langs->trans("Dolibarr"),1);

From 17db10560781d9339b285986d0d7e05471840f13 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 08:57:21 +0000
Subject: [PATCH 37/91] Restore hidden param to enable feature for the release
 3.1. I suggest to test it during on version untill making it visible by
 default.

---
 htdocs/includes/menus/init_menu_auguria.sql | 28 ++++++++++-----------
 htdocs/includes/menus/standard/eldy.lib.php | 26 +++++++++----------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql
index eabed5dfd26..f9b90c48d5f 100644
--- a/htdocs/includes/menus/init_menu_auguria.sql
+++ b/htdocs/includes/menus/init_menu_auguria.sql
@@ -1,6 +1,6 @@
 --
--- $Id: init_menu_auguria.sql,v 1.120 2011/07/13 11:23:53 eldy Exp $
--- $Revision: 1.120 $
+-- $Id: init_menu_auguria.sql,v 1.119 2011/07/03 16:00:20 eldy Exp $
+-- $Revision: 1.119 $
 --
 -- Menu base entries
 -- This file is loaded when a menu handler base is activated (auguria, etc..)
@@ -24,18 +24,18 @@ insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk
 insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', 13__+MAX_llx_menu__, __HANDLER__, 'top', 'members',     '', 0, '/adherents/index.php?mainmenu=members&amp;leftmenu=', 'Members', -1, 'members', '$user->rights->adherent->lire', '', 2, 15, __ENTITY__);
 
 insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 100__+MAX_llx_menu__, 'home', '', 1__+MAX_llx_menu__, '/admin/index.php?leftmenu=setup', 'Setup', 0, 'admin', '', '', 2, 0, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 101__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/company.php?leftmenu=setup', 'MenuCompanySetup', 1, 'admin', '', '', 2, 1, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 102__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/ihm.php?leftmenu=setup', 'GUISetup', 1, 'admin', '', '', 2, 4, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 103__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/modules.php?leftmenu=setup', 'Modules', 1, 'admin', '', '', 2, 2, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 104__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/boxes.php?leftmenu=setup', 'Boxes', 1, 'admin', '', '', 2, 5, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 105__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/menus.php?leftmenu=setup', 'Menus', 1, 'admin', '', '', 2, 3, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 106__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/delais.php?leftmenu=setup', 'Alerts', 1, 'admin', '', '', 2, 6, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 108__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/proxy.php?leftmenu=setup', 'Security', 1, 'admin', '', '', 2, 7, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 110__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/limits.php?leftmenu=setup', 'MenuLimits', 1, 'admin', '', '', 2, 8, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 109__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/mails.php?leftmenu=setup', 'Emails', 1, 'admin', '', '', 2, 9, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin && $conf->global->MAIN_FEATURES_LEVEL', __HANDLER__, 'left', 113__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/sms.php?leftmenu=setup', 'Sms', 1, 'admin', '', '', 2, 9, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 111__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/dict.php?leftmenu=setup', 'DictionnarySetup', 1, 'admin', '', '', 2, 10, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 112__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/const.php?leftmenu=setup', 'OtherSetup', 1, 'admin', '', '', 2, 11, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 101__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/company.php?leftmenu=setup', 'MenuCompanySetup', 1, 'admin', '', '', 2, 1, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 102__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/ihm.php?leftmenu=setup', 'GUISetup', 1, 'admin', '', '', 2, 4, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 103__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/modules.php?leftmenu=setup', 'Modules', 1, 'admin', '', '', 2, 2, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 104__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/boxes.php?leftmenu=setup', 'Boxes', 1, 'admin', '', '', 2, 5, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 105__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/menus.php?leftmenu=setup', 'Menus', 1, 'admin', '', '', 2, 3, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 106__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/delais.php?leftmenu=setup', 'Alerts', 1, 'admin', '', '', 2, 6, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 108__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/proxy.php?leftmenu=setup', 'Security', 1, 'admin', '', '', 2, 7, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 110__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/limits.php?leftmenu=setup', 'MenuLimits', 1, 'admin', '', '', 2, 8, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 109__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/mails.php?leftmenu=setup', 'Emails', 1, 'admin', '', '', 2, 9, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\' && $conf->global->MAIN_FEATURES_LEVEL', __HANDLER__, 'left', 113__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/sms.php?leftmenu=setup', 'Sms', 1, 'admin', '', '', 2, 9, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 111__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/dict.php?leftmenu=setup', 'DictionnarySetup', 1, 'admin', '', '', 2, 10, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 112__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/const.php?leftmenu=setup', 'OtherSetup', 1, 'admin', '', '', 2, 11, __ENTITY__);
 insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 200__+MAX_llx_menu__, 'home', '', 1__+MAX_llx_menu__, '/admin/system/index.php?leftmenu=system', 'SystemInfo', 0, 'admin', '', '', 2, 1, __ENTITY__);
 insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'system\'', __HANDLER__, 'left', 201__+MAX_llx_menu__, 'home', '', 200__+MAX_llx_menu__, '/admin/system/dolibarr.php?leftmenu=system', 'Dolibarr', 1, 'admin', '', '', 2, 0, __ENTITY__);
 insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'system\'', __HANDLER__, 'left', 202__+MAX_llx_menu__, 'home', '', 201__+MAX_llx_menu__, '/admin/system/constall.php?leftmenu=system', 'AllParameters', 2, 'admin', '', '', 2, 1, __ENTITY__);
diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php
index a3ccfd9a116..7c50b92df5a 100644
--- a/htdocs/includes/menus/standard/eldy.lib.php
+++ b/htdocs/includes/menus/standard/eldy.lib.php
@@ -21,7 +21,7 @@
 /**
  *  \file		htdocs/includes/menus/standard/eldy.lib.php
  *  \brief		Library for file eldy menus
- *  \version	$Id: eldy.lib.php,v 1.56 2011/07/13 11:23:52 eldy Exp $
+ *  \version	$Id: eldy.lib.php,v 1.55 2011/07/04 11:33:22 eldy Exp $
  */
 
 
@@ -629,19 +629,19 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
                 $langs->load("help");
 
                 $newmenu->add("/admin/index.php?leftmenu=setup", $langs->trans("Setup"));
-                $newmenu->add("/admin/company.php", $langs->trans("MenuCompanySetup"),1);
-                $newmenu->add("/admin/modules.php", $langs->trans("Modules"),1);
-                $newmenu->add("/admin/menus.php", $langs->trans("Menus"),1);
-                $newmenu->add("/admin/ihm.php", $langs->trans("GUISetup"),1);
-                $newmenu->add("/admin/boxes.php", $langs->trans("Boxes"),1);
-                $newmenu->add("/admin/delais.php",$langs->trans("Alerts"),1);
+                if ($leftmenu=="setup") $newmenu->add("/admin/company.php", $langs->trans("MenuCompanySetup"),1);
+                if ($leftmenu=="setup") $newmenu->add("/admin/modules.php", $langs->trans("Modules"),1);
+                if ($leftmenu=="setup") $newmenu->add("/admin/menus.php", $langs->trans("Menus"),1);
+                if ($leftmenu=="setup") $newmenu->add("/admin/ihm.php", $langs->trans("GUISetup"),1);
+                if ($leftmenu=="setup") $newmenu->add("/admin/boxes.php", $langs->trans("Boxes"),1);
+                if ($leftmenu=="setup") $newmenu->add("/admin/delais.php",$langs->trans("Alerts"),1);
 
-                $newmenu->add("/admin/proxy.php", $langs->trans("Security"),1);
-                $newmenu->add("/admin/limits.php", $langs->trans("MenuLimits"),1);
-                $newmenu->add("/admin/mails.php", $langs->trans("Emails"),1);
-                if ($conf->global->MAIN_FEATURES_LEVEL) $newmenu->add("/admin/sms.php", $langs->trans("Sms"),1);
-                $newmenu->add("/admin/dict.php", $langs->trans("DictionnarySetup"),1);
-                $newmenu->add("/admin/const.php", $langs->trans("OtherSetup"),1);
+                if ($leftmenu=="setup") $newmenu->add("/admin/proxy.php", $langs->trans("Security"),1);
+                if ($leftmenu=="setup") $newmenu->add("/admin/limits.php", $langs->trans("MenuLimits"),1);
+                if ($leftmenu=="setup") $newmenu->add("/admin/mails.php", $langs->trans("Emails"),1);
+                if ($leftmenu=="setup" && $conf->global->MAIN_FEATURES_LEVEL) $newmenu->add("/admin/sms.php", $langs->trans("Sms"),1);
+                if ($leftmenu=="setup") $newmenu->add("/admin/dict.php", $langs->trans("DictionnarySetup"),1);
+                if ($leftmenu=="setup") $newmenu->add("/admin/const.php", $langs->trans("OtherSetup"),1);
 
                 $newmenu->add("/admin/system/index.php?leftmenu=system", $langs->trans("SystemInfo"));
                 if ($leftmenu=="system") $newmenu->add("/admin/system/dolibarr.php", $langs->trans("Dolibarr"),1);

From 2ef92399c7dc874c65d3ea629dd9becacc486163 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 11:26:17 +0000
Subject: [PATCH 38/91] Setup menu visible by default if admin

---
 htdocs/includes/menus/init_menu_auguria.sql | 4 ++--
 htdocs/includes/menus/standard/eldy.lib.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql
index f9b90c48d5f..fc98e29aa63 100644
--- a/htdocs/includes/menus/init_menu_auguria.sql
+++ b/htdocs/includes/menus/init_menu_auguria.sql
@@ -1,6 +1,6 @@
 --
--- $Id: init_menu_auguria.sql,v 1.119 2011/07/03 16:00:20 eldy Exp $
--- $Revision: 1.119 $
+-- $Id: init_menu_auguria.sql,v 1.121 2011/07/13 11:26:17 eldy Exp $
+-- $Revision: 1.121 $
 --
 -- Menu base entries
 -- This file is loaded when a menu handler base is activated (auguria, etc..)
diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php
index 7c50b92df5a..062f1f002a6 100644
--- a/htdocs/includes/menus/standard/eldy.lib.php
+++ b/htdocs/includes/menus/standard/eldy.lib.php
@@ -21,7 +21,7 @@
 /**
  *  \file		htdocs/includes/menus/standard/eldy.lib.php
  *  \brief		Library for file eldy menus
- *  \version	$Id: eldy.lib.php,v 1.55 2011/07/04 11:33:22 eldy Exp $
+ *  \version	$Id: eldy.lib.php,v 1.57 2011/07/13 11:26:17 eldy Exp $
  */
 
 

From 3e42ad7cf5c0a72004db92fcdd0474f19e7f6357 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 10:22:54 +0000
Subject: [PATCH 39/91] Fix: Only one message

---
 htdocs/includes/menus/init_menu_auguria.sql |  4 +--
 htdocs/includes/menus/standard/eldy.lib.php |  2 +-
 htdocs/public/members/new.php               | 31 ++++++++-------------
 3 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql
index fc98e29aa63..f9b90c48d5f 100644
--- a/htdocs/includes/menus/init_menu_auguria.sql
+++ b/htdocs/includes/menus/init_menu_auguria.sql
@@ -1,6 +1,6 @@
 --
--- $Id: init_menu_auguria.sql,v 1.121 2011/07/13 11:26:17 eldy Exp $
--- $Revision: 1.121 $
+-- $Id: init_menu_auguria.sql,v 1.119 2011/07/03 16:00:20 eldy Exp $
+-- $Revision: 1.119 $
 --
 -- Menu base entries
 -- This file is loaded when a menu handler base is activated (auguria, etc..)
diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php
index 062f1f002a6..7c50b92df5a 100644
--- a/htdocs/includes/menus/standard/eldy.lib.php
+++ b/htdocs/includes/menus/standard/eldy.lib.php
@@ -21,7 +21,7 @@
 /**
  *  \file		htdocs/includes/menus/standard/eldy.lib.php
  *  \brief		Library for file eldy menus
- *  \version	$Id: eldy.lib.php,v 1.57 2011/07/13 11:26:17 eldy Exp $
+ *  \version	$Id: eldy.lib.php,v 1.55 2011/07/04 11:33:22 eldy Exp $
  */
 
 
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index d461137eaf6..035e8848da4 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -22,7 +22,7 @@
  *	\file       htdocs/public/members/new.php
  *	\ingroup    member
  *	\brief      Example of form to add a new member
- *	\version    $Id: new.php,v 1.41 2011/07/13 11:14:43 eldy Exp $
+ *	\version    $Id: new.php,v 1.40 2011/07/13 10:22:54 eldy Exp $
  *
  *  Note that you can add following constant to change behaviour of page
  *  MEMBER_NEWFORM_AMOUNT               Default amount for autosubscribe form
@@ -182,18 +182,13 @@ if ($action == 'add')
         $langs->load("errors");
         $errmsg .= $langs->trans("ErrorBadDateFormat")."<br>\n";
     }
-    if (! empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER))
+    if (isset($public))
     {
-        if (GETPOST('budget') <= 0)
-        {
-            $error+=1;
-            $errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("TurnoverOrBudget"))."<br>\n";
-        }
+        $public=1;
+    }else{
+        $public=0;
     }
 
-    if (isset($public)) $public=1;
-    else $public=0;
-
     if (! $error)
     {
         // email a peu pres correct et le login n'existe pas
@@ -237,24 +232,20 @@ if ($action == 'add')
             }
 
             if ($backtopage) $urlback=$backtopage;
-            else if ($conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION)
-            {
-                $urlback=$conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION;
-                // TODO Make replacement of __AMOUNT__, etc...
-            }
+            else if ($conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION) $urlback=$conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION;
             else $urlback=$_SERVER["PHP_SELF"]."?action=added";
 
             if (! empty($conf->global->MEMBER_NEWFORM_PAYONLINE))
             {
                 if ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paybox')
                 {
-                    $urlback=DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?from=membernewform&source=membersubscription&ref='.$adh->ref;
+                    $urlback=DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?source=membersubscription&ref='.$adh->ref;
                     if (price2num(GETPOST('amount'))) $urlback.='&amount='.price2num(GETPOST('amount'));
                     if (GETPOST('email')) $urlback.='&email='.urlencode(GETPOST('email'));
                 }
                 else if ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paypal')
                 {
-                    $urlback=DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?from=membernewform&source=membersubscription&ref='.$adh->ref;
+                    $urlback=DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=membersubscription&ref='.$adh->ref;
                     if (price2num(GETPOST('amount'))) $urlback.='&amount='.price2num(GETPOST('amount'));
                     if (GETPOST('email')) $urlback.='&email='.urlencode(GETPOST('email'));
                 }
@@ -289,7 +280,7 @@ if ($action == 'added')
     print $langs->trans("NewMemberbyWeb");
     print '</center>';
 
-    llxFooterVierge('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.41 $');
+    llxFooterVierge('$Date: 2011/07/13 10:22:54 $ - $Revision: 1.40 $');
     exit;
 }
 
@@ -459,7 +450,7 @@ print '</tr>'."\n";
 if (! empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER))
 {
     $arraybudget=array('50'=>'<= 100 000','100'=>'<= 200 000','200'=>'<= 500 000','400'=>'<= 1 500 000','750'=>'<= 3 000 000','1500'=>'<= 5 000 000','2000'=>'5 000 000+');
-    print '<tr id="trbudget" class="trcompany"><td>'.$langs->trans("TurnoverOrBudget").' <FONT COLOR="red">*</FONT></td><td>';
+    print '<tr id="trbudget" class="trcompany"><td>'.$langs->trans("TurnoverOrBudget").'</td><td>';
     print $html->select_array('budget', $arraybudget, GETPOST('budget'), 1);
     print ' € or $';
 
@@ -537,5 +528,5 @@ print "<br></form>\n";
 
 $db->close();
 
-llxFooterVierge('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.41 $');
+llxFooterVierge('$Date: 2011/07/13 10:22:54 $ - $Revision: 1.40 $');
 ?>

From 602837bbaa496b02df5728a6e2434998c7616de7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 10:23:05 +0000
Subject: [PATCH 40/91] Fix: Missing email


From 759cf4d4c844d7a20c5238b64c952839044fea59 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 11:14:43 +0000
Subject: [PATCH 41/91] Fix: Message for payment forms

---
 htdocs/public/members/new.php | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 035e8848da4..d461137eaf6 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -22,7 +22,7 @@
  *	\file       htdocs/public/members/new.php
  *	\ingroup    member
  *	\brief      Example of form to add a new member
- *	\version    $Id: new.php,v 1.40 2011/07/13 10:22:54 eldy Exp $
+ *	\version    $Id: new.php,v 1.41 2011/07/13 11:14:43 eldy Exp $
  *
  *  Note that you can add following constant to change behaviour of page
  *  MEMBER_NEWFORM_AMOUNT               Default amount for autosubscribe form
@@ -182,13 +182,18 @@ if ($action == 'add')
         $langs->load("errors");
         $errmsg .= $langs->trans("ErrorBadDateFormat")."<br>\n";
     }
-    if (isset($public))
+    if (! empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER))
     {
-        $public=1;
-    }else{
-        $public=0;
+        if (GETPOST('budget') <= 0)
+        {
+            $error+=1;
+            $errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("TurnoverOrBudget"))."<br>\n";
+        }
     }
 
+    if (isset($public)) $public=1;
+    else $public=0;
+
     if (! $error)
     {
         // email a peu pres correct et le login n'existe pas
@@ -232,20 +237,24 @@ if ($action == 'add')
             }
 
             if ($backtopage) $urlback=$backtopage;
-            else if ($conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION) $urlback=$conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION;
+            else if ($conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION)
+            {
+                $urlback=$conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION;
+                // TODO Make replacement of __AMOUNT__, etc...
+            }
             else $urlback=$_SERVER["PHP_SELF"]."?action=added";
 
             if (! empty($conf->global->MEMBER_NEWFORM_PAYONLINE))
             {
                 if ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paybox')
                 {
-                    $urlback=DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?source=membersubscription&ref='.$adh->ref;
+                    $urlback=DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?from=membernewform&source=membersubscription&ref='.$adh->ref;
                     if (price2num(GETPOST('amount'))) $urlback.='&amount='.price2num(GETPOST('amount'));
                     if (GETPOST('email')) $urlback.='&email='.urlencode(GETPOST('email'));
                 }
                 else if ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paypal')
                 {
-                    $urlback=DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=membersubscription&ref='.$adh->ref;
+                    $urlback=DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?from=membernewform&source=membersubscription&ref='.$adh->ref;
                     if (price2num(GETPOST('amount'))) $urlback.='&amount='.price2num(GETPOST('amount'));
                     if (GETPOST('email')) $urlback.='&email='.urlencode(GETPOST('email'));
                 }
@@ -280,7 +289,7 @@ if ($action == 'added')
     print $langs->trans("NewMemberbyWeb");
     print '</center>';
 
-    llxFooterVierge('$Date: 2011/07/13 10:22:54 $ - $Revision: 1.40 $');
+    llxFooterVierge('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.41 $');
     exit;
 }
 
@@ -450,7 +459,7 @@ print '</tr>'."\n";
 if (! empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER))
 {
     $arraybudget=array('50'=>'<= 100 000','100'=>'<= 200 000','200'=>'<= 500 000','400'=>'<= 1 500 000','750'=>'<= 3 000 000','1500'=>'<= 5 000 000','2000'=>'5 000 000+');
-    print '<tr id="trbudget" class="trcompany"><td>'.$langs->trans("TurnoverOrBudget").'</td><td>';
+    print '<tr id="trbudget" class="trcompany"><td>'.$langs->trans("TurnoverOrBudget").' <FONT COLOR="red">*</FONT></td><td>';
     print $html->select_array('budget', $arraybudget, GETPOST('budget'), 1);
     print ' € or $';
 
@@ -528,5 +537,5 @@ print "<br></form>\n";
 
 $db->close();
 
-llxFooterVierge('$Date: 2011/07/13 10:22:54 $ - $Revision: 1.40 $');
+llxFooterVierge('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.41 $');
 ?>

From 7f52c3900d1ab9c59d955325156b5db7dccfd062 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 11:42:39 +0000
Subject: [PATCH 42/91] Fix: Direct payment from autosubscribe form was showing
 wrong text.

---
 htdocs/includes/menus/init_menu_auguria.sql |  4 ++--
 htdocs/includes/menus/standard/eldy.lib.php |  2 +-
 htdocs/langs/en_US/members.lang             |  1 +
 htdocs/langs/fr_FR/members.lang             |  1 +
 htdocs/public/paybox/newpayment.php         | 11 ++++++++---
 htdocs/public/paypal/newpayment.php         | 11 ++++++++---
 6 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql
index f9b90c48d5f..fc98e29aa63 100644
--- a/htdocs/includes/menus/init_menu_auguria.sql
+++ b/htdocs/includes/menus/init_menu_auguria.sql
@@ -1,6 +1,6 @@
 --
--- $Id: init_menu_auguria.sql,v 1.119 2011/07/03 16:00:20 eldy Exp $
--- $Revision: 1.119 $
+-- $Id: init_menu_auguria.sql,v 1.121 2011/07/13 11:26:17 eldy Exp $
+-- $Revision: 1.121 $
 --
 -- Menu base entries
 -- This file is loaded when a menu handler base is activated (auguria, etc..)
diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php
index 7c50b92df5a..062f1f002a6 100644
--- a/htdocs/includes/menus/standard/eldy.lib.php
+++ b/htdocs/includes/menus/standard/eldy.lib.php
@@ -21,7 +21,7 @@
 /**
  *  \file		htdocs/includes/menus/standard/eldy.lib.php
  *  \brief		Library for file eldy menus
- *  \version	$Id: eldy.lib.php,v 1.55 2011/07/04 11:33:22 eldy Exp $
+ *  \version	$Id: eldy.lib.php,v 1.57 2011/07/13 11:26:17 eldy Exp $
  */
 
 
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 3e03924e697..935d02f67b4 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -193,3 +193,4 @@ Associations=Foundations
 Collectivités=Organizations
 Particuliers=Personal
 Entreprises=Companies
+DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br><br> 
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 95531c67c0e..4712ca76959 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -197,3 +197,4 @@ Associations=Associations
 Collectivités=Collectivités
 Particuliers=Particuliers
 Entreprises=Entreprises
+DOLIBARRFOUNDATION_PAYMENT_FORM=Pour réaliser le paiement de votre cotisation par virement bancaire ou par chèque, consulter la page <a href="http://wiki.dolibarr.org/index.php/Adh%C3%A9rer#Pour_une_adh.C3.A9sion_par_ch.C3.A8que">http://wiki.dolibarr.org/index.php/Adhérer</a>.<br>Pour payer dès maintenant par Carte Bancaire ou Paypal, cliquer sur le bouton au bas de cette page.<br><br>
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index fdec201c31d..e27a2493369 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -23,7 +23,7 @@
  *		\ingroup    paybox
  *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
  *		\author	    Laurent Destailleur
- *		\version    $Id: newpayment.php,v 1.57 2011/07/13 11:14:43 eldy Exp $
+ *		\version    $Id: newpayment.php,v 1.58 2011/07/13 11:42:39 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -188,7 +188,12 @@ if ($urllogo)
 
 // Output introduction text
 $text='';
-if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT)) $text.=$langs->trans($conf->global->PAYBOX_NEWMEMBER_TEXT)."<br>\n";
+if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT))
+{
+    $langs->load("members");
+    if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWMEMBER_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
+    else $text.=$conf->global->PAYBOX_NEWMEMBER_TEXT."<br>\n";
+}
 if (empty($text))
 {
     $text.='<tr><td align="center"><br>'.$langs->trans("WelcomeOnPaymentPage").'<br></td></tr>'."\n";
@@ -723,5 +728,5 @@ html_print_paybox_footer($mysoc,$langs);
 
 $db->close();
 
-llxFooterPayBox('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.57 $');
+llxFooterPayBox('$Date: 2011/07/13 11:42:39 $ - $Revision: 1.58 $');
 ?>
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index 82fd23583a6..30001659341 100755
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -23,7 +23,7 @@
  *		\ingroup    paypal
  *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
  *		\author	    Laurent Destailleur
- *		\version    $Id: newpayment.php,v 1.22 2011/07/13 11:14:43 eldy Exp $
+ *		\version    $Id: newpayment.php,v 1.23 2011/07/13 11:42:39 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -282,7 +282,12 @@ if ($urllogo)
 
 // Output introduction text
 $text='';
-if (! empty($conf->global->PAYPAL_NEWMEMBER_TEXT)) $text.=$langs->trans($conf->global->PAYPAL_NEWMEMBER_TEXT)."<br>\n";
+if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT))
+{
+    $langs->load("members");
+    if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWMEMBER_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
+    else $text.=$conf->global->PAYBOX_NEWMEMBER_TEXT."<br>\n";
+}
 if (empty($text))
 {
     $text.='<tr><td align="center"><br>'.$langs->trans("WelcomeOnPaymentPage").'<br></td></tr>'."\n";
@@ -941,5 +946,5 @@ html_print_paypal_footer($mysoc,$langs);
 
 $db->close();
 
-llxFooterPaypal('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.22 $');
+llxFooterPaypal('$Date: 2011/07/13 11:42:39 $ - $Revision: 1.23 $');
 ?>

From 58add2660a387ee5e77580924e9c5e2bb398f6e7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 11:50:33 +0000
Subject: [PATCH 43/91] Fix: Direct payment from autosubscribe form was showing
 wrong text.

---
 htdocs/adherents/fiche.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index 7a01db892db..2eeb80e952f 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -23,7 +23,7 @@
  *       \file       htdocs/adherents/fiche.php
  *       \ingroup    member
  *       \brief      Page of member
- *       \version    $Id$
+ *       \version    $Id: fiche.php,v 1.237 2011/07/13 11:50:33 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -944,7 +944,7 @@ if ($action == 'edit')
     print '</td></tr>';
 
     // Country
-    $adh->pays_id=$adh->pays_id?$adh->pays_id:$mysoc->pays_id;
+    //$adh->pays_id=$adh->pays_id?$adh->pays_id:$mysoc->pays_id;    // In edit mode we don't force to company country if not defined
     print '<tr><td width="25%">'.$langs->trans('Country').'</td><td>';
     $html->select_pays(isset($_POST["pays_id"])?$_POST["pays_id"]:$adh->pays_id,'pays_id');
     if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
@@ -1505,5 +1505,5 @@ if ($rowid && $action != 'edit')
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/13 11:50:33 $ - $Revision: 1.237 $');
 ?>

From 967db397e424105de2d3e44caf6aa61d143bb9c4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 11:23:52 +0000
Subject: [PATCH 44/91] Setup menu visible by default if admin

---
 htdocs/adherents/fiche.php                  |  6 ++---
 htdocs/includes/menus/init_menu_auguria.sql | 28 ++++++++++-----------
 htdocs/includes/menus/standard/eldy.lib.php | 26 +++++++++----------
 htdocs/langs/en_US/members.lang             |  1 -
 htdocs/langs/fr_FR/members.lang             |  1 -
 htdocs/public/paybox/newpayment.php         | 11 +++-----
 htdocs/public/paypal/newpayment.php         | 11 +++-----
 7 files changed, 36 insertions(+), 48 deletions(-)

diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index 2eeb80e952f..7a01db892db 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -23,7 +23,7 @@
  *       \file       htdocs/adherents/fiche.php
  *       \ingroup    member
  *       \brief      Page of member
- *       \version    $Id: fiche.php,v 1.237 2011/07/13 11:50:33 eldy Exp $
+ *       \version    $Id$
  */
 
 require("../main.inc.php");
@@ -944,7 +944,7 @@ if ($action == 'edit')
     print '</td></tr>';
 
     // Country
-    //$adh->pays_id=$adh->pays_id?$adh->pays_id:$mysoc->pays_id;    // In edit mode we don't force to company country if not defined
+    $adh->pays_id=$adh->pays_id?$adh->pays_id:$mysoc->pays_id;
     print '<tr><td width="25%">'.$langs->trans('Country').'</td><td>';
     $html->select_pays(isset($_POST["pays_id"])?$_POST["pays_id"]:$adh->pays_id,'pays_id');
     if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
@@ -1505,5 +1505,5 @@ if ($rowid && $action != 'edit')
 
 $db->close();
 
-llxFooter('$Date: 2011/07/13 11:50:33 $ - $Revision: 1.237 $');
+llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql
index fc98e29aa63..eabed5dfd26 100644
--- a/htdocs/includes/menus/init_menu_auguria.sql
+++ b/htdocs/includes/menus/init_menu_auguria.sql
@@ -1,6 +1,6 @@
 --
--- $Id: init_menu_auguria.sql,v 1.121 2011/07/13 11:26:17 eldy Exp $
--- $Revision: 1.121 $
+-- $Id: init_menu_auguria.sql,v 1.120 2011/07/13 11:23:53 eldy Exp $
+-- $Revision: 1.120 $
 --
 -- Menu base entries
 -- This file is loaded when a menu handler base is activated (auguria, etc..)
@@ -24,18 +24,18 @@ insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk
 insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', 13__+MAX_llx_menu__, __HANDLER__, 'top', 'members',     '', 0, '/adherents/index.php?mainmenu=members&amp;leftmenu=', 'Members', -1, 'members', '$user->rights->adherent->lire', '', 2, 15, __ENTITY__);
 
 insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 100__+MAX_llx_menu__, 'home', '', 1__+MAX_llx_menu__, '/admin/index.php?leftmenu=setup', 'Setup', 0, 'admin', '', '', 2, 0, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 101__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/company.php?leftmenu=setup', 'MenuCompanySetup', 1, 'admin', '', '', 2, 1, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 102__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/ihm.php?leftmenu=setup', 'GUISetup', 1, 'admin', '', '', 2, 4, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 103__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/modules.php?leftmenu=setup', 'Modules', 1, 'admin', '', '', 2, 2, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 104__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/boxes.php?leftmenu=setup', 'Boxes', 1, 'admin', '', '', 2, 5, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 105__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/menus.php?leftmenu=setup', 'Menus', 1, 'admin', '', '', 2, 3, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 106__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/delais.php?leftmenu=setup', 'Alerts', 1, 'admin', '', '', 2, 6, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 108__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/proxy.php?leftmenu=setup', 'Security', 1, 'admin', '', '', 2, 7, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 110__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/limits.php?leftmenu=setup', 'MenuLimits', 1, 'admin', '', '', 2, 8, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 109__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/mails.php?leftmenu=setup', 'Emails', 1, 'admin', '', '', 2, 9, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\' && $conf->global->MAIN_FEATURES_LEVEL', __HANDLER__, 'left', 113__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/sms.php?leftmenu=setup', 'Sms', 1, 'admin', '', '', 2, 9, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 111__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/dict.php?leftmenu=setup', 'DictionnarySetup', 1, 'admin', '', '', 2, 10, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 112__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/const.php?leftmenu=setup', 'OtherSetup', 1, 'admin', '', '', 2, 11, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 101__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/company.php?leftmenu=setup', 'MenuCompanySetup', 1, 'admin', '', '', 2, 1, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 102__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/ihm.php?leftmenu=setup', 'GUISetup', 1, 'admin', '', '', 2, 4, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 103__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/modules.php?leftmenu=setup', 'Modules', 1, 'admin', '', '', 2, 2, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 104__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/boxes.php?leftmenu=setup', 'Boxes', 1, 'admin', '', '', 2, 5, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 105__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/menus.php?leftmenu=setup', 'Menus', 1, 'admin', '', '', 2, 3, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 106__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/delais.php?leftmenu=setup', 'Alerts', 1, 'admin', '', '', 2, 6, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 108__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/proxy.php?leftmenu=setup', 'Security', 1, 'admin', '', '', 2, 7, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 110__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/limits.php?leftmenu=setup', 'MenuLimits', 1, 'admin', '', '', 2, 8, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 109__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/mails.php?leftmenu=setup', 'Emails', 1, 'admin', '', '', 2, 9, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin && $conf->global->MAIN_FEATURES_LEVEL', __HANDLER__, 'left', 113__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/sms.php?leftmenu=setup', 'Sms', 1, 'admin', '', '', 2, 9, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 111__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/dict.php?leftmenu=setup', 'DictionnarySetup', 1, 'admin', '', '', 2, 10, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 112__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/const.php?leftmenu=setup', 'OtherSetup', 1, 'admin', '', '', 2, 11, __ENTITY__);
 insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 200__+MAX_llx_menu__, 'home', '', 1__+MAX_llx_menu__, '/admin/system/index.php?leftmenu=system', 'SystemInfo', 0, 'admin', '', '', 2, 1, __ENTITY__);
 insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'system\'', __HANDLER__, 'left', 201__+MAX_llx_menu__, 'home', '', 200__+MAX_llx_menu__, '/admin/system/dolibarr.php?leftmenu=system', 'Dolibarr', 1, 'admin', '', '', 2, 0, __ENTITY__);
 insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'system\'', __HANDLER__, 'left', 202__+MAX_llx_menu__, 'home', '', 201__+MAX_llx_menu__, '/admin/system/constall.php?leftmenu=system', 'AllParameters', 2, 'admin', '', '', 2, 1, __ENTITY__);
diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php
index 062f1f002a6..a3ccfd9a116 100644
--- a/htdocs/includes/menus/standard/eldy.lib.php
+++ b/htdocs/includes/menus/standard/eldy.lib.php
@@ -21,7 +21,7 @@
 /**
  *  \file		htdocs/includes/menus/standard/eldy.lib.php
  *  \brief		Library for file eldy menus
- *  \version	$Id: eldy.lib.php,v 1.57 2011/07/13 11:26:17 eldy Exp $
+ *  \version	$Id: eldy.lib.php,v 1.56 2011/07/13 11:23:52 eldy Exp $
  */
 
 
@@ -629,19 +629,19 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
                 $langs->load("help");
 
                 $newmenu->add("/admin/index.php?leftmenu=setup", $langs->trans("Setup"));
-                if ($leftmenu=="setup") $newmenu->add("/admin/company.php", $langs->trans("MenuCompanySetup"),1);
-                if ($leftmenu=="setup") $newmenu->add("/admin/modules.php", $langs->trans("Modules"),1);
-                if ($leftmenu=="setup") $newmenu->add("/admin/menus.php", $langs->trans("Menus"),1);
-                if ($leftmenu=="setup") $newmenu->add("/admin/ihm.php", $langs->trans("GUISetup"),1);
-                if ($leftmenu=="setup") $newmenu->add("/admin/boxes.php", $langs->trans("Boxes"),1);
-                if ($leftmenu=="setup") $newmenu->add("/admin/delais.php",$langs->trans("Alerts"),1);
+                $newmenu->add("/admin/company.php", $langs->trans("MenuCompanySetup"),1);
+                $newmenu->add("/admin/modules.php", $langs->trans("Modules"),1);
+                $newmenu->add("/admin/menus.php", $langs->trans("Menus"),1);
+                $newmenu->add("/admin/ihm.php", $langs->trans("GUISetup"),1);
+                $newmenu->add("/admin/boxes.php", $langs->trans("Boxes"),1);
+                $newmenu->add("/admin/delais.php",$langs->trans("Alerts"),1);
 
-                if ($leftmenu=="setup") $newmenu->add("/admin/proxy.php", $langs->trans("Security"),1);
-                if ($leftmenu=="setup") $newmenu->add("/admin/limits.php", $langs->trans("MenuLimits"),1);
-                if ($leftmenu=="setup") $newmenu->add("/admin/mails.php", $langs->trans("Emails"),1);
-                if ($leftmenu=="setup" && $conf->global->MAIN_FEATURES_LEVEL) $newmenu->add("/admin/sms.php", $langs->trans("Sms"),1);
-                if ($leftmenu=="setup") $newmenu->add("/admin/dict.php", $langs->trans("DictionnarySetup"),1);
-                if ($leftmenu=="setup") $newmenu->add("/admin/const.php", $langs->trans("OtherSetup"),1);
+                $newmenu->add("/admin/proxy.php", $langs->trans("Security"),1);
+                $newmenu->add("/admin/limits.php", $langs->trans("MenuLimits"),1);
+                $newmenu->add("/admin/mails.php", $langs->trans("Emails"),1);
+                if ($conf->global->MAIN_FEATURES_LEVEL) $newmenu->add("/admin/sms.php", $langs->trans("Sms"),1);
+                $newmenu->add("/admin/dict.php", $langs->trans("DictionnarySetup"),1);
+                $newmenu->add("/admin/const.php", $langs->trans("OtherSetup"),1);
 
                 $newmenu->add("/admin/system/index.php?leftmenu=system", $langs->trans("SystemInfo"));
                 if ($leftmenu=="system") $newmenu->add("/admin/system/dolibarr.php", $langs->trans("Dolibarr"),1);
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 935d02f67b4..3e03924e697 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -193,4 +193,3 @@ Associations=Foundations
 Collectivités=Organizations
 Particuliers=Personal
 Entreprises=Companies
-DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br><br> 
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 4712ca76959..95531c67c0e 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -197,4 +197,3 @@ Associations=Associations
 Collectivités=Collectivités
 Particuliers=Particuliers
 Entreprises=Entreprises
-DOLIBARRFOUNDATION_PAYMENT_FORM=Pour réaliser le paiement de votre cotisation par virement bancaire ou par chèque, consulter la page <a href="http://wiki.dolibarr.org/index.php/Adh%C3%A9rer#Pour_une_adh.C3.A9sion_par_ch.C3.A8que">http://wiki.dolibarr.org/index.php/Adhérer</a>.<br>Pour payer dès maintenant par Carte Bancaire ou Paypal, cliquer sur le bouton au bas de cette page.<br><br>
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index e27a2493369..fdec201c31d 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -23,7 +23,7 @@
  *		\ingroup    paybox
  *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
  *		\author	    Laurent Destailleur
- *		\version    $Id: newpayment.php,v 1.58 2011/07/13 11:42:39 eldy Exp $
+ *		\version    $Id: newpayment.php,v 1.57 2011/07/13 11:14:43 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -188,12 +188,7 @@ if ($urllogo)
 
 // Output introduction text
 $text='';
-if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT))
-{
-    $langs->load("members");
-    if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWMEMBER_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
-    else $text.=$conf->global->PAYBOX_NEWMEMBER_TEXT."<br>\n";
-}
+if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT)) $text.=$langs->trans($conf->global->PAYBOX_NEWMEMBER_TEXT)."<br>\n";
 if (empty($text))
 {
     $text.='<tr><td align="center"><br>'.$langs->trans("WelcomeOnPaymentPage").'<br></td></tr>'."\n";
@@ -728,5 +723,5 @@ html_print_paybox_footer($mysoc,$langs);
 
 $db->close();
 
-llxFooterPayBox('$Date: 2011/07/13 11:42:39 $ - $Revision: 1.58 $');
+llxFooterPayBox('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.57 $');
 ?>
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index 30001659341..82fd23583a6 100755
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -23,7 +23,7 @@
  *		\ingroup    paypal
  *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
  *		\author	    Laurent Destailleur
- *		\version    $Id: newpayment.php,v 1.23 2011/07/13 11:42:39 eldy Exp $
+ *		\version    $Id: newpayment.php,v 1.22 2011/07/13 11:14:43 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -282,12 +282,7 @@ if ($urllogo)
 
 // Output introduction text
 $text='';
-if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT))
-{
-    $langs->load("members");
-    if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWMEMBER_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
-    else $text.=$conf->global->PAYBOX_NEWMEMBER_TEXT."<br>\n";
-}
+if (! empty($conf->global->PAYPAL_NEWMEMBER_TEXT)) $text.=$langs->trans($conf->global->PAYPAL_NEWMEMBER_TEXT)."<br>\n";
 if (empty($text))
 {
     $text.='<tr><td align="center"><br>'.$langs->trans("WelcomeOnPaymentPage").'<br></td></tr>'."\n";
@@ -946,5 +941,5 @@ html_print_paypal_footer($mysoc,$langs);
 
 $db->close();
 
-llxFooterPaypal('$Date: 2011/07/13 11:42:39 $ - $Revision: 1.23 $');
+llxFooterPaypal('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.22 $');
 ?>

From d41b9fb02ec25c8249dfd3bf955770c0569c25c0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 11:26:17 +0000
Subject: [PATCH 45/91] Setup menu visible by default if admin

---
 htdocs/includes/menus/init_menu_auguria.sql | 28 ++++++++++-----------
 htdocs/includes/menus/standard/eldy.lib.php | 26 +++++++++----------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql
index eabed5dfd26..fc98e29aa63 100644
--- a/htdocs/includes/menus/init_menu_auguria.sql
+++ b/htdocs/includes/menus/init_menu_auguria.sql
@@ -1,6 +1,6 @@
 --
--- $Id: init_menu_auguria.sql,v 1.120 2011/07/13 11:23:53 eldy Exp $
--- $Revision: 1.120 $
+-- $Id: init_menu_auguria.sql,v 1.121 2011/07/13 11:26:17 eldy Exp $
+-- $Revision: 1.121 $
 --
 -- Menu base entries
 -- This file is loaded when a menu handler base is activated (auguria, etc..)
@@ -24,18 +24,18 @@ insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk
 insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', 13__+MAX_llx_menu__, __HANDLER__, 'top', 'members',     '', 0, '/adherents/index.php?mainmenu=members&amp;leftmenu=', 'Members', -1, 'members', '$user->rights->adherent->lire', '', 2, 15, __ENTITY__);
 
 insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 100__+MAX_llx_menu__, 'home', '', 1__+MAX_llx_menu__, '/admin/index.php?leftmenu=setup', 'Setup', 0, 'admin', '', '', 2, 0, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 101__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/company.php?leftmenu=setup', 'MenuCompanySetup', 1, 'admin', '', '', 2, 1, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 102__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/ihm.php?leftmenu=setup', 'GUISetup', 1, 'admin', '', '', 2, 4, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 103__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/modules.php?leftmenu=setup', 'Modules', 1, 'admin', '', '', 2, 2, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 104__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/boxes.php?leftmenu=setup', 'Boxes', 1, 'admin', '', '', 2, 5, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 105__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/menus.php?leftmenu=setup', 'Menus', 1, 'admin', '', '', 2, 3, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 106__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/delais.php?leftmenu=setup', 'Alerts', 1, 'admin', '', '', 2, 6, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 108__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/proxy.php?leftmenu=setup', 'Security', 1, 'admin', '', '', 2, 7, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 110__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/limits.php?leftmenu=setup', 'MenuLimits', 1, 'admin', '', '', 2, 8, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 109__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/mails.php?leftmenu=setup', 'Emails', 1, 'admin', '', '', 2, 9, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin && $conf->global->MAIN_FEATURES_LEVEL', __HANDLER__, 'left', 113__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/sms.php?leftmenu=setup', 'Sms', 1, 'admin', '', '', 2, 9, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 111__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/dict.php?leftmenu=setup', 'DictionnarySetup', 1, 'admin', '', '', 2, 10, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 112__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/const.php?leftmenu=setup', 'OtherSetup', 1, 'admin', '', '', 2, 11, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 101__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/company.php?leftmenu=setup', 'MenuCompanySetup', 1, 'admin', '', '', 2, 1, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 102__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/ihm.php?leftmenu=setup', 'GUISetup', 1, 'admin', '', '', 2, 4, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 103__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/modules.php?leftmenu=setup', 'Modules', 1, 'admin', '', '', 2, 2, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 104__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/boxes.php?leftmenu=setup', 'Boxes', 1, 'admin', '', '', 2, 5, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 105__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/menus.php?leftmenu=setup', 'Menus', 1, 'admin', '', '', 2, 3, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 106__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/delais.php?leftmenu=setup', 'Alerts', 1, 'admin', '', '', 2, 6, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 108__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/proxy.php?leftmenu=setup', 'Security', 1, 'admin', '', '', 2, 7, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 110__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/limits.php?leftmenu=setup', 'MenuLimits', 1, 'admin', '', '', 2, 8, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 109__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/mails.php?leftmenu=setup', 'Emails', 1, 'admin', '', '', 2, 9, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\' && $conf->global->MAIN_FEATURES_LEVEL', __HANDLER__, 'left', 113__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/sms.php?leftmenu=setup', 'Sms', 1, 'admin', '', '', 2, 9, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 111__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/dict.php?leftmenu=setup', 'DictionnarySetup', 1, 'admin', '', '', 2, 10, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 112__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/const.php?leftmenu=setup', 'OtherSetup', 1, 'admin', '', '', 2, 11, __ENTITY__);
 insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 200__+MAX_llx_menu__, 'home', '', 1__+MAX_llx_menu__, '/admin/system/index.php?leftmenu=system', 'SystemInfo', 0, 'admin', '', '', 2, 1, __ENTITY__);
 insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'system\'', __HANDLER__, 'left', 201__+MAX_llx_menu__, 'home', '', 200__+MAX_llx_menu__, '/admin/system/dolibarr.php?leftmenu=system', 'Dolibarr', 1, 'admin', '', '', 2, 0, __ENTITY__);
 insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'system\'', __HANDLER__, 'left', 202__+MAX_llx_menu__, 'home', '', 201__+MAX_llx_menu__, '/admin/system/constall.php?leftmenu=system', 'AllParameters', 2, 'admin', '', '', 2, 1, __ENTITY__);
diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php
index a3ccfd9a116..062f1f002a6 100644
--- a/htdocs/includes/menus/standard/eldy.lib.php
+++ b/htdocs/includes/menus/standard/eldy.lib.php
@@ -21,7 +21,7 @@
 /**
  *  \file		htdocs/includes/menus/standard/eldy.lib.php
  *  \brief		Library for file eldy menus
- *  \version	$Id: eldy.lib.php,v 1.56 2011/07/13 11:23:52 eldy Exp $
+ *  \version	$Id: eldy.lib.php,v 1.57 2011/07/13 11:26:17 eldy Exp $
  */
 
 
@@ -629,19 +629,19 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
                 $langs->load("help");
 
                 $newmenu->add("/admin/index.php?leftmenu=setup", $langs->trans("Setup"));
-                $newmenu->add("/admin/company.php", $langs->trans("MenuCompanySetup"),1);
-                $newmenu->add("/admin/modules.php", $langs->trans("Modules"),1);
-                $newmenu->add("/admin/menus.php", $langs->trans("Menus"),1);
-                $newmenu->add("/admin/ihm.php", $langs->trans("GUISetup"),1);
-                $newmenu->add("/admin/boxes.php", $langs->trans("Boxes"),1);
-                $newmenu->add("/admin/delais.php",$langs->trans("Alerts"),1);
+                if ($leftmenu=="setup") $newmenu->add("/admin/company.php", $langs->trans("MenuCompanySetup"),1);
+                if ($leftmenu=="setup") $newmenu->add("/admin/modules.php", $langs->trans("Modules"),1);
+                if ($leftmenu=="setup") $newmenu->add("/admin/menus.php", $langs->trans("Menus"),1);
+                if ($leftmenu=="setup") $newmenu->add("/admin/ihm.php", $langs->trans("GUISetup"),1);
+                if ($leftmenu=="setup") $newmenu->add("/admin/boxes.php", $langs->trans("Boxes"),1);
+                if ($leftmenu=="setup") $newmenu->add("/admin/delais.php",$langs->trans("Alerts"),1);
 
-                $newmenu->add("/admin/proxy.php", $langs->trans("Security"),1);
-                $newmenu->add("/admin/limits.php", $langs->trans("MenuLimits"),1);
-                $newmenu->add("/admin/mails.php", $langs->trans("Emails"),1);
-                if ($conf->global->MAIN_FEATURES_LEVEL) $newmenu->add("/admin/sms.php", $langs->trans("Sms"),1);
-                $newmenu->add("/admin/dict.php", $langs->trans("DictionnarySetup"),1);
-                $newmenu->add("/admin/const.php", $langs->trans("OtherSetup"),1);
+                if ($leftmenu=="setup") $newmenu->add("/admin/proxy.php", $langs->trans("Security"),1);
+                if ($leftmenu=="setup") $newmenu->add("/admin/limits.php", $langs->trans("MenuLimits"),1);
+                if ($leftmenu=="setup") $newmenu->add("/admin/mails.php", $langs->trans("Emails"),1);
+                if ($leftmenu=="setup" && $conf->global->MAIN_FEATURES_LEVEL) $newmenu->add("/admin/sms.php", $langs->trans("Sms"),1);
+                if ($leftmenu=="setup") $newmenu->add("/admin/dict.php", $langs->trans("DictionnarySetup"),1);
+                if ($leftmenu=="setup") $newmenu->add("/admin/const.php", $langs->trans("OtherSetup"),1);
 
                 $newmenu->add("/admin/system/index.php?leftmenu=system", $langs->trans("SystemInfo"));
                 if ($leftmenu=="system") $newmenu->add("/admin/system/dolibarr.php", $langs->trans("Dolibarr"),1);

From b89dc2c2dfd158c33d5b72440deaeab75510218e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 11:56:36 +0000
Subject: [PATCH 46/91] Fix: Message for payment forms

---
 htdocs/adherents/fiche.php          |  6 +++---
 htdocs/langs/en_US/members.lang     |  1 +
 htdocs/langs/fr_FR/members.lang     |  1 +
 htdocs/public/members/new.php       |  8 ++++----
 htdocs/public/paybox/newpayment.php | 11 ++++++++---
 htdocs/public/paypal/newpayment.php | 12 +++++++++---
 6 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index 7a01db892db..2eeb80e952f 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -23,7 +23,7 @@
  *       \file       htdocs/adherents/fiche.php
  *       \ingroup    member
  *       \brief      Page of member
- *       \version    $Id$
+ *       \version    $Id: fiche.php,v 1.237 2011/07/13 11:50:33 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -944,7 +944,7 @@ if ($action == 'edit')
     print '</td></tr>';
 
     // Country
-    $adh->pays_id=$adh->pays_id?$adh->pays_id:$mysoc->pays_id;
+    //$adh->pays_id=$adh->pays_id?$adh->pays_id:$mysoc->pays_id;    // In edit mode we don't force to company country if not defined
     print '<tr><td width="25%">'.$langs->trans('Country').'</td><td>';
     $html->select_pays(isset($_POST["pays_id"])?$_POST["pays_id"]:$adh->pays_id,'pays_id');
     if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
@@ -1505,5 +1505,5 @@ if ($rowid && $action != 'edit')
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/13 11:50:33 $ - $Revision: 1.237 $');
 ?>
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 3e03924e697..935d02f67b4 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -193,3 +193,4 @@ Associations=Foundations
 Collectivités=Organizations
 Particuliers=Personal
 Entreprises=Companies
+DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br><br> 
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 95531c67c0e..4712ca76959 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -197,3 +197,4 @@ Associations=Associations
 Collectivités=Collectivités
 Particuliers=Particuliers
 Entreprises=Entreprises
+DOLIBARRFOUNDATION_PAYMENT_FORM=Pour réaliser le paiement de votre cotisation par virement bancaire ou par chèque, consulter la page <a href="http://wiki.dolibarr.org/index.php/Adh%C3%A9rer#Pour_une_adh.C3.A9sion_par_ch.C3.A8que">http://wiki.dolibarr.org/index.php/Adhérer</a>.<br>Pour payer dès maintenant par Carte Bancaire ou Paypal, cliquer sur le bouton au bas de cette page.<br><br>
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index d461137eaf6..f4d349046b0 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -22,7 +22,7 @@
  *	\file       htdocs/public/members/new.php
  *	\ingroup    member
  *	\brief      Example of form to add a new member
- *	\version    $Id: new.php,v 1.41 2011/07/13 11:14:43 eldy Exp $
+ *	\version    $Id: new.php,v 1.42 2011/07/13 11:56:36 eldy Exp $
  *
  *  Note that you can add following constant to change behaviour of page
  *  MEMBER_NEWFORM_AMOUNT               Default amount for autosubscribe form
@@ -184,7 +184,7 @@ if ($action == 'add')
     }
     if (! empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER))
     {
-        if (GETPOST('budget') <= 0)
+        if (GETPOST("morphy") == 'mor' && GETPOST('budget') <= 0)
         {
             $error+=1;
             $errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("TurnoverOrBudget"))."<br>\n";
@@ -289,7 +289,7 @@ if ($action == 'added')
     print $langs->trans("NewMemberbyWeb");
     print '</center>';
 
-    llxFooterVierge('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.41 $');
+    llxFooterVierge('$Date: 2011/07/13 11:56:36 $ - $Revision: 1.42 $');
     exit;
 }
 
@@ -537,5 +537,5 @@ print "<br></form>\n";
 
 $db->close();
 
-llxFooterVierge('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.41 $');
+llxFooterVierge('$Date: 2011/07/13 11:56:36 $ - $Revision: 1.42 $');
 ?>
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index fdec201c31d..d87a7ed1051 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -23,7 +23,7 @@
  *		\ingroup    paybox
  *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
  *		\author	    Laurent Destailleur
- *		\version    $Id: newpayment.php,v 1.57 2011/07/13 11:14:43 eldy Exp $
+ *		\version    $Id: newpayment.php,v 1.59 2011/07/13 12:00:18 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -188,7 +188,12 @@ if ($urllogo)
 
 // Output introduction text
 $text='';
-if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT)) $text.=$langs->trans($conf->global->PAYBOX_NEWMEMBER_TEXT)."<br>\n";
+if (! empty($conf->global->PAYBOX_NEWFORM_TEXT))
+{
+    $langs->load("members");
+    if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
+    else $text.=$conf->global->PAYBOX_NEWFORM_TEXT."<br>\n";
+}
 if (empty($text))
 {
     $text.='<tr><td align="center"><br>'.$langs->trans("WelcomeOnPaymentPage").'<br></td></tr>'."\n";
@@ -723,5 +728,5 @@ html_print_paybox_footer($mysoc,$langs);
 
 $db->close();
 
-llxFooterPayBox('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.57 $');
+llxFooterPayBox('$Date: 2011/07/13 12:00:18 $ - $Revision: 1.59 $');
 ?>
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index 82fd23583a6..4b96c8075ea 100755
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -23,7 +23,7 @@
  *		\ingroup    paypal
  *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
  *		\author	    Laurent Destailleur
- *		\version    $Id: newpayment.php,v 1.22 2011/07/13 11:14:43 eldy Exp $
+ *		\version    $Id: newpayment.php,v 1.25 2011/07/13 12:03:29 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -282,7 +282,13 @@ if ($urllogo)
 
 // Output introduction text
 $text='';
-if (! empty($conf->global->PAYPAL_NEWMEMBER_TEXT)) $text.=$langs->trans($conf->global->PAYPAL_NEWMEMBER_TEXT)."<br>\n";
+if (! empty($conf->global->PAYPAL_NEWFORM_TEXT))
+{
+    $langs->load("members");
+    if (preg_match('/^\((.*)\)$/',$conf->global->PAYPAL_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
+    else $text.=$conf->global->PAYPAL_NEWFORM_TEXT."<br>\n";
+    $text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
+}
 if (empty($text))
 {
     $text.='<tr><td align="center"><br>'.$langs->trans("WelcomeOnPaymentPage").'<br></td></tr>'."\n";
@@ -941,5 +947,5 @@ html_print_paypal_footer($mysoc,$langs);
 
 $db->close();
 
-llxFooterPaypal('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.22 $');
+llxFooterPaypal('$Date: 2011/07/13 12:03:29 $ - $Revision: 1.25 $');
 ?>

From 0939965045f8d78e786b04d6a2989e7c053e8b5e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 12:00:18 +0000
Subject: [PATCH 47/91] Fix: Message for payment forms

---
 htdocs/public/paypal/newpayment.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index 4b96c8075ea..5215b3f9924 100755
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -23,7 +23,7 @@
  *		\ingroup    paypal
  *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
  *		\author	    Laurent Destailleur
- *		\version    $Id: newpayment.php,v 1.25 2011/07/13 12:03:29 eldy Exp $
+ *		\version    $Id: newpayment.php,v 1.24 2011/07/13 12:00:18 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -287,7 +287,6 @@ if (! empty($conf->global->PAYPAL_NEWFORM_TEXT))
     $langs->load("members");
     if (preg_match('/^\((.*)\)$/',$conf->global->PAYPAL_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
     else $text.=$conf->global->PAYPAL_NEWFORM_TEXT."<br>\n";
-    $text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
 }
 if (empty($text))
 {
@@ -947,5 +946,5 @@ html_print_paypal_footer($mysoc,$langs);
 
 $db->close();
 
-llxFooterPaypal('$Date: 2011/07/13 12:03:29 $ - $Revision: 1.25 $');
+llxFooterPaypal('$Date: 2011/07/13 12:00:18 $ - $Revision: 1.24 $');
 ?>

From d4f06046f036ee2d3f68137ab0429e353e4418af Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 11:42:39 +0000
Subject: [PATCH 48/91] Fix: Direct payment from autosubscribe form was showing
 wrong text.

---
 htdocs/adherents/fiche.php          |  6 +++---
 htdocs/public/members/new.php       |  8 ++++----
 htdocs/public/paybox/newpayment.php | 10 +++++-----
 htdocs/public/paypal/newpayment.php | 10 +++++-----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index 2eeb80e952f..7a01db892db 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -23,7 +23,7 @@
  *       \file       htdocs/adherents/fiche.php
  *       \ingroup    member
  *       \brief      Page of member
- *       \version    $Id: fiche.php,v 1.237 2011/07/13 11:50:33 eldy Exp $
+ *       \version    $Id$
  */
 
 require("../main.inc.php");
@@ -944,7 +944,7 @@ if ($action == 'edit')
     print '</td></tr>';
 
     // Country
-    //$adh->pays_id=$adh->pays_id?$adh->pays_id:$mysoc->pays_id;    // In edit mode we don't force to company country if not defined
+    $adh->pays_id=$adh->pays_id?$adh->pays_id:$mysoc->pays_id;
     print '<tr><td width="25%">'.$langs->trans('Country').'</td><td>';
     $html->select_pays(isset($_POST["pays_id"])?$_POST["pays_id"]:$adh->pays_id,'pays_id');
     if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
@@ -1505,5 +1505,5 @@ if ($rowid && $action != 'edit')
 
 $db->close();
 
-llxFooter('$Date: 2011/07/13 11:50:33 $ - $Revision: 1.237 $');
+llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index f4d349046b0..d461137eaf6 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -22,7 +22,7 @@
  *	\file       htdocs/public/members/new.php
  *	\ingroup    member
  *	\brief      Example of form to add a new member
- *	\version    $Id: new.php,v 1.42 2011/07/13 11:56:36 eldy Exp $
+ *	\version    $Id: new.php,v 1.41 2011/07/13 11:14:43 eldy Exp $
  *
  *  Note that you can add following constant to change behaviour of page
  *  MEMBER_NEWFORM_AMOUNT               Default amount for autosubscribe form
@@ -184,7 +184,7 @@ if ($action == 'add')
     }
     if (! empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER))
     {
-        if (GETPOST("morphy") == 'mor' && GETPOST('budget') <= 0)
+        if (GETPOST('budget') <= 0)
         {
             $error+=1;
             $errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("TurnoverOrBudget"))."<br>\n";
@@ -289,7 +289,7 @@ if ($action == 'added')
     print $langs->trans("NewMemberbyWeb");
     print '</center>';
 
-    llxFooterVierge('$Date: 2011/07/13 11:56:36 $ - $Revision: 1.42 $');
+    llxFooterVierge('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.41 $');
     exit;
 }
 
@@ -537,5 +537,5 @@ print "<br></form>\n";
 
 $db->close();
 
-llxFooterVierge('$Date: 2011/07/13 11:56:36 $ - $Revision: 1.42 $');
+llxFooterVierge('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.41 $');
 ?>
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index d87a7ed1051..e27a2493369 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -23,7 +23,7 @@
  *		\ingroup    paybox
  *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
  *		\author	    Laurent Destailleur
- *		\version    $Id: newpayment.php,v 1.59 2011/07/13 12:00:18 eldy Exp $
+ *		\version    $Id: newpayment.php,v 1.58 2011/07/13 11:42:39 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -188,11 +188,11 @@ if ($urllogo)
 
 // Output introduction text
 $text='';
-if (! empty($conf->global->PAYBOX_NEWFORM_TEXT))
+if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT))
 {
     $langs->load("members");
-    if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
-    else $text.=$conf->global->PAYBOX_NEWFORM_TEXT."<br>\n";
+    if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWMEMBER_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
+    else $text.=$conf->global->PAYBOX_NEWMEMBER_TEXT."<br>\n";
 }
 if (empty($text))
 {
@@ -728,5 +728,5 @@ html_print_paybox_footer($mysoc,$langs);
 
 $db->close();
 
-llxFooterPayBox('$Date: 2011/07/13 12:00:18 $ - $Revision: 1.59 $');
+llxFooterPayBox('$Date: 2011/07/13 11:42:39 $ - $Revision: 1.58 $');
 ?>
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index 5215b3f9924..30001659341 100755
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -23,7 +23,7 @@
  *		\ingroup    paypal
  *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
  *		\author	    Laurent Destailleur
- *		\version    $Id: newpayment.php,v 1.24 2011/07/13 12:00:18 eldy Exp $
+ *		\version    $Id: newpayment.php,v 1.23 2011/07/13 11:42:39 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -282,11 +282,11 @@ if ($urllogo)
 
 // Output introduction text
 $text='';
-if (! empty($conf->global->PAYPAL_NEWFORM_TEXT))
+if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT))
 {
     $langs->load("members");
-    if (preg_match('/^\((.*)\)$/',$conf->global->PAYPAL_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
-    else $text.=$conf->global->PAYPAL_NEWFORM_TEXT."<br>\n";
+    if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWMEMBER_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
+    else $text.=$conf->global->PAYBOX_NEWMEMBER_TEXT."<br>\n";
 }
 if (empty($text))
 {
@@ -946,5 +946,5 @@ html_print_paypal_footer($mysoc,$langs);
 
 $db->close();
 
-llxFooterPaypal('$Date: 2011/07/13 12:00:18 $ - $Revision: 1.24 $');
+llxFooterPaypal('$Date: 2011/07/13 11:42:39 $ - $Revision: 1.23 $');
 ?>

From 2c6b05727046999285763a68112bed44de366710 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 12:03:30 +0000
Subject: [PATCH 49/91] Fix: Message for payment forms

---
 htdocs/adherents/fiche.php          |  6 +++---
 htdocs/langs/en_US/members.lang     |  2 +-
 htdocs/langs/fr_FR/members.lang     |  2 +-
 htdocs/public/members/new.php       |  8 ++++----
 htdocs/public/paybox/newpayment.php | 11 ++++++-----
 htdocs/public/paypal/newpayment.php | 10 +++++-----
 6 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index 7a01db892db..2eeb80e952f 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -23,7 +23,7 @@
  *       \file       htdocs/adherents/fiche.php
  *       \ingroup    member
  *       \brief      Page of member
- *       \version    $Id$
+ *       \version    $Id: fiche.php,v 1.237 2011/07/13 11:50:33 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -944,7 +944,7 @@ if ($action == 'edit')
     print '</td></tr>';
 
     // Country
-    $adh->pays_id=$adh->pays_id?$adh->pays_id:$mysoc->pays_id;
+    //$adh->pays_id=$adh->pays_id?$adh->pays_id:$mysoc->pays_id;    // In edit mode we don't force to company country if not defined
     print '<tr><td width="25%">'.$langs->trans('Country').'</td><td>';
     $html->select_pays(isset($_POST["pays_id"])?$_POST["pays_id"]:$adh->pays_id,'pays_id');
     if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
@@ -1505,5 +1505,5 @@ if ($rowid && $action != 'edit')
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/13 11:50:33 $ - $Revision: 1.237 $');
 ?>
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 935d02f67b4..9a38ecb5f11 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -193,4 +193,4 @@ Associations=Foundations
 Collectivités=Organizations
 Particuliers=Personal
 Entreprises=Companies
-DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br><br> 
+DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br> 
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 4712ca76959..6d55546256d 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -197,4 +197,4 @@ Associations=Associations
 Collectivités=Collectivités
 Particuliers=Particuliers
 Entreprises=Entreprises
-DOLIBARRFOUNDATION_PAYMENT_FORM=Pour réaliser le paiement de votre cotisation par virement bancaire ou par chèque, consulter la page <a href="http://wiki.dolibarr.org/index.php/Adh%C3%A9rer#Pour_une_adh.C3.A9sion_par_ch.C3.A8que">http://wiki.dolibarr.org/index.php/Adhérer</a>.<br>Pour payer dès maintenant par Carte Bancaire ou Paypal, cliquer sur le bouton au bas de cette page.<br><br>
+DOLIBARRFOUNDATION_PAYMENT_FORM=Pour réaliser le paiement de votre cotisation par virement bancaire ou par chèque, consulter la page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Adh%C3%A9rer#Pour_une_adh.C3.A9sion_par_ch.C3.A8que">http://wiki.dolibarr.org/index.php/Adhérer</a>.<br>Pour payer dès maintenant par Carte Bancaire ou Paypal, cliquer sur le bouton au bas de cette page.<br>
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index d461137eaf6..f4d349046b0 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -22,7 +22,7 @@
  *	\file       htdocs/public/members/new.php
  *	\ingroup    member
  *	\brief      Example of form to add a new member
- *	\version    $Id: new.php,v 1.41 2011/07/13 11:14:43 eldy Exp $
+ *	\version    $Id: new.php,v 1.42 2011/07/13 11:56:36 eldy Exp $
  *
  *  Note that you can add following constant to change behaviour of page
  *  MEMBER_NEWFORM_AMOUNT               Default amount for autosubscribe form
@@ -184,7 +184,7 @@ if ($action == 'add')
     }
     if (! empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER))
     {
-        if (GETPOST('budget') <= 0)
+        if (GETPOST("morphy") == 'mor' && GETPOST('budget') <= 0)
         {
             $error+=1;
             $errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("TurnoverOrBudget"))."<br>\n";
@@ -289,7 +289,7 @@ if ($action == 'added')
     print $langs->trans("NewMemberbyWeb");
     print '</center>';
 
-    llxFooterVierge('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.41 $');
+    llxFooterVierge('$Date: 2011/07/13 11:56:36 $ - $Revision: 1.42 $');
     exit;
 }
 
@@ -537,5 +537,5 @@ print "<br></form>\n";
 
 $db->close();
 
-llxFooterVierge('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.41 $');
+llxFooterVierge('$Date: 2011/07/13 11:56:36 $ - $Revision: 1.42 $');
 ?>
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index e27a2493369..9d405438673 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -23,7 +23,7 @@
  *		\ingroup    paybox
  *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
  *		\author	    Laurent Destailleur
- *		\version    $Id: newpayment.php,v 1.58 2011/07/13 11:42:39 eldy Exp $
+ *		\version    $Id: newpayment.php,v 1.60 2011/07/13 12:03:30 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -188,11 +188,12 @@ if ($urllogo)
 
 // Output introduction text
 $text='';
-if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT))
+if (! empty($conf->global->PAYBOX_NEWFORM_TEXT))
 {
     $langs->load("members");
-    if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWMEMBER_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
-    else $text.=$conf->global->PAYBOX_NEWMEMBER_TEXT."<br>\n";
+    if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
+    else $text.=$conf->global->PAYBOX_NEWFORM_TEXT."<br>\n";
+    $text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
 }
 if (empty($text))
 {
@@ -728,5 +729,5 @@ html_print_paybox_footer($mysoc,$langs);
 
 $db->close();
 
-llxFooterPayBox('$Date: 2011/07/13 11:42:39 $ - $Revision: 1.58 $');
+llxFooterPayBox('$Date: 2011/07/13 12:03:30 $ - $Revision: 1.60 $');
 ?>
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index 30001659341..5215b3f9924 100755
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -23,7 +23,7 @@
  *		\ingroup    paypal
  *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
  *		\author	    Laurent Destailleur
- *		\version    $Id: newpayment.php,v 1.23 2011/07/13 11:42:39 eldy Exp $
+ *		\version    $Id: newpayment.php,v 1.24 2011/07/13 12:00:18 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -282,11 +282,11 @@ if ($urllogo)
 
 // Output introduction text
 $text='';
-if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT))
+if (! empty($conf->global->PAYPAL_NEWFORM_TEXT))
 {
     $langs->load("members");
-    if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWMEMBER_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
-    else $text.=$conf->global->PAYBOX_NEWMEMBER_TEXT."<br>\n";
+    if (preg_match('/^\((.*)\)$/',$conf->global->PAYPAL_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
+    else $text.=$conf->global->PAYPAL_NEWFORM_TEXT."<br>\n";
 }
 if (empty($text))
 {
@@ -946,5 +946,5 @@ html_print_paypal_footer($mysoc,$langs);
 
 $db->close();
 
-llxFooterPaypal('$Date: 2011/07/13 11:42:39 $ - $Revision: 1.23 $');
+llxFooterPaypal('$Date: 2011/07/13 12:00:18 $ - $Revision: 1.24 $');
 ?>

From f7e510c76f7bc772544715454e9c50c2651fb5be Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 13:10:51 +0000
Subject: [PATCH 50/91] Fix: Trans

---
 htdocs/fourn/facture/index.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index 61f8131f847..5d753e8e01d 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2002-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,7 @@
  *       \file       htdocs/fourn/facture/index.php
  *       \ingroup    fournisseur,facture
  *       \brief      List of suppliers invoices
- *       \version    $Id$
+ *       \version    $Id: index.php,v 1.84 2011/07/13 13:10:51 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -35,6 +35,7 @@ if (!$user->rights->fournisseur->facture->lire)
 accessforbidden();
 
 $langs->load("companies");
+$langs->load("bills");
 
 $socid = $_GET["socid"];
 
@@ -292,5 +293,5 @@ else
 $db->close();
 
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/13 13:10:51 $ - $Revision: 1.84 $');
 ?>

From 0ef5b0335d346261ab5e15e44f26f052c73c841e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 11:50:33 +0000
Subject: [PATCH 51/91] Fix: Direct payment from autosubscribe form was showing
 wrong text.

---
 htdocs/fourn/facture/index.php      |  7 +++----
 htdocs/langs/en_US/members.lang     |  2 +-
 htdocs/langs/fr_FR/members.lang     |  2 +-
 htdocs/public/members/new.php       |  8 ++++----
 htdocs/public/paybox/newpayment.php | 11 +++++------
 htdocs/public/paypal/newpayment.php | 10 +++++-----
 6 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index 5d753e8e01d..61f8131f847 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2002-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,7 @@
  *       \file       htdocs/fourn/facture/index.php
  *       \ingroup    fournisseur,facture
  *       \brief      List of suppliers invoices
- *       \version    $Id: index.php,v 1.84 2011/07/13 13:10:51 eldy Exp $
+ *       \version    $Id$
  */
 
 require("../../main.inc.php");
@@ -35,7 +35,6 @@ if (!$user->rights->fournisseur->facture->lire)
 accessforbidden();
 
 $langs->load("companies");
-$langs->load("bills");
 
 $socid = $_GET["socid"];
 
@@ -293,5 +292,5 @@ else
 $db->close();
 
 
-llxFooter('$Date: 2011/07/13 13:10:51 $ - $Revision: 1.84 $');
+llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 9a38ecb5f11..935d02f67b4 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -193,4 +193,4 @@ Associations=Foundations
 Collectivités=Organizations
 Particuliers=Personal
 Entreprises=Companies
-DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br> 
+DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br><br> 
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 6d55546256d..4712ca76959 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -197,4 +197,4 @@ Associations=Associations
 Collectivités=Collectivités
 Particuliers=Particuliers
 Entreprises=Entreprises
-DOLIBARRFOUNDATION_PAYMENT_FORM=Pour réaliser le paiement de votre cotisation par virement bancaire ou par chèque, consulter la page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Adh%C3%A9rer#Pour_une_adh.C3.A9sion_par_ch.C3.A8que">http://wiki.dolibarr.org/index.php/Adhérer</a>.<br>Pour payer dès maintenant par Carte Bancaire ou Paypal, cliquer sur le bouton au bas de cette page.<br>
+DOLIBARRFOUNDATION_PAYMENT_FORM=Pour réaliser le paiement de votre cotisation par virement bancaire ou par chèque, consulter la page <a href="http://wiki.dolibarr.org/index.php/Adh%C3%A9rer#Pour_une_adh.C3.A9sion_par_ch.C3.A8que">http://wiki.dolibarr.org/index.php/Adhérer</a>.<br>Pour payer dès maintenant par Carte Bancaire ou Paypal, cliquer sur le bouton au bas de cette page.<br><br>
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index f4d349046b0..d461137eaf6 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -22,7 +22,7 @@
  *	\file       htdocs/public/members/new.php
  *	\ingroup    member
  *	\brief      Example of form to add a new member
- *	\version    $Id: new.php,v 1.42 2011/07/13 11:56:36 eldy Exp $
+ *	\version    $Id: new.php,v 1.41 2011/07/13 11:14:43 eldy Exp $
  *
  *  Note that you can add following constant to change behaviour of page
  *  MEMBER_NEWFORM_AMOUNT               Default amount for autosubscribe form
@@ -184,7 +184,7 @@ if ($action == 'add')
     }
     if (! empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER))
     {
-        if (GETPOST("morphy") == 'mor' && GETPOST('budget') <= 0)
+        if (GETPOST('budget') <= 0)
         {
             $error+=1;
             $errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("TurnoverOrBudget"))."<br>\n";
@@ -289,7 +289,7 @@ if ($action == 'added')
     print $langs->trans("NewMemberbyWeb");
     print '</center>';
 
-    llxFooterVierge('$Date: 2011/07/13 11:56:36 $ - $Revision: 1.42 $');
+    llxFooterVierge('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.41 $');
     exit;
 }
 
@@ -537,5 +537,5 @@ print "<br></form>\n";
 
 $db->close();
 
-llxFooterVierge('$Date: 2011/07/13 11:56:36 $ - $Revision: 1.42 $');
+llxFooterVierge('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.41 $');
 ?>
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index 9d405438673..e27a2493369 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -23,7 +23,7 @@
  *		\ingroup    paybox
  *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
  *		\author	    Laurent Destailleur
- *		\version    $Id: newpayment.php,v 1.60 2011/07/13 12:03:30 eldy Exp $
+ *		\version    $Id: newpayment.php,v 1.58 2011/07/13 11:42:39 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -188,12 +188,11 @@ if ($urllogo)
 
 // Output introduction text
 $text='';
-if (! empty($conf->global->PAYBOX_NEWFORM_TEXT))
+if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT))
 {
     $langs->load("members");
-    if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
-    else $text.=$conf->global->PAYBOX_NEWFORM_TEXT."<br>\n";
-    $text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
+    if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWMEMBER_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
+    else $text.=$conf->global->PAYBOX_NEWMEMBER_TEXT."<br>\n";
 }
 if (empty($text))
 {
@@ -729,5 +728,5 @@ html_print_paybox_footer($mysoc,$langs);
 
 $db->close();
 
-llxFooterPayBox('$Date: 2011/07/13 12:03:30 $ - $Revision: 1.60 $');
+llxFooterPayBox('$Date: 2011/07/13 11:42:39 $ - $Revision: 1.58 $');
 ?>
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index 5215b3f9924..30001659341 100755
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -23,7 +23,7 @@
  *		\ingroup    paypal
  *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
  *		\author	    Laurent Destailleur
- *		\version    $Id: newpayment.php,v 1.24 2011/07/13 12:00:18 eldy Exp $
+ *		\version    $Id: newpayment.php,v 1.23 2011/07/13 11:42:39 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -282,11 +282,11 @@ if ($urllogo)
 
 // Output introduction text
 $text='';
-if (! empty($conf->global->PAYPAL_NEWFORM_TEXT))
+if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT))
 {
     $langs->load("members");
-    if (preg_match('/^\((.*)\)$/',$conf->global->PAYPAL_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
-    else $text.=$conf->global->PAYPAL_NEWFORM_TEXT."<br>\n";
+    if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWMEMBER_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
+    else $text.=$conf->global->PAYBOX_NEWMEMBER_TEXT."<br>\n";
 }
 if (empty($text))
 {
@@ -946,5 +946,5 @@ html_print_paypal_footer($mysoc,$langs);
 
 $db->close();
 
-llxFooterPaypal('$Date: 2011/07/13 12:00:18 $ - $Revision: 1.24 $');
+llxFooterPaypal('$Date: 2011/07/13 11:42:39 $ - $Revision: 1.23 $');
 ?>

From b32df224b01fbf8822e2c596378288fe3a111bb1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 13:15:17 +0000
Subject: [PATCH 52/91] Fix: No duplicate alt

---
 htdocs/admin/system/dolibarr.php    |  8 ++++----
 htdocs/fourn/facture/index.php      |  7 ++++---
 htdocs/langs/en_US/members.lang     |  2 +-
 htdocs/langs/fr_FR/members.lang     |  2 +-
 htdocs/public/members/new.php       |  8 ++++----
 htdocs/public/paybox/newpayment.php | 11 ++++++-----
 htdocs/public/paypal/newpayment.php | 10 +++++-----
 7 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 54c28b04389..29544b85be1 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -20,7 +20,7 @@
 /**
  *  \file       htdocs/admin/system/dolibarr.php
  *  \brief      Page to show Dolibarr informations
- *  \version    $Id$
+ *  \version    $Id: dolibarr.php,v 1.58 2011/07/13 13:15:17 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -163,7 +163,7 @@ if (function_exists('date_default_timezone_get'))
 	print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("CurrentTimeZone").'</td><td>';	// Timezone server PHP
 	$a=date_default_timezone_get();
 	$a.=' ('.(-dol_mktime(0,0,0,1,1,1970)>0?'+':'').(-dol_mktime(0,0,0,1,1,1970)).')';
-    print $form->textwithtooltip($a,$txt,2,1,img_info());
+    print $form->textwithtooltip($a,$txt,2,1,img_info(''));
 	print '</td></tr>'."\n";	// value defined in http://fr3.php.net/manual/en/timezones.europe.php
 }
 else
@@ -171,7 +171,7 @@ else
     $var=!$var;
     print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("PHPServerOffsetWithGreenwich").'</td><td>';
     $a=(-dol_mktime(0,0,0,1,1,1970)>0?'+':'').(-dol_mktime(0,0,0,1,1,1970));
-    print $form->textwithtooltip($a,$txt,2,1,img_info());
+    print $form->textwithtooltip($a,$txt,2,1,img_info(''));
     print '</td></tr>'."\n";
 }
 $var=!$var;
@@ -213,5 +213,5 @@ print '<tr '.$bc[$var].'><td width="300">=> '.$langs->trans("File encoding").'</
 print '</table>';
 print '<br>';
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/13 13:15:17 $ - $Revision: 1.58 $');
 ?>
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index 61f8131f847..5d753e8e01d 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2002-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,7 @@
  *       \file       htdocs/fourn/facture/index.php
  *       \ingroup    fournisseur,facture
  *       \brief      List of suppliers invoices
- *       \version    $Id$
+ *       \version    $Id: index.php,v 1.84 2011/07/13 13:10:51 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -35,6 +35,7 @@ if (!$user->rights->fournisseur->facture->lire)
 accessforbidden();
 
 $langs->load("companies");
+$langs->load("bills");
 
 $socid = $_GET["socid"];
 
@@ -292,5 +293,5 @@ else
 $db->close();
 
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/13 13:10:51 $ - $Revision: 1.84 $');
 ?>
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 935d02f67b4..9a38ecb5f11 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -193,4 +193,4 @@ Associations=Foundations
 Collectivités=Organizations
 Particuliers=Personal
 Entreprises=Companies
-DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br><br> 
+DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br> 
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 4712ca76959..6d55546256d 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -197,4 +197,4 @@ Associations=Associations
 Collectivités=Collectivités
 Particuliers=Particuliers
 Entreprises=Entreprises
-DOLIBARRFOUNDATION_PAYMENT_FORM=Pour réaliser le paiement de votre cotisation par virement bancaire ou par chèque, consulter la page <a href="http://wiki.dolibarr.org/index.php/Adh%C3%A9rer#Pour_une_adh.C3.A9sion_par_ch.C3.A8que">http://wiki.dolibarr.org/index.php/Adhérer</a>.<br>Pour payer dès maintenant par Carte Bancaire ou Paypal, cliquer sur le bouton au bas de cette page.<br><br>
+DOLIBARRFOUNDATION_PAYMENT_FORM=Pour réaliser le paiement de votre cotisation par virement bancaire ou par chèque, consulter la page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Adh%C3%A9rer#Pour_une_adh.C3.A9sion_par_ch.C3.A8que">http://wiki.dolibarr.org/index.php/Adhérer</a>.<br>Pour payer dès maintenant par Carte Bancaire ou Paypal, cliquer sur le bouton au bas de cette page.<br>
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index d461137eaf6..f4d349046b0 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -22,7 +22,7 @@
  *	\file       htdocs/public/members/new.php
  *	\ingroup    member
  *	\brief      Example of form to add a new member
- *	\version    $Id: new.php,v 1.41 2011/07/13 11:14:43 eldy Exp $
+ *	\version    $Id: new.php,v 1.42 2011/07/13 11:56:36 eldy Exp $
  *
  *  Note that you can add following constant to change behaviour of page
  *  MEMBER_NEWFORM_AMOUNT               Default amount for autosubscribe form
@@ -184,7 +184,7 @@ if ($action == 'add')
     }
     if (! empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER))
     {
-        if (GETPOST('budget') <= 0)
+        if (GETPOST("morphy") == 'mor' && GETPOST('budget') <= 0)
         {
             $error+=1;
             $errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("TurnoverOrBudget"))."<br>\n";
@@ -289,7 +289,7 @@ if ($action == 'added')
     print $langs->trans("NewMemberbyWeb");
     print '</center>';
 
-    llxFooterVierge('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.41 $');
+    llxFooterVierge('$Date: 2011/07/13 11:56:36 $ - $Revision: 1.42 $');
     exit;
 }
 
@@ -537,5 +537,5 @@ print "<br></form>\n";
 
 $db->close();
 
-llxFooterVierge('$Date: 2011/07/13 11:14:43 $ - $Revision: 1.41 $');
+llxFooterVierge('$Date: 2011/07/13 11:56:36 $ - $Revision: 1.42 $');
 ?>
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index e27a2493369..9d405438673 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -23,7 +23,7 @@
  *		\ingroup    paybox
  *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
  *		\author	    Laurent Destailleur
- *		\version    $Id: newpayment.php,v 1.58 2011/07/13 11:42:39 eldy Exp $
+ *		\version    $Id: newpayment.php,v 1.60 2011/07/13 12:03:30 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -188,11 +188,12 @@ if ($urllogo)
 
 // Output introduction text
 $text='';
-if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT))
+if (! empty($conf->global->PAYBOX_NEWFORM_TEXT))
 {
     $langs->load("members");
-    if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWMEMBER_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
-    else $text.=$conf->global->PAYBOX_NEWMEMBER_TEXT."<br>\n";
+    if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
+    else $text.=$conf->global->PAYBOX_NEWFORM_TEXT."<br>\n";
+    $text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
 }
 if (empty($text))
 {
@@ -728,5 +729,5 @@ html_print_paybox_footer($mysoc,$langs);
 
 $db->close();
 
-llxFooterPayBox('$Date: 2011/07/13 11:42:39 $ - $Revision: 1.58 $');
+llxFooterPayBox('$Date: 2011/07/13 12:03:30 $ - $Revision: 1.60 $');
 ?>
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index 30001659341..5215b3f9924 100755
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -23,7 +23,7 @@
  *		\ingroup    paypal
  *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
  *		\author	    Laurent Destailleur
- *		\version    $Id: newpayment.php,v 1.23 2011/07/13 11:42:39 eldy Exp $
+ *		\version    $Id: newpayment.php,v 1.24 2011/07/13 12:00:18 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -282,11 +282,11 @@ if ($urllogo)
 
 // Output introduction text
 $text='';
-if (! empty($conf->global->PAYBOX_NEWMEMBER_TEXT))
+if (! empty($conf->global->PAYPAL_NEWFORM_TEXT))
 {
     $langs->load("members");
-    if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWMEMBER_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
-    else $text.=$conf->global->PAYBOX_NEWMEMBER_TEXT."<br>\n";
+    if (preg_match('/^\((.*)\)$/',$conf->global->PAYPAL_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
+    else $text.=$conf->global->PAYPAL_NEWFORM_TEXT."<br>\n";
 }
 if (empty($text))
 {
@@ -946,5 +946,5 @@ html_print_paypal_footer($mysoc,$langs);
 
 $db->close();
 
-llxFooterPaypal('$Date: 2011/07/13 11:42:39 $ - $Revision: 1.23 $');
+llxFooterPaypal('$Date: 2011/07/13 12:00:18 $ - $Revision: 1.24 $');
 ?>

From 477a1404ccc7f2e51e42753669fba447c8490727 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 14:03:15 +0000
Subject: [PATCH 53/91] Fix: Missing global

---
 htdocs/core/class/html.form.class.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 7e97abed808..5c7dbb3a456 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -31,7 +31,7 @@
  *	\file       htdocs/core/class/html.form.class.php
  *  \ingroup    core
  *	\brief      File of class with all html predefined components
- *	\version	$Id: html.form.class.php,v 1.188 2011/07/10 17:28:09 hregis Exp $
+ *	\version	$Id: html.form.class.php,v 1.189 2011/07/13 14:03:15 eldy Exp $
  */
 
 
@@ -1771,12 +1771,14 @@ class Form
     }
 
     /**
-     *    \brief      Retourne la liste deroulante des differents etats d'une propal.
-     *                Les valeurs de la liste sont les id de la table c_propalst
-     *    \param      selected    etat pre-selectionne
+     *    Return combo list of differents status of a proposal
+     *    Values are id of table c_propalst
+     *    @param      selected    etat pre-selectionne
      */
     function select_propal_statut($selected='')
     {
+        global $langs;
+
         $sql = "SELECT id, code, label, active FROM ".MAIN_DB_PREFIX."c_propalst";
         $sql .= " WHERE active = 1";
 

From f79e39517b915b944f6bd790d9e1c1b98bed01f5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 14:09:35 +0000
Subject: [PATCH 54/91] Fix: Bad var

---
 htdocs/includes/modules/fichinter/pdf_soleil.modules.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
index ad281e7f23a..f58d2118dcc 100644
--- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
+++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
@@ -23,7 +23,7 @@
  *	\file       htdocs/includes/modules/fichinter/pdf_soleil.modules.php
  *	\ingroup    ficheinter
  *	\brief      Fichier de la classe permettant de generer les fiches d'intervention au modele Soleil
- *	\version    $Id$
+ *	\version    $Id: pdf_soleil.modules.php,v 1.101 2011/07/13 14:09:35 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
@@ -105,7 +105,7 @@ class pdf_soleil extends ModelePDFFicheinter
 				$result=$fichinter->fetch($id);
 				if ($result < 0)
 				{
-					dol_print_error($db,$fichinter->error);
+					dol_print_error($this->db,$fichinter->error);
 				}
 			}
 

From 3c30e1c8c3bc0dc48ff3f9a4fd53e6f250edb27c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 11:56:36 +0000
Subject: [PATCH 55/91] Fix: Message for payment forms

---
 htdocs/admin/system/dolibarr.php                       |  8 ++++----
 htdocs/core/class/html.form.class.php                  | 10 ++++------
 htdocs/fourn/facture/index.php                         |  7 +++----
 .../includes/modules/fichinter/pdf_soleil.modules.php  |  4 ++--
 htdocs/langs/en_US/members.lang                        |  2 +-
 htdocs/langs/fr_FR/members.lang                        |  2 +-
 htdocs/public/paybox/newpayment.php                    |  5 ++---
 htdocs/public/paypal/newpayment.php                    |  5 +++--
 8 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 29544b85be1..54c28b04389 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -20,7 +20,7 @@
 /**
  *  \file       htdocs/admin/system/dolibarr.php
  *  \brief      Page to show Dolibarr informations
- *  \version    $Id: dolibarr.php,v 1.58 2011/07/13 13:15:17 eldy Exp $
+ *  \version    $Id$
  */
 
 require("../../main.inc.php");
@@ -163,7 +163,7 @@ if (function_exists('date_default_timezone_get'))
 	print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("CurrentTimeZone").'</td><td>';	// Timezone server PHP
 	$a=date_default_timezone_get();
 	$a.=' ('.(-dol_mktime(0,0,0,1,1,1970)>0?'+':'').(-dol_mktime(0,0,0,1,1,1970)).')';
-    print $form->textwithtooltip($a,$txt,2,1,img_info(''));
+    print $form->textwithtooltip($a,$txt,2,1,img_info());
 	print '</td></tr>'."\n";	// value defined in http://fr3.php.net/manual/en/timezones.europe.php
 }
 else
@@ -171,7 +171,7 @@ else
     $var=!$var;
     print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("PHPServerOffsetWithGreenwich").'</td><td>';
     $a=(-dol_mktime(0,0,0,1,1,1970)>0?'+':'').(-dol_mktime(0,0,0,1,1,1970));
-    print $form->textwithtooltip($a,$txt,2,1,img_info(''));
+    print $form->textwithtooltip($a,$txt,2,1,img_info());
     print '</td></tr>'."\n";
 }
 $var=!$var;
@@ -213,5 +213,5 @@ print '<tr '.$bc[$var].'><td width="300">=> '.$langs->trans("File encoding").'</
 print '</table>';
 print '<br>';
 
-llxFooter('$Date: 2011/07/13 13:15:17 $ - $Revision: 1.58 $');
+llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 5c7dbb3a456..7e97abed808 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -31,7 +31,7 @@
  *	\file       htdocs/core/class/html.form.class.php
  *  \ingroup    core
  *	\brief      File of class with all html predefined components
- *	\version	$Id: html.form.class.php,v 1.189 2011/07/13 14:03:15 eldy Exp $
+ *	\version	$Id: html.form.class.php,v 1.188 2011/07/10 17:28:09 hregis Exp $
  */
 
 
@@ -1771,14 +1771,12 @@ class Form
     }
 
     /**
-     *    Return combo list of differents status of a proposal
-     *    Values are id of table c_propalst
-     *    @param      selected    etat pre-selectionne
+     *    \brief      Retourne la liste deroulante des differents etats d'une propal.
+     *                Les valeurs de la liste sont les id de la table c_propalst
+     *    \param      selected    etat pre-selectionne
      */
     function select_propal_statut($selected='')
     {
-        global $langs;
-
         $sql = "SELECT id, code, label, active FROM ".MAIN_DB_PREFIX."c_propalst";
         $sql .= " WHERE active = 1";
 
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index 5d753e8e01d..61f8131f847 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2002-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,7 @@
  *       \file       htdocs/fourn/facture/index.php
  *       \ingroup    fournisseur,facture
  *       \brief      List of suppliers invoices
- *       \version    $Id: index.php,v 1.84 2011/07/13 13:10:51 eldy Exp $
+ *       \version    $Id$
  */
 
 require("../../main.inc.php");
@@ -35,7 +35,6 @@ if (!$user->rights->fournisseur->facture->lire)
 accessforbidden();
 
 $langs->load("companies");
-$langs->load("bills");
 
 $socid = $_GET["socid"];
 
@@ -293,5 +292,5 @@ else
 $db->close();
 
 
-llxFooter('$Date: 2011/07/13 13:10:51 $ - $Revision: 1.84 $');
+llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
index f58d2118dcc..ad281e7f23a 100644
--- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
+++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
@@ -23,7 +23,7 @@
  *	\file       htdocs/includes/modules/fichinter/pdf_soleil.modules.php
  *	\ingroup    ficheinter
  *	\brief      Fichier de la classe permettant de generer les fiches d'intervention au modele Soleil
- *	\version    $Id: pdf_soleil.modules.php,v 1.101 2011/07/13 14:09:35 eldy Exp $
+ *	\version    $Id$
  */
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
@@ -105,7 +105,7 @@ class pdf_soleil extends ModelePDFFicheinter
 				$result=$fichinter->fetch($id);
 				if ($result < 0)
 				{
-					dol_print_error($this->db,$fichinter->error);
+					dol_print_error($db,$fichinter->error);
 				}
 			}
 
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 9a38ecb5f11..935d02f67b4 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -193,4 +193,4 @@ Associations=Foundations
 Collectivités=Organizations
 Particuliers=Personal
 Entreprises=Companies
-DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br> 
+DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br><br> 
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 6d55546256d..4712ca76959 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -197,4 +197,4 @@ Associations=Associations
 Collectivités=Collectivités
 Particuliers=Particuliers
 Entreprises=Entreprises
-DOLIBARRFOUNDATION_PAYMENT_FORM=Pour réaliser le paiement de votre cotisation par virement bancaire ou par chèque, consulter la page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Adh%C3%A9rer#Pour_une_adh.C3.A9sion_par_ch.C3.A8que">http://wiki.dolibarr.org/index.php/Adhérer</a>.<br>Pour payer dès maintenant par Carte Bancaire ou Paypal, cliquer sur le bouton au bas de cette page.<br>
+DOLIBARRFOUNDATION_PAYMENT_FORM=Pour réaliser le paiement de votre cotisation par virement bancaire ou par chèque, consulter la page <a href="http://wiki.dolibarr.org/index.php/Adh%C3%A9rer#Pour_une_adh.C3.A9sion_par_ch.C3.A8que">http://wiki.dolibarr.org/index.php/Adhérer</a>.<br>Pour payer dès maintenant par Carte Bancaire ou Paypal, cliquer sur le bouton au bas de cette page.<br><br>
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index 9d405438673..d87a7ed1051 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -23,7 +23,7 @@
  *		\ingroup    paybox
  *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
  *		\author	    Laurent Destailleur
- *		\version    $Id: newpayment.php,v 1.60 2011/07/13 12:03:30 eldy Exp $
+ *		\version    $Id: newpayment.php,v 1.59 2011/07/13 12:00:18 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -193,7 +193,6 @@ if (! empty($conf->global->PAYBOX_NEWFORM_TEXT))
     $langs->load("members");
     if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
     else $text.=$conf->global->PAYBOX_NEWFORM_TEXT."<br>\n";
-    $text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
 }
 if (empty($text))
 {
@@ -729,5 +728,5 @@ html_print_paybox_footer($mysoc,$langs);
 
 $db->close();
 
-llxFooterPayBox('$Date: 2011/07/13 12:03:30 $ - $Revision: 1.60 $');
+llxFooterPayBox('$Date: 2011/07/13 12:00:18 $ - $Revision: 1.59 $');
 ?>
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index 5215b3f9924..4b96c8075ea 100755
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -23,7 +23,7 @@
  *		\ingroup    paypal
  *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
  *		\author	    Laurent Destailleur
- *		\version    $Id: newpayment.php,v 1.24 2011/07/13 12:00:18 eldy Exp $
+ *		\version    $Id: newpayment.php,v 1.25 2011/07/13 12:03:29 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -287,6 +287,7 @@ if (! empty($conf->global->PAYPAL_NEWFORM_TEXT))
     $langs->load("members");
     if (preg_match('/^\((.*)\)$/',$conf->global->PAYPAL_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
     else $text.=$conf->global->PAYPAL_NEWFORM_TEXT."<br>\n";
+    $text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
 }
 if (empty($text))
 {
@@ -946,5 +947,5 @@ html_print_paypal_footer($mysoc,$langs);
 
 $db->close();
 
-llxFooterPaypal('$Date: 2011/07/13 12:00:18 $ - $Revision: 1.24 $');
+llxFooterPaypal('$Date: 2011/07/13 12:03:29 $ - $Revision: 1.25 $');
 ?>

From f0c72950278b86e2f37b6cd10cff31d856ad8a0f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 14:16:39 +0000
Subject: [PATCH 56/91] Doc

---
 ChangeLog                                              |  3 ++-
 htdocs/admin/system/dolibarr.php                       |  8 ++++----
 htdocs/core/class/html.form.class.php                  | 10 ++++++----
 htdocs/fourn/facture/index.php                         |  7 ++++---
 .../includes/modules/fichinter/pdf_soleil.modules.php  |  4 ++--
 htdocs/langs/en_US/members.lang                        |  2 +-
 htdocs/langs/fr_FR/members.lang                        |  2 +-
 htdocs/public/paybox/newpayment.php                    |  5 +++--
 htdocs/public/paypal/newpayment.php                    |  5 ++---
 9 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 81aa3c6c02d..2808c594086 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,10 @@
 --------------------------------------------------------------
 English Dolibarr ChangeLog
-$Id: ChangeLog,v 1.423 2011/07/07 16:03:53 simnandez Exp $
+$Id: ChangeLog,v 1.424 2011/07/13 14:16:39 eldy Exp $
 --------------------------------------------------------------
 
 ***** ChangeLog for 3.1 compared to 3.0 *****
+WARNING: IE6 browser is no more supported in this version.
 For users:
 - New: War against number of clicks:
      - When adding a free bank transaction, form to add next one is still
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 54c28b04389..29544b85be1 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -20,7 +20,7 @@
 /**
  *  \file       htdocs/admin/system/dolibarr.php
  *  \brief      Page to show Dolibarr informations
- *  \version    $Id$
+ *  \version    $Id: dolibarr.php,v 1.58 2011/07/13 13:15:17 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -163,7 +163,7 @@ if (function_exists('date_default_timezone_get'))
 	print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("CurrentTimeZone").'</td><td>';	// Timezone server PHP
 	$a=date_default_timezone_get();
 	$a.=' ('.(-dol_mktime(0,0,0,1,1,1970)>0?'+':'').(-dol_mktime(0,0,0,1,1,1970)).')';
-    print $form->textwithtooltip($a,$txt,2,1,img_info());
+    print $form->textwithtooltip($a,$txt,2,1,img_info(''));
 	print '</td></tr>'."\n";	// value defined in http://fr3.php.net/manual/en/timezones.europe.php
 }
 else
@@ -171,7 +171,7 @@ else
     $var=!$var;
     print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("PHPServerOffsetWithGreenwich").'</td><td>';
     $a=(-dol_mktime(0,0,0,1,1,1970)>0?'+':'').(-dol_mktime(0,0,0,1,1,1970));
-    print $form->textwithtooltip($a,$txt,2,1,img_info());
+    print $form->textwithtooltip($a,$txt,2,1,img_info(''));
     print '</td></tr>'."\n";
 }
 $var=!$var;
@@ -213,5 +213,5 @@ print '<tr '.$bc[$var].'><td width="300">=> '.$langs->trans("File encoding").'</
 print '</table>';
 print '<br>';
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/13 13:15:17 $ - $Revision: 1.58 $');
 ?>
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 7e97abed808..5c7dbb3a456 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -31,7 +31,7 @@
  *	\file       htdocs/core/class/html.form.class.php
  *  \ingroup    core
  *	\brief      File of class with all html predefined components
- *	\version	$Id: html.form.class.php,v 1.188 2011/07/10 17:28:09 hregis Exp $
+ *	\version	$Id: html.form.class.php,v 1.189 2011/07/13 14:03:15 eldy Exp $
  */
 
 
@@ -1771,12 +1771,14 @@ class Form
     }
 
     /**
-     *    \brief      Retourne la liste deroulante des differents etats d'une propal.
-     *                Les valeurs de la liste sont les id de la table c_propalst
-     *    \param      selected    etat pre-selectionne
+     *    Return combo list of differents status of a proposal
+     *    Values are id of table c_propalst
+     *    @param      selected    etat pre-selectionne
      */
     function select_propal_statut($selected='')
     {
+        global $langs;
+
         $sql = "SELECT id, code, label, active FROM ".MAIN_DB_PREFIX."c_propalst";
         $sql .= " WHERE active = 1";
 
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index 61f8131f847..5d753e8e01d 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2002-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,7 @@
  *       \file       htdocs/fourn/facture/index.php
  *       \ingroup    fournisseur,facture
  *       \brief      List of suppliers invoices
- *       \version    $Id$
+ *       \version    $Id: index.php,v 1.84 2011/07/13 13:10:51 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -35,6 +35,7 @@ if (!$user->rights->fournisseur->facture->lire)
 accessforbidden();
 
 $langs->load("companies");
+$langs->load("bills");
 
 $socid = $_GET["socid"];
 
@@ -292,5 +293,5 @@ else
 $db->close();
 
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/13 13:10:51 $ - $Revision: 1.84 $');
 ?>
diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
index ad281e7f23a..f58d2118dcc 100644
--- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
+++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
@@ -23,7 +23,7 @@
  *	\file       htdocs/includes/modules/fichinter/pdf_soleil.modules.php
  *	\ingroup    ficheinter
  *	\brief      Fichier de la classe permettant de generer les fiches d'intervention au modele Soleil
- *	\version    $Id$
+ *	\version    $Id: pdf_soleil.modules.php,v 1.101 2011/07/13 14:09:35 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
@@ -105,7 +105,7 @@ class pdf_soleil extends ModelePDFFicheinter
 				$result=$fichinter->fetch($id);
 				if ($result < 0)
 				{
-					dol_print_error($db,$fichinter->error);
+					dol_print_error($this->db,$fichinter->error);
 				}
 			}
 
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 935d02f67b4..9a38ecb5f11 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -193,4 +193,4 @@ Associations=Foundations
 Collectivités=Organizations
 Particuliers=Personal
 Entreprises=Companies
-DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br><br> 
+DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br> 
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 4712ca76959..6d55546256d 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -197,4 +197,4 @@ Associations=Associations
 Collectivités=Collectivités
 Particuliers=Particuliers
 Entreprises=Entreprises
-DOLIBARRFOUNDATION_PAYMENT_FORM=Pour réaliser le paiement de votre cotisation par virement bancaire ou par chèque, consulter la page <a href="http://wiki.dolibarr.org/index.php/Adh%C3%A9rer#Pour_une_adh.C3.A9sion_par_ch.C3.A8que">http://wiki.dolibarr.org/index.php/Adhérer</a>.<br>Pour payer dès maintenant par Carte Bancaire ou Paypal, cliquer sur le bouton au bas de cette page.<br><br>
+DOLIBARRFOUNDATION_PAYMENT_FORM=Pour réaliser le paiement de votre cotisation par virement bancaire ou par chèque, consulter la page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Adh%C3%A9rer#Pour_une_adh.C3.A9sion_par_ch.C3.A8que">http://wiki.dolibarr.org/index.php/Adhérer</a>.<br>Pour payer dès maintenant par Carte Bancaire ou Paypal, cliquer sur le bouton au bas de cette page.<br>
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index d87a7ed1051..9d405438673 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -23,7 +23,7 @@
  *		\ingroup    paybox
  *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
  *		\author	    Laurent Destailleur
- *		\version    $Id: newpayment.php,v 1.59 2011/07/13 12:00:18 eldy Exp $
+ *		\version    $Id: newpayment.php,v 1.60 2011/07/13 12:03:30 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -193,6 +193,7 @@ if (! empty($conf->global->PAYBOX_NEWFORM_TEXT))
     $langs->load("members");
     if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
     else $text.=$conf->global->PAYBOX_NEWFORM_TEXT."<br>\n";
+    $text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
 }
 if (empty($text))
 {
@@ -728,5 +729,5 @@ html_print_paybox_footer($mysoc,$langs);
 
 $db->close();
 
-llxFooterPayBox('$Date: 2011/07/13 12:00:18 $ - $Revision: 1.59 $');
+llxFooterPayBox('$Date: 2011/07/13 12:03:30 $ - $Revision: 1.60 $');
 ?>
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index 4b96c8075ea..5215b3f9924 100755
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -23,7 +23,7 @@
  *		\ingroup    paypal
  *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
  *		\author	    Laurent Destailleur
- *		\version    $Id: newpayment.php,v 1.25 2011/07/13 12:03:29 eldy Exp $
+ *		\version    $Id: newpayment.php,v 1.24 2011/07/13 12:00:18 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -287,7 +287,6 @@ if (! empty($conf->global->PAYPAL_NEWFORM_TEXT))
     $langs->load("members");
     if (preg_match('/^\((.*)\)$/',$conf->global->PAYPAL_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
     else $text.=$conf->global->PAYPAL_NEWFORM_TEXT."<br>\n";
-    $text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
 }
 if (empty($text))
 {
@@ -947,5 +946,5 @@ html_print_paypal_footer($mysoc,$langs);
 
 $db->close();
 
-llxFooterPaypal('$Date: 2011/07/13 12:03:29 $ - $Revision: 1.25 $');
+llxFooterPaypal('$Date: 2011/07/13 12:00:18 $ - $Revision: 1.24 $');
 ?>

From af559cfc1111a9184e058c83f0159c28f66fe179 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 12:00:18 +0000
Subject: [PATCH 57/91] Fix: Message for payment forms

---
 ChangeLog                                              |  3 +--
 htdocs/admin/system/dolibarr.php                       |  8 ++++----
 htdocs/core/class/html.form.class.php                  | 10 ++++------
 htdocs/fourn/facture/index.php                         |  7 +++----
 .../includes/modules/fichinter/pdf_soleil.modules.php  |  4 ++--
 htdocs/langs/en_US/members.lang                        |  2 +-
 htdocs/langs/fr_FR/members.lang                        |  2 +-
 htdocs/public/paybox/newpayment.php                    |  5 ++---
 8 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2808c594086..81aa3c6c02d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,9 @@
 --------------------------------------------------------------
 English Dolibarr ChangeLog
-$Id: ChangeLog,v 1.424 2011/07/13 14:16:39 eldy Exp $
+$Id: ChangeLog,v 1.423 2011/07/07 16:03:53 simnandez Exp $
 --------------------------------------------------------------
 
 ***** ChangeLog for 3.1 compared to 3.0 *****
-WARNING: IE6 browser is no more supported in this version.
 For users:
 - New: War against number of clicks:
      - When adding a free bank transaction, form to add next one is still
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 29544b85be1..54c28b04389 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -20,7 +20,7 @@
 /**
  *  \file       htdocs/admin/system/dolibarr.php
  *  \brief      Page to show Dolibarr informations
- *  \version    $Id: dolibarr.php,v 1.58 2011/07/13 13:15:17 eldy Exp $
+ *  \version    $Id$
  */
 
 require("../../main.inc.php");
@@ -163,7 +163,7 @@ if (function_exists('date_default_timezone_get'))
 	print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("CurrentTimeZone").'</td><td>';	// Timezone server PHP
 	$a=date_default_timezone_get();
 	$a.=' ('.(-dol_mktime(0,0,0,1,1,1970)>0?'+':'').(-dol_mktime(0,0,0,1,1,1970)).')';
-    print $form->textwithtooltip($a,$txt,2,1,img_info(''));
+    print $form->textwithtooltip($a,$txt,2,1,img_info());
 	print '</td></tr>'."\n";	// value defined in http://fr3.php.net/manual/en/timezones.europe.php
 }
 else
@@ -171,7 +171,7 @@ else
     $var=!$var;
     print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("PHPServerOffsetWithGreenwich").'</td><td>';
     $a=(-dol_mktime(0,0,0,1,1,1970)>0?'+':'').(-dol_mktime(0,0,0,1,1,1970));
-    print $form->textwithtooltip($a,$txt,2,1,img_info(''));
+    print $form->textwithtooltip($a,$txt,2,1,img_info());
     print '</td></tr>'."\n";
 }
 $var=!$var;
@@ -213,5 +213,5 @@ print '<tr '.$bc[$var].'><td width="300">=> '.$langs->trans("File encoding").'</
 print '</table>';
 print '<br>';
 
-llxFooter('$Date: 2011/07/13 13:15:17 $ - $Revision: 1.58 $');
+llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 5c7dbb3a456..7e97abed808 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -31,7 +31,7 @@
  *	\file       htdocs/core/class/html.form.class.php
  *  \ingroup    core
  *	\brief      File of class with all html predefined components
- *	\version	$Id: html.form.class.php,v 1.189 2011/07/13 14:03:15 eldy Exp $
+ *	\version	$Id: html.form.class.php,v 1.188 2011/07/10 17:28:09 hregis Exp $
  */
 
 
@@ -1771,14 +1771,12 @@ class Form
     }
 
     /**
-     *    Return combo list of differents status of a proposal
-     *    Values are id of table c_propalst
-     *    @param      selected    etat pre-selectionne
+     *    \brief      Retourne la liste deroulante des differents etats d'une propal.
+     *                Les valeurs de la liste sont les id de la table c_propalst
+     *    \param      selected    etat pre-selectionne
      */
     function select_propal_statut($selected='')
     {
-        global $langs;
-
         $sql = "SELECT id, code, label, active FROM ".MAIN_DB_PREFIX."c_propalst";
         $sql .= " WHERE active = 1";
 
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index 5d753e8e01d..61f8131f847 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2002-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,7 @@
  *       \file       htdocs/fourn/facture/index.php
  *       \ingroup    fournisseur,facture
  *       \brief      List of suppliers invoices
- *       \version    $Id: index.php,v 1.84 2011/07/13 13:10:51 eldy Exp $
+ *       \version    $Id$
  */
 
 require("../../main.inc.php");
@@ -35,7 +35,6 @@ if (!$user->rights->fournisseur->facture->lire)
 accessforbidden();
 
 $langs->load("companies");
-$langs->load("bills");
 
 $socid = $_GET["socid"];
 
@@ -293,5 +292,5 @@ else
 $db->close();
 
 
-llxFooter('$Date: 2011/07/13 13:10:51 $ - $Revision: 1.84 $');
+llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
index f58d2118dcc..ad281e7f23a 100644
--- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
+++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
@@ -23,7 +23,7 @@
  *	\file       htdocs/includes/modules/fichinter/pdf_soleil.modules.php
  *	\ingroup    ficheinter
  *	\brief      Fichier de la classe permettant de generer les fiches d'intervention au modele Soleil
- *	\version    $Id: pdf_soleil.modules.php,v 1.101 2011/07/13 14:09:35 eldy Exp $
+ *	\version    $Id$
  */
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
@@ -105,7 +105,7 @@ class pdf_soleil extends ModelePDFFicheinter
 				$result=$fichinter->fetch($id);
 				if ($result < 0)
 				{
-					dol_print_error($this->db,$fichinter->error);
+					dol_print_error($db,$fichinter->error);
 				}
 			}
 
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 9a38ecb5f11..935d02f67b4 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -193,4 +193,4 @@ Associations=Foundations
 Collectivités=Organizations
 Particuliers=Personal
 Entreprises=Companies
-DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br> 
+DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br><br> 
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 6d55546256d..4712ca76959 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -197,4 +197,4 @@ Associations=Associations
 Collectivités=Collectivités
 Particuliers=Particuliers
 Entreprises=Entreprises
-DOLIBARRFOUNDATION_PAYMENT_FORM=Pour réaliser le paiement de votre cotisation par virement bancaire ou par chèque, consulter la page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Adh%C3%A9rer#Pour_une_adh.C3.A9sion_par_ch.C3.A8que">http://wiki.dolibarr.org/index.php/Adhérer</a>.<br>Pour payer dès maintenant par Carte Bancaire ou Paypal, cliquer sur le bouton au bas de cette page.<br>
+DOLIBARRFOUNDATION_PAYMENT_FORM=Pour réaliser le paiement de votre cotisation par virement bancaire ou par chèque, consulter la page <a href="http://wiki.dolibarr.org/index.php/Adh%C3%A9rer#Pour_une_adh.C3.A9sion_par_ch.C3.A8que">http://wiki.dolibarr.org/index.php/Adhérer</a>.<br>Pour payer dès maintenant par Carte Bancaire ou Paypal, cliquer sur le bouton au bas de cette page.<br><br>
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index 9d405438673..d87a7ed1051 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -23,7 +23,7 @@
  *		\ingroup    paybox
  *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
  *		\author	    Laurent Destailleur
- *		\version    $Id: newpayment.php,v 1.60 2011/07/13 12:03:30 eldy Exp $
+ *		\version    $Id: newpayment.php,v 1.59 2011/07/13 12:00:18 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -193,7 +193,6 @@ if (! empty($conf->global->PAYBOX_NEWFORM_TEXT))
     $langs->load("members");
     if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
     else $text.=$conf->global->PAYBOX_NEWFORM_TEXT."<br>\n";
-    $text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
 }
 if (empty($text))
 {
@@ -729,5 +728,5 @@ html_print_paybox_footer($mysoc,$langs);
 
 $db->close();
 
-llxFooterPayBox('$Date: 2011/07/13 12:03:30 $ - $Revision: 1.60 $');
+llxFooterPayBox('$Date: 2011/07/13 12:00:18 $ - $Revision: 1.59 $');
 ?>

From b16f4117ca240276399588dccbe7fa3dd7bdf160 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 14:25:49 +0000
Subject: [PATCH 58/91] Fix: Cash account should be alos used to pay taxes

---
 ChangeLog                                       |  3 ++-
 htdocs/admin/system/dolibarr.php                |  8 ++++----
 htdocs/compta/paiement_charge.php               | 17 ++++++++---------
 htdocs/core/class/html.form.class.php           | 10 ++++++----
 htdocs/fourn/facture/index.php                  |  7 ++++---
 .../modules/fichinter/pdf_soleil.modules.php    |  4 ++--
 htdocs/langs/en_US/members.lang                 |  2 +-
 htdocs/langs/fr_FR/members.lang                 |  2 +-
 htdocs/public/paybox/newpayment.php             |  5 +++--
 9 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 81aa3c6c02d..2808c594086 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,10 @@
 --------------------------------------------------------------
 English Dolibarr ChangeLog
-$Id: ChangeLog,v 1.423 2011/07/07 16:03:53 simnandez Exp $
+$Id: ChangeLog,v 1.424 2011/07/13 14:16:39 eldy Exp $
 --------------------------------------------------------------
 
 ***** ChangeLog for 3.1 compared to 3.0 *****
+WARNING: IE6 browser is no more supported in this version.
 For users:
 - New: War against number of clicks:
      - When adding a free bank transaction, form to add next one is still
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 54c28b04389..29544b85be1 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -20,7 +20,7 @@
 /**
  *  \file       htdocs/admin/system/dolibarr.php
  *  \brief      Page to show Dolibarr informations
- *  \version    $Id$
+ *  \version    $Id: dolibarr.php,v 1.58 2011/07/13 13:15:17 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -163,7 +163,7 @@ if (function_exists('date_default_timezone_get'))
 	print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("CurrentTimeZone").'</td><td>';	// Timezone server PHP
 	$a=date_default_timezone_get();
 	$a.=' ('.(-dol_mktime(0,0,0,1,1,1970)>0?'+':'').(-dol_mktime(0,0,0,1,1,1970)).')';
-    print $form->textwithtooltip($a,$txt,2,1,img_info());
+    print $form->textwithtooltip($a,$txt,2,1,img_info(''));
 	print '</td></tr>'."\n";	// value defined in http://fr3.php.net/manual/en/timezones.europe.php
 }
 else
@@ -171,7 +171,7 @@ else
     $var=!$var;
     print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("PHPServerOffsetWithGreenwich").'</td><td>';
     $a=(-dol_mktime(0,0,0,1,1,1970)>0?'+':'').(-dol_mktime(0,0,0,1,1,1970));
-    print $form->textwithtooltip($a,$txt,2,1,img_info());
+    print $form->textwithtooltip($a,$txt,2,1,img_info(''));
     print '</td></tr>'."\n";
 }
 $var=!$var;
@@ -213,5 +213,5 @@ print '<tr '.$bc[$var].'><td width="300">=> '.$langs->trans("File encoding").'</
 print '</table>';
 print '<br>';
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/13 13:15:17 $ - $Revision: 1.58 $');
 ?>
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index f265d751e83..4020909186d 100755
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * 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
@@ -20,7 +20,7 @@
  *	    \file       htdocs/compta/paiement_charge.php
  *		\ingroup    tax
  *		\brief      Page to add payment of a tax
- *		\version    $Id$
+ *		\version    $Id: paiement_charge.php,v 1.52 2011/07/13 14:25:49 eldy Exp $
  */
 
 require('../main.inc.php');
@@ -42,8 +42,9 @@ if ($user->societe_id > 0)
 
 
 /*
- * Actions add payment
+ * Actions
  */
+
 if ($_POST["action"] == 'add_payment')
 {
 	$error=0;
@@ -145,7 +146,7 @@ if ($_POST["action"] == 'add_payment')
 
 
 /*
- * Affichage
+ * View
  */
 
 llxHeader();
@@ -153,9 +154,7 @@ llxHeader();
 $html=new Form($db);
 
 
-/*
- * Formulaire de creation d'un paiement de charge
- */
+// Formulaire de creation d'un paiement de charge
 if ($_GET["action"] == 'create')
 {
 
@@ -223,7 +222,7 @@ if ($_GET["action"] == 'create')
 	print '<tr>';
 	print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
 	print '<td>';
-	$html->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, "courant=1",1);  // Affiche liste des comptes courant
+	$html->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, '',1);  // Show opend bank account list
 	print '</td></tr>';
 
 	print '<tr><td>'.$langs->trans('Numero');
@@ -335,5 +334,5 @@ if ($_GET["action"] == 'create')
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/13 14:25:49 $ - $Revision: 1.52 $');
 ?>
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 7e97abed808..5c7dbb3a456 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -31,7 +31,7 @@
  *	\file       htdocs/core/class/html.form.class.php
  *  \ingroup    core
  *	\brief      File of class with all html predefined components
- *	\version	$Id: html.form.class.php,v 1.188 2011/07/10 17:28:09 hregis Exp $
+ *	\version	$Id: html.form.class.php,v 1.189 2011/07/13 14:03:15 eldy Exp $
  */
 
 
@@ -1771,12 +1771,14 @@ class Form
     }
 
     /**
-     *    \brief      Retourne la liste deroulante des differents etats d'une propal.
-     *                Les valeurs de la liste sont les id de la table c_propalst
-     *    \param      selected    etat pre-selectionne
+     *    Return combo list of differents status of a proposal
+     *    Values are id of table c_propalst
+     *    @param      selected    etat pre-selectionne
      */
     function select_propal_statut($selected='')
     {
+        global $langs;
+
         $sql = "SELECT id, code, label, active FROM ".MAIN_DB_PREFIX."c_propalst";
         $sql .= " WHERE active = 1";
 
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index 61f8131f847..5d753e8e01d 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2002-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,7 @@
  *       \file       htdocs/fourn/facture/index.php
  *       \ingroup    fournisseur,facture
  *       \brief      List of suppliers invoices
- *       \version    $Id$
+ *       \version    $Id: index.php,v 1.84 2011/07/13 13:10:51 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -35,6 +35,7 @@ if (!$user->rights->fournisseur->facture->lire)
 accessforbidden();
 
 $langs->load("companies");
+$langs->load("bills");
 
 $socid = $_GET["socid"];
 
@@ -292,5 +293,5 @@ else
 $db->close();
 
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/13 13:10:51 $ - $Revision: 1.84 $');
 ?>
diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
index ad281e7f23a..f58d2118dcc 100644
--- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
+++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
@@ -23,7 +23,7 @@
  *	\file       htdocs/includes/modules/fichinter/pdf_soleil.modules.php
  *	\ingroup    ficheinter
  *	\brief      Fichier de la classe permettant de generer les fiches d'intervention au modele Soleil
- *	\version    $Id$
+ *	\version    $Id: pdf_soleil.modules.php,v 1.101 2011/07/13 14:09:35 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
@@ -105,7 +105,7 @@ class pdf_soleil extends ModelePDFFicheinter
 				$result=$fichinter->fetch($id);
 				if ($result < 0)
 				{
-					dol_print_error($db,$fichinter->error);
+					dol_print_error($this->db,$fichinter->error);
 				}
 			}
 
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 935d02f67b4..9a38ecb5f11 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -193,4 +193,4 @@ Associations=Foundations
 Collectivités=Organizations
 Particuliers=Personal
 Entreprises=Companies
-DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br><br> 
+DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br> 
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 4712ca76959..6d55546256d 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -197,4 +197,4 @@ Associations=Associations
 Collectivités=Collectivités
 Particuliers=Particuliers
 Entreprises=Entreprises
-DOLIBARRFOUNDATION_PAYMENT_FORM=Pour réaliser le paiement de votre cotisation par virement bancaire ou par chèque, consulter la page <a href="http://wiki.dolibarr.org/index.php/Adh%C3%A9rer#Pour_une_adh.C3.A9sion_par_ch.C3.A8que">http://wiki.dolibarr.org/index.php/Adhérer</a>.<br>Pour payer dès maintenant par Carte Bancaire ou Paypal, cliquer sur le bouton au bas de cette page.<br><br>
+DOLIBARRFOUNDATION_PAYMENT_FORM=Pour réaliser le paiement de votre cotisation par virement bancaire ou par chèque, consulter la page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Adh%C3%A9rer#Pour_une_adh.C3.A9sion_par_ch.C3.A8que">http://wiki.dolibarr.org/index.php/Adhérer</a>.<br>Pour payer dès maintenant par Carte Bancaire ou Paypal, cliquer sur le bouton au bas de cette page.<br>
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index d87a7ed1051..9d405438673 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -23,7 +23,7 @@
  *		\ingroup    paybox
  *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
  *		\author	    Laurent Destailleur
- *		\version    $Id: newpayment.php,v 1.59 2011/07/13 12:00:18 eldy Exp $
+ *		\version    $Id: newpayment.php,v 1.60 2011/07/13 12:03:30 eldy Exp $
  */
 
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
@@ -193,6 +193,7 @@ if (! empty($conf->global->PAYBOX_NEWFORM_TEXT))
     $langs->load("members");
     if (preg_match('/^\((.*)\)$/',$conf->global->PAYBOX_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
     else $text.=$conf->global->PAYBOX_NEWFORM_TEXT."<br>\n";
+    $text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
 }
 if (empty($text))
 {
@@ -728,5 +729,5 @@ html_print_paybox_footer($mysoc,$langs);
 
 $db->close();
 
-llxFooterPayBox('$Date: 2011/07/13 12:00:18 $ - $Revision: 1.59 $');
+llxFooterPayBox('$Date: 2011/07/13 12:03:30 $ - $Revision: 1.60 $');
 ?>

From 8bd1da49bf28c90ae0d60f36a88ef7108d77432b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 12:03:30 +0000
Subject: [PATCH 59/91] Fix: Message for payment forms

---
 ChangeLog                                       |  3 +--
 htdocs/admin/system/dolibarr.php                |  8 ++++----
 htdocs/compta/paiement_charge.php               | 17 +++++++++--------
 htdocs/core/class/html.form.class.php           | 10 ++++------
 htdocs/fourn/facture/index.php                  |  7 +++----
 .../modules/fichinter/pdf_soleil.modules.php    |  4 ++--
 6 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2808c594086..81aa3c6c02d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,9 @@
 --------------------------------------------------------------
 English Dolibarr ChangeLog
-$Id: ChangeLog,v 1.424 2011/07/13 14:16:39 eldy Exp $
+$Id: ChangeLog,v 1.423 2011/07/07 16:03:53 simnandez Exp $
 --------------------------------------------------------------
 
 ***** ChangeLog for 3.1 compared to 3.0 *****
-WARNING: IE6 browser is no more supported in this version.
 For users:
 - New: War against number of clicks:
      - When adding a free bank transaction, form to add next one is still
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 29544b85be1..54c28b04389 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -20,7 +20,7 @@
 /**
  *  \file       htdocs/admin/system/dolibarr.php
  *  \brief      Page to show Dolibarr informations
- *  \version    $Id: dolibarr.php,v 1.58 2011/07/13 13:15:17 eldy Exp $
+ *  \version    $Id$
  */
 
 require("../../main.inc.php");
@@ -163,7 +163,7 @@ if (function_exists('date_default_timezone_get'))
 	print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("CurrentTimeZone").'</td><td>';	// Timezone server PHP
 	$a=date_default_timezone_get();
 	$a.=' ('.(-dol_mktime(0,0,0,1,1,1970)>0?'+':'').(-dol_mktime(0,0,0,1,1,1970)).')';
-    print $form->textwithtooltip($a,$txt,2,1,img_info(''));
+    print $form->textwithtooltip($a,$txt,2,1,img_info());
 	print '</td></tr>'."\n";	// value defined in http://fr3.php.net/manual/en/timezones.europe.php
 }
 else
@@ -171,7 +171,7 @@ else
     $var=!$var;
     print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("PHPServerOffsetWithGreenwich").'</td><td>';
     $a=(-dol_mktime(0,0,0,1,1,1970)>0?'+':'').(-dol_mktime(0,0,0,1,1,1970));
-    print $form->textwithtooltip($a,$txt,2,1,img_info(''));
+    print $form->textwithtooltip($a,$txt,2,1,img_info());
     print '</td></tr>'."\n";
 }
 $var=!$var;
@@ -213,5 +213,5 @@ print '<tr '.$bc[$var].'><td width="300">=> '.$langs->trans("File encoding").'</
 print '</table>';
 print '<br>';
 
-llxFooter('$Date: 2011/07/13 13:15:17 $ - $Revision: 1.58 $');
+llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index 4020909186d..f265d751e83 100755
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * 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
@@ -20,7 +20,7 @@
  *	    \file       htdocs/compta/paiement_charge.php
  *		\ingroup    tax
  *		\brief      Page to add payment of a tax
- *		\version    $Id: paiement_charge.php,v 1.52 2011/07/13 14:25:49 eldy Exp $
+ *		\version    $Id$
  */
 
 require('../main.inc.php');
@@ -42,9 +42,8 @@ if ($user->societe_id > 0)
 
 
 /*
- * Actions
+ * Actions add payment
  */
-
 if ($_POST["action"] == 'add_payment')
 {
 	$error=0;
@@ -146,7 +145,7 @@ if ($_POST["action"] == 'add_payment')
 
 
 /*
- * View
+ * Affichage
  */
 
 llxHeader();
@@ -154,7 +153,9 @@ llxHeader();
 $html=new Form($db);
 
 
-// Formulaire de creation d'un paiement de charge
+/*
+ * Formulaire de creation d'un paiement de charge
+ */
 if ($_GET["action"] == 'create')
 {
 
@@ -222,7 +223,7 @@ if ($_GET["action"] == 'create')
 	print '<tr>';
 	print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
 	print '<td>';
-	$html->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, '',1);  // Show opend bank account list
+	$html->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, "courant=1",1);  // Affiche liste des comptes courant
 	print '</td></tr>';
 
 	print '<tr><td>'.$langs->trans('Numero');
@@ -334,5 +335,5 @@ if ($_GET["action"] == 'create')
 
 $db->close();
 
-llxFooter('$Date: 2011/07/13 14:25:49 $ - $Revision: 1.52 $');
+llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 5c7dbb3a456..7e97abed808 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -31,7 +31,7 @@
  *	\file       htdocs/core/class/html.form.class.php
  *  \ingroup    core
  *	\brief      File of class with all html predefined components
- *	\version	$Id: html.form.class.php,v 1.189 2011/07/13 14:03:15 eldy Exp $
+ *	\version	$Id: html.form.class.php,v 1.188 2011/07/10 17:28:09 hregis Exp $
  */
 
 
@@ -1771,14 +1771,12 @@ class Form
     }
 
     /**
-     *    Return combo list of differents status of a proposal
-     *    Values are id of table c_propalst
-     *    @param      selected    etat pre-selectionne
+     *    \brief      Retourne la liste deroulante des differents etats d'une propal.
+     *                Les valeurs de la liste sont les id de la table c_propalst
+     *    \param      selected    etat pre-selectionne
      */
     function select_propal_statut($selected='')
     {
-        global $langs;
-
         $sql = "SELECT id, code, label, active FROM ".MAIN_DB_PREFIX."c_propalst";
         $sql .= " WHERE active = 1";
 
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index 5d753e8e01d..61f8131f847 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2002-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,7 @@
  *       \file       htdocs/fourn/facture/index.php
  *       \ingroup    fournisseur,facture
  *       \brief      List of suppliers invoices
- *       \version    $Id: index.php,v 1.84 2011/07/13 13:10:51 eldy Exp $
+ *       \version    $Id$
  */
 
 require("../../main.inc.php");
@@ -35,7 +35,6 @@ if (!$user->rights->fournisseur->facture->lire)
 accessforbidden();
 
 $langs->load("companies");
-$langs->load("bills");
 
 $socid = $_GET["socid"];
 
@@ -293,5 +292,5 @@ else
 $db->close();
 
 
-llxFooter('$Date: 2011/07/13 13:10:51 $ - $Revision: 1.84 $');
+llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
index f58d2118dcc..ad281e7f23a 100644
--- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
+++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
@@ -23,7 +23,7 @@
  *	\file       htdocs/includes/modules/fichinter/pdf_soleil.modules.php
  *	\ingroup    ficheinter
  *	\brief      Fichier de la classe permettant de generer les fiches d'intervention au modele Soleil
- *	\version    $Id: pdf_soleil.modules.php,v 1.101 2011/07/13 14:09:35 eldy Exp $
+ *	\version    $Id$
  */
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
@@ -105,7 +105,7 @@ class pdf_soleil extends ModelePDFFicheinter
 				$result=$fichinter->fetch($id);
 				if ($result < 0)
 				{
-					dol_print_error($this->db,$fichinter->error);
+					dol_print_error($db,$fichinter->error);
 				}
 			}
 

From 506274687d9727244cd719242486fb5d11b48275 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 14:41:02 +0000
Subject: [PATCH 60/91] Fix: No check box if no PDF

---
 ChangeLog                                       |  3 ++-
 htdocs/admin/system/dolibarr.php                |  8 ++++----
 htdocs/compta/facture/impayees.php              | 12 ++++++------
 htdocs/compta/paiement_charge.php               | 17 ++++++++---------
 htdocs/core/class/html.form.class.php           | 10 ++++++----
 htdocs/core/class/html.formfile.class.php       |  9 +++++----
 htdocs/fourn/facture/index.php                  |  7 ++++---
 .../modules/fichinter/pdf_soleil.modules.php    |  4 ++--
 8 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 81aa3c6c02d..2808c594086 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,10 @@
 --------------------------------------------------------------
 English Dolibarr ChangeLog
-$Id: ChangeLog,v 1.423 2011/07/07 16:03:53 simnandez Exp $
+$Id: ChangeLog,v 1.424 2011/07/13 14:16:39 eldy Exp $
 --------------------------------------------------------------
 
 ***** ChangeLog for 3.1 compared to 3.0 *****
+WARNING: IE6 browser is no more supported in this version.
 For users:
 - New: War against number of clicks:
      - When adding a free bank transaction, form to add next one is still
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 54c28b04389..29544b85be1 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -20,7 +20,7 @@
 /**
  *  \file       htdocs/admin/system/dolibarr.php
  *  \brief      Page to show Dolibarr informations
- *  \version    $Id$
+ *  \version    $Id: dolibarr.php,v 1.58 2011/07/13 13:15:17 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -163,7 +163,7 @@ if (function_exists('date_default_timezone_get'))
 	print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("CurrentTimeZone").'</td><td>';	// Timezone server PHP
 	$a=date_default_timezone_get();
 	$a.=' ('.(-dol_mktime(0,0,0,1,1,1970)>0?'+':'').(-dol_mktime(0,0,0,1,1,1970)).')';
-    print $form->textwithtooltip($a,$txt,2,1,img_info());
+    print $form->textwithtooltip($a,$txt,2,1,img_info(''));
 	print '</td></tr>'."\n";	// value defined in http://fr3.php.net/manual/en/timezones.europe.php
 }
 else
@@ -171,7 +171,7 @@ else
     $var=!$var;
     print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("PHPServerOffsetWithGreenwich").'</td><td>';
     $a=(-dol_mktime(0,0,0,1,1,1970)>0?'+':'').(-dol_mktime(0,0,0,1,1,1970));
-    print $form->textwithtooltip($a,$txt,2,1,img_info());
+    print $form->textwithtooltip($a,$txt,2,1,img_info(''));
     print '</td></tr>'."\n";
 }
 $var=!$var;
@@ -213,5 +213,5 @@ print '<tr '.$bc[$var].'><td width="300">=> '.$langs->trans("File encoding").'</
 print '</table>';
 print '<br>';
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/13 13:15:17 $ - $Revision: 1.58 $');
 ?>
diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php
index c508e65182f..9a36e5a2e8a 100644
--- a/htdocs/compta/facture/impayees.php
+++ b/htdocs/compta/facture/impayees.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,7 +23,7 @@
  *		\file       htdocs/compta/facture/impayees.php
  *		\ingroup    facture
  *		\brief      Page to list and build liste of unpaid invoices
- *		\version    $Revision$
+ *		\version    $Revision: 1.83 $
  */
 
 require("../../main.inc.php");
@@ -268,7 +268,7 @@ if ($result)
 	print_fiche_titre($titre,$link);
 	//print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',0);	// We don't want pagination on this page
 
-	if ($mesg) print $mesg;
+	dol_htmloutput_mesg($mesg);
 
 	$i = 0;
 	print '<table class="liste" width="100%">';
@@ -351,10 +351,10 @@ if ($result)
 
 			// PDF Picto
 			print '<td width="16" align="right" class="nobordernopadding">';
-			$filename=dol_sanitizeFileName($objp->facnumber);
+            $filename=dol_sanitizeFileName($objp->facnumber);
 			$filedir=$conf->facture->dir_output . '/' . dol_sanitizeFileName($objp->facnumber);
 			$foundpdf=$formfile->show_documents('facture',$filename,$filedir,$urlsource,'','','',1,'',1,$param);
-			print '</td>';
+            print '</td>';
 
 			print '</tr></table>';
 
@@ -425,5 +425,5 @@ if ($result)
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/13 14:41:02 $ - $Revision: 1.83 $');
 ?>
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index f265d751e83..4020909186d 100755
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * 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
@@ -20,7 +20,7 @@
  *	    \file       htdocs/compta/paiement_charge.php
  *		\ingroup    tax
  *		\brief      Page to add payment of a tax
- *		\version    $Id$
+ *		\version    $Id: paiement_charge.php,v 1.52 2011/07/13 14:25:49 eldy Exp $
  */
 
 require('../main.inc.php');
@@ -42,8 +42,9 @@ if ($user->societe_id > 0)
 
 
 /*
- * Actions add payment
+ * Actions
  */
+
 if ($_POST["action"] == 'add_payment')
 {
 	$error=0;
@@ -145,7 +146,7 @@ if ($_POST["action"] == 'add_payment')
 
 
 /*
- * Affichage
+ * View
  */
 
 llxHeader();
@@ -153,9 +154,7 @@ llxHeader();
 $html=new Form($db);
 
 
-/*
- * Formulaire de creation d'un paiement de charge
- */
+// Formulaire de creation d'un paiement de charge
 if ($_GET["action"] == 'create')
 {
 
@@ -223,7 +222,7 @@ if ($_GET["action"] == 'create')
 	print '<tr>';
 	print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
 	print '<td>';
-	$html->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, "courant=1",1);  // Affiche liste des comptes courant
+	$html->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, '',1);  // Show opend bank account list
 	print '</td></tr>';
 
 	print '<tr><td>'.$langs->trans('Numero');
@@ -335,5 +334,5 @@ if ($_GET["action"] == 'create')
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/13 14:25:49 $ - $Revision: 1.52 $');
 ?>
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 7e97abed808..5c7dbb3a456 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -31,7 +31,7 @@
  *	\file       htdocs/core/class/html.form.class.php
  *  \ingroup    core
  *	\brief      File of class with all html predefined components
- *	\version	$Id: html.form.class.php,v 1.188 2011/07/10 17:28:09 hregis Exp $
+ *	\version	$Id: html.form.class.php,v 1.189 2011/07/13 14:03:15 eldy Exp $
  */
 
 
@@ -1771,12 +1771,14 @@ class Form
     }
 
     /**
-     *    \brief      Retourne la liste deroulante des differents etats d'une propal.
-     *                Les valeurs de la liste sont les id de la table c_propalst
-     *    \param      selected    etat pre-selectionne
+     *    Return combo list of differents status of a proposal
+     *    Values are id of table c_propalst
+     *    @param      selected    etat pre-selectionne
      */
     function select_propal_statut($selected='')
     {
+        global $langs;
+
         $sql = "SELECT id, code, label, active FROM ".MAIN_DB_PREFIX."c_propalst";
         $sql .= " WHERE active = 1";
 
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index cfd46212a10..ab274743513 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -22,7 +22,7 @@
  *	\file       htdocs/core/class/html.formfile.class.php
  *  \ingroup    core
  *	\brief      File of class to offer components to list and upload files
- *	\version	$Id: html.formfile.class.php,v 1.48 2011/07/13 07:38:11 hregis Exp $
+ *	\version	$Id: html.formfile.class.php,v 1.49 2011/07/13 14:41:03 eldy Exp $
  */
 
 
@@ -152,6 +152,7 @@ class FormFile
 	 */
 	function show_documents($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$maxfilenamelength=28,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$hooks='')
 	{
+	    $this->numoffiles=0;
 		print $this->showdocuments($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed,$modelselected,$allowgenifempty,$forcenomultilang,$iconPDF,$maxfilenamelength,$noform,$param,$title,$buttonlabel,$codelang,$hooks);
 		return $this->numoffiles;
 	}
@@ -845,12 +846,12 @@ class FormFile
 		print '<button type="submit" class="start">'.$langs->trans('StartUpload').'</button>';
 		print '<button type="reset" class="cancel">'.$langs->trans('CancelUpload').'</button>';
 		print '</div></form>';
-		
+
 		print '</div><!-- end div fileupload -->';
-		
+
 		print '<div id="fileupload-view">';
 		print '<div class="fileupload-content">';
-		
+
 		print '<table width="100%" class="files">';
 		/*print '<tr>';
 		print '<td>'.$langs->trans("Documents2").'</td>';
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index 61f8131f847..5d753e8e01d 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2002-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,7 @@
  *       \file       htdocs/fourn/facture/index.php
  *       \ingroup    fournisseur,facture
  *       \brief      List of suppliers invoices
- *       \version    $Id$
+ *       \version    $Id: index.php,v 1.84 2011/07/13 13:10:51 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -35,6 +35,7 @@ if (!$user->rights->fournisseur->facture->lire)
 accessforbidden();
 
 $langs->load("companies");
+$langs->load("bills");
 
 $socid = $_GET["socid"];
 
@@ -292,5 +293,5 @@ else
 $db->close();
 
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/13 13:10:51 $ - $Revision: 1.84 $');
 ?>
diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
index ad281e7f23a..f58d2118dcc 100644
--- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
+++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
@@ -23,7 +23,7 @@
  *	\file       htdocs/includes/modules/fichinter/pdf_soleil.modules.php
  *	\ingroup    ficheinter
  *	\brief      Fichier de la classe permettant de generer les fiches d'intervention au modele Soleil
- *	\version    $Id$
+ *	\version    $Id: pdf_soleil.modules.php,v 1.101 2011/07/13 14:09:35 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
@@ -105,7 +105,7 @@ class pdf_soleil extends ModelePDFFicheinter
 				$result=$fichinter->fetch($id);
 				if ($result < 0)
 				{
-					dol_print_error($db,$fichinter->error);
+					dol_print_error($this->db,$fichinter->error);
 				}
 			}
 

From 9fe4ebae5d0952dcfd197bb49a53d09542f2d1e6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 13:10:51 +0000
Subject: [PATCH 61/91] Fix: Trans

---
 ChangeLog                                       |  3 +--
 htdocs/admin/system/dolibarr.php                |  8 ++++----
 htdocs/compta/facture/impayees.php              | 12 ++++++------
 htdocs/compta/paiement_charge.php               | 17 +++++++++--------
 htdocs/core/class/html.form.class.php           | 10 ++++------
 htdocs/core/class/html.formfile.class.php       |  9 ++++-----
 .../modules/fichinter/pdf_soleil.modules.php    |  4 ++--
 7 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2808c594086..81aa3c6c02d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,9 @@
 --------------------------------------------------------------
 English Dolibarr ChangeLog
-$Id: ChangeLog,v 1.424 2011/07/13 14:16:39 eldy Exp $
+$Id: ChangeLog,v 1.423 2011/07/07 16:03:53 simnandez Exp $
 --------------------------------------------------------------
 
 ***** ChangeLog for 3.1 compared to 3.0 *****
-WARNING: IE6 browser is no more supported in this version.
 For users:
 - New: War against number of clicks:
      - When adding a free bank transaction, form to add next one is still
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 29544b85be1..54c28b04389 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -20,7 +20,7 @@
 /**
  *  \file       htdocs/admin/system/dolibarr.php
  *  \brief      Page to show Dolibarr informations
- *  \version    $Id: dolibarr.php,v 1.58 2011/07/13 13:15:17 eldy Exp $
+ *  \version    $Id$
  */
 
 require("../../main.inc.php");
@@ -163,7 +163,7 @@ if (function_exists('date_default_timezone_get'))
 	print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("CurrentTimeZone").'</td><td>';	// Timezone server PHP
 	$a=date_default_timezone_get();
 	$a.=' ('.(-dol_mktime(0,0,0,1,1,1970)>0?'+':'').(-dol_mktime(0,0,0,1,1,1970)).')';
-    print $form->textwithtooltip($a,$txt,2,1,img_info(''));
+    print $form->textwithtooltip($a,$txt,2,1,img_info());
 	print '</td></tr>'."\n";	// value defined in http://fr3.php.net/manual/en/timezones.europe.php
 }
 else
@@ -171,7 +171,7 @@ else
     $var=!$var;
     print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("PHPServerOffsetWithGreenwich").'</td><td>';
     $a=(-dol_mktime(0,0,0,1,1,1970)>0?'+':'').(-dol_mktime(0,0,0,1,1,1970));
-    print $form->textwithtooltip($a,$txt,2,1,img_info(''));
+    print $form->textwithtooltip($a,$txt,2,1,img_info());
     print '</td></tr>'."\n";
 }
 $var=!$var;
@@ -213,5 +213,5 @@ print '<tr '.$bc[$var].'><td width="300">=> '.$langs->trans("File encoding").'</
 print '</table>';
 print '<br>';
 
-llxFooter('$Date: 2011/07/13 13:15:17 $ - $Revision: 1.58 $');
+llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php
index 9a36e5a2e8a..c508e65182f 100644
--- a/htdocs/compta/facture/impayees.php
+++ b/htdocs/compta/facture/impayees.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,7 +23,7 @@
  *		\file       htdocs/compta/facture/impayees.php
  *		\ingroup    facture
  *		\brief      Page to list and build liste of unpaid invoices
- *		\version    $Revision: 1.83 $
+ *		\version    $Revision$
  */
 
 require("../../main.inc.php");
@@ -268,7 +268,7 @@ if ($result)
 	print_fiche_titre($titre,$link);
 	//print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',0);	// We don't want pagination on this page
 
-	dol_htmloutput_mesg($mesg);
+	if ($mesg) print $mesg;
 
 	$i = 0;
 	print '<table class="liste" width="100%">';
@@ -351,10 +351,10 @@ if ($result)
 
 			// PDF Picto
 			print '<td width="16" align="right" class="nobordernopadding">';
-            $filename=dol_sanitizeFileName($objp->facnumber);
+			$filename=dol_sanitizeFileName($objp->facnumber);
 			$filedir=$conf->facture->dir_output . '/' . dol_sanitizeFileName($objp->facnumber);
 			$foundpdf=$formfile->show_documents('facture',$filename,$filedir,$urlsource,'','','',1,'',1,$param);
-            print '</td>';
+			print '</td>';
 
 			print '</tr></table>';
 
@@ -425,5 +425,5 @@ if ($result)
 
 $db->close();
 
-llxFooter('$Date: 2011/07/13 14:41:02 $ - $Revision: 1.83 $');
+llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index 4020909186d..f265d751e83 100755
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * 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
@@ -20,7 +20,7 @@
  *	    \file       htdocs/compta/paiement_charge.php
  *		\ingroup    tax
  *		\brief      Page to add payment of a tax
- *		\version    $Id: paiement_charge.php,v 1.52 2011/07/13 14:25:49 eldy Exp $
+ *		\version    $Id$
  */
 
 require('../main.inc.php');
@@ -42,9 +42,8 @@ if ($user->societe_id > 0)
 
 
 /*
- * Actions
+ * Actions add payment
  */
-
 if ($_POST["action"] == 'add_payment')
 {
 	$error=0;
@@ -146,7 +145,7 @@ if ($_POST["action"] == 'add_payment')
 
 
 /*
- * View
+ * Affichage
  */
 
 llxHeader();
@@ -154,7 +153,9 @@ llxHeader();
 $html=new Form($db);
 
 
-// Formulaire de creation d'un paiement de charge
+/*
+ * Formulaire de creation d'un paiement de charge
+ */
 if ($_GET["action"] == 'create')
 {
 
@@ -222,7 +223,7 @@ if ($_GET["action"] == 'create')
 	print '<tr>';
 	print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
 	print '<td>';
-	$html->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, '',1);  // Show opend bank account list
+	$html->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, "courant=1",1);  // Affiche liste des comptes courant
 	print '</td></tr>';
 
 	print '<tr><td>'.$langs->trans('Numero');
@@ -334,5 +335,5 @@ if ($_GET["action"] == 'create')
 
 $db->close();
 
-llxFooter('$Date: 2011/07/13 14:25:49 $ - $Revision: 1.52 $');
+llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 5c7dbb3a456..7e97abed808 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -31,7 +31,7 @@
  *	\file       htdocs/core/class/html.form.class.php
  *  \ingroup    core
  *	\brief      File of class with all html predefined components
- *	\version	$Id: html.form.class.php,v 1.189 2011/07/13 14:03:15 eldy Exp $
+ *	\version	$Id: html.form.class.php,v 1.188 2011/07/10 17:28:09 hregis Exp $
  */
 
 
@@ -1771,14 +1771,12 @@ class Form
     }
 
     /**
-     *    Return combo list of differents status of a proposal
-     *    Values are id of table c_propalst
-     *    @param      selected    etat pre-selectionne
+     *    \brief      Retourne la liste deroulante des differents etats d'une propal.
+     *                Les valeurs de la liste sont les id de la table c_propalst
+     *    \param      selected    etat pre-selectionne
      */
     function select_propal_statut($selected='')
     {
-        global $langs;
-
         $sql = "SELECT id, code, label, active FROM ".MAIN_DB_PREFIX."c_propalst";
         $sql .= " WHERE active = 1";
 
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index ab274743513..cfd46212a10 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -22,7 +22,7 @@
  *	\file       htdocs/core/class/html.formfile.class.php
  *  \ingroup    core
  *	\brief      File of class to offer components to list and upload files
- *	\version	$Id: html.formfile.class.php,v 1.49 2011/07/13 14:41:03 eldy Exp $
+ *	\version	$Id: html.formfile.class.php,v 1.48 2011/07/13 07:38:11 hregis Exp $
  */
 
 
@@ -152,7 +152,6 @@ class FormFile
 	 */
 	function show_documents($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$maxfilenamelength=28,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$hooks='')
 	{
-	    $this->numoffiles=0;
 		print $this->showdocuments($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed,$modelselected,$allowgenifempty,$forcenomultilang,$iconPDF,$maxfilenamelength,$noform,$param,$title,$buttonlabel,$codelang,$hooks);
 		return $this->numoffiles;
 	}
@@ -846,12 +845,12 @@ class FormFile
 		print '<button type="submit" class="start">'.$langs->trans('StartUpload').'</button>';
 		print '<button type="reset" class="cancel">'.$langs->trans('CancelUpload').'</button>';
 		print '</div></form>';
-
+		
 		print '</div><!-- end div fileupload -->';
-
+		
 		print '<div id="fileupload-view">';
 		print '<div class="fileupload-content">';
-
+		
 		print '<table width="100%" class="files">';
 		/*print '<tr>';
 		print '<td>'.$langs->trans("Documents2").'</td>';
diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
index f58d2118dcc..ad281e7f23a 100644
--- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
+++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
@@ -23,7 +23,7 @@
  *	\file       htdocs/includes/modules/fichinter/pdf_soleil.modules.php
  *	\ingroup    ficheinter
  *	\brief      Fichier de la classe permettant de generer les fiches d'intervention au modele Soleil
- *	\version    $Id: pdf_soleil.modules.php,v 1.101 2011/07/13 14:09:35 eldy Exp $
+ *	\version    $Id$
  */
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
@@ -105,7 +105,7 @@ class pdf_soleil extends ModelePDFFicheinter
 				$result=$fichinter->fetch($id);
 				if ($result < 0)
 				{
-					dol_print_error($this->db,$fichinter->error);
+					dol_print_error($db,$fichinter->error);
 				}
 			}
 

From 6f81a95d805bc231e6aa7447921729fdabba75f8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 13:15:17 +0000
Subject: [PATCH 62/91] Fix: No duplicate alt

---
 htdocs/admin/system/dolibarr.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 54c28b04389..29544b85be1 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -20,7 +20,7 @@
 /**
  *  \file       htdocs/admin/system/dolibarr.php
  *  \brief      Page to show Dolibarr informations
- *  \version    $Id$
+ *  \version    $Id: dolibarr.php,v 1.58 2011/07/13 13:15:17 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -163,7 +163,7 @@ if (function_exists('date_default_timezone_get'))
 	print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("CurrentTimeZone").'</td><td>';	// Timezone server PHP
 	$a=date_default_timezone_get();
 	$a.=' ('.(-dol_mktime(0,0,0,1,1,1970)>0?'+':'').(-dol_mktime(0,0,0,1,1,1970)).')';
-    print $form->textwithtooltip($a,$txt,2,1,img_info());
+    print $form->textwithtooltip($a,$txt,2,1,img_info(''));
 	print '</td></tr>'."\n";	// value defined in http://fr3.php.net/manual/en/timezones.europe.php
 }
 else
@@ -171,7 +171,7 @@ else
     $var=!$var;
     print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("PHPServerOffsetWithGreenwich").'</td><td>';
     $a=(-dol_mktime(0,0,0,1,1,1970)>0?'+':'').(-dol_mktime(0,0,0,1,1,1970));
-    print $form->textwithtooltip($a,$txt,2,1,img_info());
+    print $form->textwithtooltip($a,$txt,2,1,img_info(''));
     print '</td></tr>'."\n";
 }
 $var=!$var;
@@ -213,5 +213,5 @@ print '<tr '.$bc[$var].'><td width="300">=> '.$langs->trans("File encoding").'</
 print '</table>';
 print '<br>';
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/13 13:15:17 $ - $Revision: 1.58 $');
 ?>

From a2efc6b3f526eab3fe096e2758178bd66e4ef899 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 15:25:21 +0000
Subject: [PATCH 63/91] Doc

---
 ChangeLog                                       |  3 ++-
 README                                          | 13 +++----------
 README-FR                                       | 12 +++---------
 htdocs/compta/facture/impayees.php              | 12 ++++++------
 htdocs/compta/paiement_charge.php               | 17 ++++++++---------
 htdocs/core/class/html.form.class.php           | 10 ++++++----
 htdocs/core/class/html.formfile.class.php       |  9 +++++----
 .../modules/fichinter/pdf_soleil.modules.php    |  4 ++--
 htdocs/langs/zh_CN/main.lang                    |  4 ++--
 9 files changed, 37 insertions(+), 47 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 81aa3c6c02d..2808c594086 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,10 @@
 --------------------------------------------------------------
 English Dolibarr ChangeLog
-$Id: ChangeLog,v 1.423 2011/07/07 16:03:53 simnandez Exp $
+$Id: ChangeLog,v 1.424 2011/07/13 14:16:39 eldy Exp $
 --------------------------------------------------------------
 
 ***** ChangeLog for 3.1 compared to 3.0 *****
+WARNING: IE6 browser is no more supported in this version.
 For users:
 - New: War against number of clicks:
      - When adding a free bank transaction, form to add next one is still
diff --git a/README b/README
index 342035579b4..2eebec8c5f8 100644
--- a/README
+++ b/README
@@ -53,20 +53,13 @@ To upgrade Dolibarr from an old version to this one:
   
 - If you came from a beta version or from any version x.y.z to any
   other where x or y number differs, you must call the Dolibarr "install/"
-  page in your browser.
-  Url might be for example:
+  page in your browser (this should be done automatically at first dolibarr
+  access).
+  This URL should looks like:
    http://localhost/dolibarr/htdocs/install/
   or
    http://yourdolibarrhost/install/index.php
 
-  To know what is exactly correct URL for "install/" page, take URL you use
-  to go on login page. It it ends with "index.php", remove it. Then add
-  "install/" at the end.
-  For example, if your login page is: 
-  http://yourdolibarrhost/something/index.php
-  Then, your "install/" pages will be 
-  http://yourdolibarrhost/something/install/
-  
   Then choose the "update" option according to your case.
   Note: Migrate process can be ran safely several times.
   
diff --git a/README-FR b/README-FR
index 404d3f1a521..75962578d1d 100644
--- a/README-FR
+++ b/README-FR
@@ -53,19 +53,13 @@ Pour mettre a jour Dolibarr depuis une vieille version vers celle ci:
   il n'y a pas besoin de migration de données.
   
 - Si vous venez d'une beta ou d'un version x.y.z vers une autre ou les numeros x
-  ou y varient, vous devez appelez la page de migration dans votre navigateur:
+  ou y varient, vous devez appelez la page "install/" de migration dans votre 
+  navigateur (ceci doit se faire automatiquement au premier accès de l'application).
+  Ce sera une URL du genre:
    http://localhost/dolibarr/htdocs/install/index.php
   ou
    http://yourdolibarrhost/install/index.php
 
-  Pour savoir quelle est l'URL exactement de la page "install/", prenez l'URL que
-  vous utilisez pour vous loguer. Si elle se termine par "index.php", enlevez le.
-  Dans tous les cas, ajouter ensuite "install/" à la fin.
-  Par exemple, si votre page de connexion est: 
-  http://yourdolibarrhost/something/index.php
-  Alors la page "install/" sera 
-  http://yourdolibarrhost/something/install/
-
   Ensuite, choisir l'option de "mise a jour" en rapport avec votre cas.
   Note: Le processus de migration peut etre lance plusieurs fois sans risque.
   
diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php
index c508e65182f..9a36e5a2e8a 100644
--- a/htdocs/compta/facture/impayees.php
+++ b/htdocs/compta/facture/impayees.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,7 +23,7 @@
  *		\file       htdocs/compta/facture/impayees.php
  *		\ingroup    facture
  *		\brief      Page to list and build liste of unpaid invoices
- *		\version    $Revision$
+ *		\version    $Revision: 1.83 $
  */
 
 require("../../main.inc.php");
@@ -268,7 +268,7 @@ if ($result)
 	print_fiche_titre($titre,$link);
 	//print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',0);	// We don't want pagination on this page
 
-	if ($mesg) print $mesg;
+	dol_htmloutput_mesg($mesg);
 
 	$i = 0;
 	print '<table class="liste" width="100%">';
@@ -351,10 +351,10 @@ if ($result)
 
 			// PDF Picto
 			print '<td width="16" align="right" class="nobordernopadding">';
-			$filename=dol_sanitizeFileName($objp->facnumber);
+            $filename=dol_sanitizeFileName($objp->facnumber);
 			$filedir=$conf->facture->dir_output . '/' . dol_sanitizeFileName($objp->facnumber);
 			$foundpdf=$formfile->show_documents('facture',$filename,$filedir,$urlsource,'','','',1,'',1,$param);
-			print '</td>';
+            print '</td>';
 
 			print '</tr></table>';
 
@@ -425,5 +425,5 @@ if ($result)
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/13 14:41:02 $ - $Revision: 1.83 $');
 ?>
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index f265d751e83..4020909186d 100755
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * 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
@@ -20,7 +20,7 @@
  *	    \file       htdocs/compta/paiement_charge.php
  *		\ingroup    tax
  *		\brief      Page to add payment of a tax
- *		\version    $Id$
+ *		\version    $Id: paiement_charge.php,v 1.52 2011/07/13 14:25:49 eldy Exp $
  */
 
 require('../main.inc.php');
@@ -42,8 +42,9 @@ if ($user->societe_id > 0)
 
 
 /*
- * Actions add payment
+ * Actions
  */
+
 if ($_POST["action"] == 'add_payment')
 {
 	$error=0;
@@ -145,7 +146,7 @@ if ($_POST["action"] == 'add_payment')
 
 
 /*
- * Affichage
+ * View
  */
 
 llxHeader();
@@ -153,9 +154,7 @@ llxHeader();
 $html=new Form($db);
 
 
-/*
- * Formulaire de creation d'un paiement de charge
- */
+// Formulaire de creation d'un paiement de charge
 if ($_GET["action"] == 'create')
 {
 
@@ -223,7 +222,7 @@ if ($_GET["action"] == 'create')
 	print '<tr>';
 	print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
 	print '<td>';
-	$html->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, "courant=1",1);  // Affiche liste des comptes courant
+	$html->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, '',1);  // Show opend bank account list
 	print '</td></tr>';
 
 	print '<tr><td>'.$langs->trans('Numero');
@@ -335,5 +334,5 @@ if ($_GET["action"] == 'create')
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/13 14:25:49 $ - $Revision: 1.52 $');
 ?>
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 7e97abed808..5c7dbb3a456 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -31,7 +31,7 @@
  *	\file       htdocs/core/class/html.form.class.php
  *  \ingroup    core
  *	\brief      File of class with all html predefined components
- *	\version	$Id: html.form.class.php,v 1.188 2011/07/10 17:28:09 hregis Exp $
+ *	\version	$Id: html.form.class.php,v 1.189 2011/07/13 14:03:15 eldy Exp $
  */
 
 
@@ -1771,12 +1771,14 @@ class Form
     }
 
     /**
-     *    \brief      Retourne la liste deroulante des differents etats d'une propal.
-     *                Les valeurs de la liste sont les id de la table c_propalst
-     *    \param      selected    etat pre-selectionne
+     *    Return combo list of differents status of a proposal
+     *    Values are id of table c_propalst
+     *    @param      selected    etat pre-selectionne
      */
     function select_propal_statut($selected='')
     {
+        global $langs;
+
         $sql = "SELECT id, code, label, active FROM ".MAIN_DB_PREFIX."c_propalst";
         $sql .= " WHERE active = 1";
 
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index cfd46212a10..ab274743513 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -22,7 +22,7 @@
  *	\file       htdocs/core/class/html.formfile.class.php
  *  \ingroup    core
  *	\brief      File of class to offer components to list and upload files
- *	\version	$Id: html.formfile.class.php,v 1.48 2011/07/13 07:38:11 hregis Exp $
+ *	\version	$Id: html.formfile.class.php,v 1.49 2011/07/13 14:41:03 eldy Exp $
  */
 
 
@@ -152,6 +152,7 @@ class FormFile
 	 */
 	function show_documents($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$maxfilenamelength=28,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$hooks='')
 	{
+	    $this->numoffiles=0;
 		print $this->showdocuments($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed,$modelselected,$allowgenifempty,$forcenomultilang,$iconPDF,$maxfilenamelength,$noform,$param,$title,$buttonlabel,$codelang,$hooks);
 		return $this->numoffiles;
 	}
@@ -845,12 +846,12 @@ class FormFile
 		print '<button type="submit" class="start">'.$langs->trans('StartUpload').'</button>';
 		print '<button type="reset" class="cancel">'.$langs->trans('CancelUpload').'</button>';
 		print '</div></form>';
-		
+
 		print '</div><!-- end div fileupload -->';
-		
+
 		print '<div id="fileupload-view">';
 		print '<div class="fileupload-content">';
-		
+
 		print '<table width="100%" class="files">';
 		/*print '<tr>';
 		print '<td>'.$langs->trans("Documents2").'</td>';
diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
index ad281e7f23a..f58d2118dcc 100644
--- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
+++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
@@ -23,7 +23,7 @@
  *	\file       htdocs/includes/modules/fichinter/pdf_soleil.modules.php
  *	\ingroup    ficheinter
  *	\brief      Fichier de la classe permettant de generer les fiches d'intervention au modele Soleil
- *	\version    $Id$
+ *	\version    $Id: pdf_soleil.modules.php,v 1.101 2011/07/13 14:09:35 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
@@ -105,7 +105,7 @@ class pdf_soleil extends ModelePDFFicheinter
 				$result=$fichinter->fetch($id);
 				if ($result < 0)
 				{
-					dol_print_error($db,$fichinter->error);
+					dol_print_error($this->db,$fichinter->error);
 				}
 			}
 
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index 1967e26eb00..96292683296 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -9,8 +9,8 @@
 // Reference language: en_US
 CHARSET=UTF-8
 DIRECTION=ltr
-FONTFORPDF=chinese
-#FONTFORPDF=stsongstdlight
+#FONTFORPDF=chinese
+FONTFORPDF=stsongstdlight
 #FONTSIZEFORPDF=9
 SeparatorDecimal=.
 SeparatorThousand=None

From 945d951ef126d35d552c23099438be872ce6f129 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 14:03:15 +0000
Subject: [PATCH 64/91] Fix: Missing global

---
 ChangeLog                                       |  3 +--
 README                                          | 13 ++++++++++---
 README-FR                                       | 12 +++++++++---
 htdocs/compta/facture/impayees.php              | 12 ++++++------
 htdocs/compta/paiement_charge.php               | 17 +++++++++--------
 htdocs/core/class/html.formfile.class.php       |  9 ++++-----
 .../modules/fichinter/pdf_soleil.modules.php    |  4 ++--
 htdocs/langs/zh_CN/main.lang                    |  4 ++--
 8 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2808c594086..81aa3c6c02d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,9 @@
 --------------------------------------------------------------
 English Dolibarr ChangeLog
-$Id: ChangeLog,v 1.424 2011/07/13 14:16:39 eldy Exp $
+$Id: ChangeLog,v 1.423 2011/07/07 16:03:53 simnandez Exp $
 --------------------------------------------------------------
 
 ***** ChangeLog for 3.1 compared to 3.0 *****
-WARNING: IE6 browser is no more supported in this version.
 For users:
 - New: War against number of clicks:
      - When adding a free bank transaction, form to add next one is still
diff --git a/README b/README
index 2eebec8c5f8..342035579b4 100644
--- a/README
+++ b/README
@@ -53,13 +53,20 @@ To upgrade Dolibarr from an old version to this one:
   
 - If you came from a beta version or from any version x.y.z to any
   other where x or y number differs, you must call the Dolibarr "install/"
-  page in your browser (this should be done automatically at first dolibarr
-  access).
-  This URL should looks like:
+  page in your browser.
+  Url might be for example:
    http://localhost/dolibarr/htdocs/install/
   or
    http://yourdolibarrhost/install/index.php
 
+  To know what is exactly correct URL for "install/" page, take URL you use
+  to go on login page. It it ends with "index.php", remove it. Then add
+  "install/" at the end.
+  For example, if your login page is: 
+  http://yourdolibarrhost/something/index.php
+  Then, your "install/" pages will be 
+  http://yourdolibarrhost/something/install/
+  
   Then choose the "update" option according to your case.
   Note: Migrate process can be ran safely several times.
   
diff --git a/README-FR b/README-FR
index 75962578d1d..404d3f1a521 100644
--- a/README-FR
+++ b/README-FR
@@ -53,13 +53,19 @@ Pour mettre a jour Dolibarr depuis une vieille version vers celle ci:
   il n'y a pas besoin de migration de données.
   
 - Si vous venez d'une beta ou d'un version x.y.z vers une autre ou les numeros x
-  ou y varient, vous devez appelez la page "install/" de migration dans votre 
-  navigateur (ceci doit se faire automatiquement au premier accès de l'application).
-  Ce sera une URL du genre:
+  ou y varient, vous devez appelez la page de migration dans votre navigateur:
    http://localhost/dolibarr/htdocs/install/index.php
   ou
    http://yourdolibarrhost/install/index.php
 
+  Pour savoir quelle est l'URL exactement de la page "install/", prenez l'URL que
+  vous utilisez pour vous loguer. Si elle se termine par "index.php", enlevez le.
+  Dans tous les cas, ajouter ensuite "install/" à la fin.
+  Par exemple, si votre page de connexion est: 
+  http://yourdolibarrhost/something/index.php
+  Alors la page "install/" sera 
+  http://yourdolibarrhost/something/install/
+
   Ensuite, choisir l'option de "mise a jour" en rapport avec votre cas.
   Note: Le processus de migration peut etre lance plusieurs fois sans risque.
   
diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php
index 9a36e5a2e8a..c508e65182f 100644
--- a/htdocs/compta/facture/impayees.php
+++ b/htdocs/compta/facture/impayees.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,7 +23,7 @@
  *		\file       htdocs/compta/facture/impayees.php
  *		\ingroup    facture
  *		\brief      Page to list and build liste of unpaid invoices
- *		\version    $Revision: 1.83 $
+ *		\version    $Revision$
  */
 
 require("../../main.inc.php");
@@ -268,7 +268,7 @@ if ($result)
 	print_fiche_titre($titre,$link);
 	//print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',0);	// We don't want pagination on this page
 
-	dol_htmloutput_mesg($mesg);
+	if ($mesg) print $mesg;
 
 	$i = 0;
 	print '<table class="liste" width="100%">';
@@ -351,10 +351,10 @@ if ($result)
 
 			// PDF Picto
 			print '<td width="16" align="right" class="nobordernopadding">';
-            $filename=dol_sanitizeFileName($objp->facnumber);
+			$filename=dol_sanitizeFileName($objp->facnumber);
 			$filedir=$conf->facture->dir_output . '/' . dol_sanitizeFileName($objp->facnumber);
 			$foundpdf=$formfile->show_documents('facture',$filename,$filedir,$urlsource,'','','',1,'',1,$param);
-            print '</td>';
+			print '</td>';
 
 			print '</tr></table>';
 
@@ -425,5 +425,5 @@ if ($result)
 
 $db->close();
 
-llxFooter('$Date: 2011/07/13 14:41:02 $ - $Revision: 1.83 $');
+llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index 4020909186d..f265d751e83 100755
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * 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
@@ -20,7 +20,7 @@
  *	    \file       htdocs/compta/paiement_charge.php
  *		\ingroup    tax
  *		\brief      Page to add payment of a tax
- *		\version    $Id: paiement_charge.php,v 1.52 2011/07/13 14:25:49 eldy Exp $
+ *		\version    $Id$
  */
 
 require('../main.inc.php');
@@ -42,9 +42,8 @@ if ($user->societe_id > 0)
 
 
 /*
- * Actions
+ * Actions add payment
  */
-
 if ($_POST["action"] == 'add_payment')
 {
 	$error=0;
@@ -146,7 +145,7 @@ if ($_POST["action"] == 'add_payment')
 
 
 /*
- * View
+ * Affichage
  */
 
 llxHeader();
@@ -154,7 +153,9 @@ llxHeader();
 $html=new Form($db);
 
 
-// Formulaire de creation d'un paiement de charge
+/*
+ * Formulaire de creation d'un paiement de charge
+ */
 if ($_GET["action"] == 'create')
 {
 
@@ -222,7 +223,7 @@ if ($_GET["action"] == 'create')
 	print '<tr>';
 	print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
 	print '<td>';
-	$html->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, '',1);  // Show opend bank account list
+	$html->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, "courant=1",1);  // Affiche liste des comptes courant
 	print '</td></tr>';
 
 	print '<tr><td>'.$langs->trans('Numero');
@@ -334,5 +335,5 @@ if ($_GET["action"] == 'create')
 
 $db->close();
 
-llxFooter('$Date: 2011/07/13 14:25:49 $ - $Revision: 1.52 $');
+llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index ab274743513..cfd46212a10 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -22,7 +22,7 @@
  *	\file       htdocs/core/class/html.formfile.class.php
  *  \ingroup    core
  *	\brief      File of class to offer components to list and upload files
- *	\version	$Id: html.formfile.class.php,v 1.49 2011/07/13 14:41:03 eldy Exp $
+ *	\version	$Id: html.formfile.class.php,v 1.48 2011/07/13 07:38:11 hregis Exp $
  */
 
 
@@ -152,7 +152,6 @@ class FormFile
 	 */
 	function show_documents($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$maxfilenamelength=28,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$hooks='')
 	{
-	    $this->numoffiles=0;
 		print $this->showdocuments($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed,$modelselected,$allowgenifempty,$forcenomultilang,$iconPDF,$maxfilenamelength,$noform,$param,$title,$buttonlabel,$codelang,$hooks);
 		return $this->numoffiles;
 	}
@@ -846,12 +845,12 @@ class FormFile
 		print '<button type="submit" class="start">'.$langs->trans('StartUpload').'</button>';
 		print '<button type="reset" class="cancel">'.$langs->trans('CancelUpload').'</button>';
 		print '</div></form>';
-
+		
 		print '</div><!-- end div fileupload -->';
-
+		
 		print '<div id="fileupload-view">';
 		print '<div class="fileupload-content">';
-
+		
 		print '<table width="100%" class="files">';
 		/*print '<tr>';
 		print '<td>'.$langs->trans("Documents2").'</td>';
diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
index f58d2118dcc..ad281e7f23a 100644
--- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
+++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
@@ -23,7 +23,7 @@
  *	\file       htdocs/includes/modules/fichinter/pdf_soleil.modules.php
  *	\ingroup    ficheinter
  *	\brief      Fichier de la classe permettant de generer les fiches d'intervention au modele Soleil
- *	\version    $Id: pdf_soleil.modules.php,v 1.101 2011/07/13 14:09:35 eldy Exp $
+ *	\version    $Id$
  */
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
@@ -105,7 +105,7 @@ class pdf_soleil extends ModelePDFFicheinter
 				$result=$fichinter->fetch($id);
 				if ($result < 0)
 				{
-					dol_print_error($this->db,$fichinter->error);
+					dol_print_error($db,$fichinter->error);
 				}
 			}
 
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index 96292683296..1967e26eb00 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -9,8 +9,8 @@
 // Reference language: en_US
 CHARSET=UTF-8
 DIRECTION=ltr
-#FONTFORPDF=chinese
-FONTFORPDF=stsongstdlight
+FONTFORPDF=chinese
+#FONTFORPDF=stsongstdlight
 #FONTSIZEFORPDF=9
 SeparatorDecimal=.
 SeparatorThousand=None

From 4742db3f23162546940d269be043b8cbcd56b891 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 16:24:57 +0000
Subject: [PATCH 65/91] New: Add cancel button on note edit

---
 ChangeLog                                     |  3 +-
 README                                        | 13 +--
 README-FR                                     | 12 +--
 htdocs/compta/facture/impayees.php            | 12 +--
 htdocs/compta/paiement_charge.php             | 17 ++--
 htdocs/core/class/html.formfile.class.php     |  9 +-
 .../modules/fichinter/pdf_soleil.modules.php  |  4 +-
 htdocs/langs/zh_CN/main.lang                  |  4 +-
 htdocs/societe/socnote.php                    | 86 ++++++++++---------
 9 files changed, 76 insertions(+), 84 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 81aa3c6c02d..2808c594086 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,10 @@
 --------------------------------------------------------------
 English Dolibarr ChangeLog
-$Id: ChangeLog,v 1.423 2011/07/07 16:03:53 simnandez Exp $
+$Id: ChangeLog,v 1.424 2011/07/13 14:16:39 eldy Exp $
 --------------------------------------------------------------
 
 ***** ChangeLog for 3.1 compared to 3.0 *****
+WARNING: IE6 browser is no more supported in this version.
 For users:
 - New: War against number of clicks:
      - When adding a free bank transaction, form to add next one is still
diff --git a/README b/README
index 342035579b4..2eebec8c5f8 100644
--- a/README
+++ b/README
@@ -53,20 +53,13 @@ To upgrade Dolibarr from an old version to this one:
   
 - If you came from a beta version or from any version x.y.z to any
   other where x or y number differs, you must call the Dolibarr "install/"
-  page in your browser.
-  Url might be for example:
+  page in your browser (this should be done automatically at first dolibarr
+  access).
+  This URL should looks like:
    http://localhost/dolibarr/htdocs/install/
   or
    http://yourdolibarrhost/install/index.php
 
-  To know what is exactly correct URL for "install/" page, take URL you use
-  to go on login page. It it ends with "index.php", remove it. Then add
-  "install/" at the end.
-  For example, if your login page is: 
-  http://yourdolibarrhost/something/index.php
-  Then, your "install/" pages will be 
-  http://yourdolibarrhost/something/install/
-  
   Then choose the "update" option according to your case.
   Note: Migrate process can be ran safely several times.
   
diff --git a/README-FR b/README-FR
index 404d3f1a521..75962578d1d 100644
--- a/README-FR
+++ b/README-FR
@@ -53,19 +53,13 @@ Pour mettre a jour Dolibarr depuis une vieille version vers celle ci:
   il n'y a pas besoin de migration de données.
   
 - Si vous venez d'une beta ou d'un version x.y.z vers une autre ou les numeros x
-  ou y varient, vous devez appelez la page de migration dans votre navigateur:
+  ou y varient, vous devez appelez la page "install/" de migration dans votre 
+  navigateur (ceci doit se faire automatiquement au premier accès de l'application).
+  Ce sera une URL du genre:
    http://localhost/dolibarr/htdocs/install/index.php
   ou
    http://yourdolibarrhost/install/index.php
 
-  Pour savoir quelle est l'URL exactement de la page "install/", prenez l'URL que
-  vous utilisez pour vous loguer. Si elle se termine par "index.php", enlevez le.
-  Dans tous les cas, ajouter ensuite "install/" à la fin.
-  Par exemple, si votre page de connexion est: 
-  http://yourdolibarrhost/something/index.php
-  Alors la page "install/" sera 
-  http://yourdolibarrhost/something/install/
-
   Ensuite, choisir l'option de "mise a jour" en rapport avec votre cas.
   Note: Le processus de migration peut etre lance plusieurs fois sans risque.
   
diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php
index c508e65182f..9a36e5a2e8a 100644
--- a/htdocs/compta/facture/impayees.php
+++ b/htdocs/compta/facture/impayees.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,7 +23,7 @@
  *		\file       htdocs/compta/facture/impayees.php
  *		\ingroup    facture
  *		\brief      Page to list and build liste of unpaid invoices
- *		\version    $Revision$
+ *		\version    $Revision: 1.83 $
  */
 
 require("../../main.inc.php");
@@ -268,7 +268,7 @@ if ($result)
 	print_fiche_titre($titre,$link);
 	//print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',0);	// We don't want pagination on this page
 
-	if ($mesg) print $mesg;
+	dol_htmloutput_mesg($mesg);
 
 	$i = 0;
 	print '<table class="liste" width="100%">';
@@ -351,10 +351,10 @@ if ($result)
 
 			// PDF Picto
 			print '<td width="16" align="right" class="nobordernopadding">';
-			$filename=dol_sanitizeFileName($objp->facnumber);
+            $filename=dol_sanitizeFileName($objp->facnumber);
 			$filedir=$conf->facture->dir_output . '/' . dol_sanitizeFileName($objp->facnumber);
 			$foundpdf=$formfile->show_documents('facture',$filename,$filedir,$urlsource,'','','',1,'',1,$param);
-			print '</td>';
+            print '</td>';
 
 			print '</tr></table>';
 
@@ -425,5 +425,5 @@ if ($result)
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/13 14:41:02 $ - $Revision: 1.83 $');
 ?>
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index f265d751e83..4020909186d 100755
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * 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
@@ -20,7 +20,7 @@
  *	    \file       htdocs/compta/paiement_charge.php
  *		\ingroup    tax
  *		\brief      Page to add payment of a tax
- *		\version    $Id$
+ *		\version    $Id: paiement_charge.php,v 1.52 2011/07/13 14:25:49 eldy Exp $
  */
 
 require('../main.inc.php');
@@ -42,8 +42,9 @@ if ($user->societe_id > 0)
 
 
 /*
- * Actions add payment
+ * Actions
  */
+
 if ($_POST["action"] == 'add_payment')
 {
 	$error=0;
@@ -145,7 +146,7 @@ if ($_POST["action"] == 'add_payment')
 
 
 /*
- * Affichage
+ * View
  */
 
 llxHeader();
@@ -153,9 +154,7 @@ llxHeader();
 $html=new Form($db);
 
 
-/*
- * Formulaire de creation d'un paiement de charge
- */
+// Formulaire de creation d'un paiement de charge
 if ($_GET["action"] == 'create')
 {
 
@@ -223,7 +222,7 @@ if ($_GET["action"] == 'create')
 	print '<tr>';
 	print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
 	print '<td>';
-	$html->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, "courant=1",1);  // Affiche liste des comptes courant
+	$html->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, '',1);  // Show opend bank account list
 	print '</td></tr>';
 
 	print '<tr><td>'.$langs->trans('Numero');
@@ -335,5 +334,5 @@ if ($_GET["action"] == 'create')
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/13 14:25:49 $ - $Revision: 1.52 $');
 ?>
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index cfd46212a10..ab274743513 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -22,7 +22,7 @@
  *	\file       htdocs/core/class/html.formfile.class.php
  *  \ingroup    core
  *	\brief      File of class to offer components to list and upload files
- *	\version	$Id: html.formfile.class.php,v 1.48 2011/07/13 07:38:11 hregis Exp $
+ *	\version	$Id: html.formfile.class.php,v 1.49 2011/07/13 14:41:03 eldy Exp $
  */
 
 
@@ -152,6 +152,7 @@ class FormFile
 	 */
 	function show_documents($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$maxfilenamelength=28,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$hooks='')
 	{
+	    $this->numoffiles=0;
 		print $this->showdocuments($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed,$modelselected,$allowgenifempty,$forcenomultilang,$iconPDF,$maxfilenamelength,$noform,$param,$title,$buttonlabel,$codelang,$hooks);
 		return $this->numoffiles;
 	}
@@ -845,12 +846,12 @@ class FormFile
 		print '<button type="submit" class="start">'.$langs->trans('StartUpload').'</button>';
 		print '<button type="reset" class="cancel">'.$langs->trans('CancelUpload').'</button>';
 		print '</div></form>';
-		
+
 		print '</div><!-- end div fileupload -->';
-		
+
 		print '<div id="fileupload-view">';
 		print '<div class="fileupload-content">';
-		
+
 		print '<table width="100%" class="files">';
 		/*print '<tr>';
 		print '<td>'.$langs->trans("Documents2").'</td>';
diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
index ad281e7f23a..f58d2118dcc 100644
--- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
+++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
@@ -23,7 +23,7 @@
  *	\file       htdocs/includes/modules/fichinter/pdf_soleil.modules.php
  *	\ingroup    ficheinter
  *	\brief      Fichier de la classe permettant de generer les fiches d'intervention au modele Soleil
- *	\version    $Id$
+ *	\version    $Id: pdf_soleil.modules.php,v 1.101 2011/07/13 14:09:35 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
@@ -105,7 +105,7 @@ class pdf_soleil extends ModelePDFFicheinter
 				$result=$fichinter->fetch($id);
 				if ($result < 0)
 				{
-					dol_print_error($db,$fichinter->error);
+					dol_print_error($this->db,$fichinter->error);
 				}
 			}
 
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index 1967e26eb00..96292683296 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -9,8 +9,8 @@
 // Reference language: en_US
 CHARSET=UTF-8
 DIRECTION=ltr
-FONTFORPDF=chinese
-#FONTFORPDF=stsongstdlight
+#FONTFORPDF=chinese
+FONTFORPDF=stsongstdlight
 #FONTSIZEFORPDF=9
 SeparatorDecimal=.
 SeparatorThousand=None
diff --git a/htdocs/societe/socnote.php b/htdocs/societe/socnote.php
index 6385d48e759..e0a849af112 100644
--- a/htdocs/societe/socnote.php
+++ b/htdocs/societe/socnote.php
@@ -23,7 +23,7 @@
  *   \file       htdocs/societe/socnote.php
  *   \brief      Tab for notes on third party
  *   \ingroup    societe
- *   \version    $Id$
+ *   \version    $Id: socnote.php,v 1.22 2011/07/13 16:24:57 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -44,13 +44,13 @@ $result = restrictedArea($user, 'societe', $socid);
  * Actions
  */
 
-if ($action == 'add')
+if ($action == 'add' && ! GETPOST('cancel'))
 {
-  $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='".$db->escape($_POST["note"])."' WHERE rowid=".$_POST["socid"];
-  $result = $db->query($sql);
+    $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='".$db->escape($_POST["note"])."' WHERE rowid=".$_POST["socid"];
+    $result = $db->query($sql);
 
-  $_GET["socid"]=$_POST["socid"];   // Pour retour sur fiche
-  $socid = $_GET["socid"];
+    $_GET["socid"]=$_POST["socid"];   // Pour retour sur fiche
+    $socid = $_GET["socid"];
 }
 
 
@@ -70,25 +70,25 @@ if ($socid > 0)
     $societe = new Societe($db, $socid);
     $societe->fetch($socid);
 
-	/*
-	 * Affichage onglets
-	 */
+    /*
+     * Affichage onglets
+     */
     if ($conf->notification->enabled) $langs->load("mails");
 
-	$head = societe_prepare_head($societe);
+    $head = societe_prepare_head($societe);
 
-	dol_fiche_head($head, 'note', $langs->trans("ThirdParty"),0,'company');
+    dol_fiche_head($head, 'note', $langs->trans("ThirdParty"),0,'company');
 
 
-	print "<form method=\"post\" action=\"".DOL_URL_ROOT."/societe/socnote.php\">";
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print "<form method=\"post\" action=\"".DOL_URL_ROOT."/societe/socnote.php\">";
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-	print '<table class="border" width="100%">';
+    print '<table class="border" width="100%">';
 
-	print '<tr><td width="20%">'.$langs->trans('ThirdPartyName').'</td>';
-	print '<td colspan="3">';
-	print $form->showrefnav($societe,'socid','',($user->societe_id?0:1),'rowid','nom');
-	print '</td></tr>';
+    print '<tr><td width="20%">'.$langs->trans('ThirdPartyName').'</td>';
+    print '<td colspan="3">';
+    print $form->showrefnav($societe,'socid','',($user->societe_id?0:1),'rowid','nom');
+    print '</td></tr>';
 
     if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
     {
@@ -113,32 +113,36 @@ if ($socid > 0)
         print '</td></tr>';
     }
 
-	print '<tr><td valign="top">'.$langs->trans("Note").'</td>';
-	print '<td valign="top">';
-	if ($action == 'edit' && $user->rights->societe->creer)
-	{
-		print "<input type=\"hidden\" name=\"action\" value=\"add\">";
-		print "<input type=\"hidden\" name=\"socid\" value=\"".$societe->id."\">";
+    print '<tr><td valign="top">'.$langs->trans("Note").'</td>';
+    print '<td valign="top">';
+    if ($action == 'edit' && $user->rights->societe->creer)
+    {
+        print "<input type=\"hidden\" name=\"action\" value=\"add\">";
+        print "<input type=\"hidden\" name=\"socid\" value=\"".$societe->id."\">";
 
-	    // Editeur wysiwyg
-		require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-		$doleditor=new DolEditor('note',$societe->note,'',360,'dolibarr_notes','In',true,false,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE,20,70);
-		$doleditor->Create();
-	}
-	else
-	{
-		print dol_textishtml($societe->note)?$societe->note:dol_nl2br($societe->note,1,true);
-	}
-	print "</td></tr>";
+        // Editeur wysiwyg
+        require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
+        $doleditor=new DolEditor('note',$societe->note,'',360,'dolibarr_notes','In',true,false,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE,20,70);
+        $doleditor->Create();
+    }
+    else
+    {
+        print dol_textishtml($societe->note)?$societe->note:dol_nl2br($societe->note,1,true);
+    }
+    print "</td></tr>";
 
-	if ($action == 'edit')
-	{
-		print '<tr><td colspan="2" align="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></td></tr>';
-	}
+    if ($action == 'edit')
+    {
+        print '<tr><td colspan="2" align="center">';
+        print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+        print ' &nbsp; ';
+        print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+        print '</td></tr>';
+    }
 
-	print "</table>";
+    print "</table>";
 
-	print '</form>';
+    print '</form>';
 }
 
 print '</div>';
@@ -163,5 +167,5 @@ if ($action != 'edit')
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/13 16:24:57 $ - $Revision: 1.22 $');
 ?>

From 6f05956bf55ad8016869bcd210f16dd1d838f924 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 14:09:35 +0000
Subject: [PATCH 66/91] Fix: Bad var

---
 ChangeLog                                 |  3 +-
 README                                    | 13 +++-
 README-FR                                 | 12 +++-
 htdocs/compta/facture/impayees.php        | 12 ++--
 htdocs/compta/paiement_charge.php         | 17 ++---
 htdocs/core/class/html.formfile.class.php |  9 ++-
 htdocs/langs/zh_CN/main.lang              |  4 +-
 htdocs/societe/socnote.php                | 86 +++++++++++------------
 8 files changed, 82 insertions(+), 74 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2808c594086..81aa3c6c02d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,9 @@
 --------------------------------------------------------------
 English Dolibarr ChangeLog
-$Id: ChangeLog,v 1.424 2011/07/13 14:16:39 eldy Exp $
+$Id: ChangeLog,v 1.423 2011/07/07 16:03:53 simnandez Exp $
 --------------------------------------------------------------
 
 ***** ChangeLog for 3.1 compared to 3.0 *****
-WARNING: IE6 browser is no more supported in this version.
 For users:
 - New: War against number of clicks:
      - When adding a free bank transaction, form to add next one is still
diff --git a/README b/README
index 2eebec8c5f8..342035579b4 100644
--- a/README
+++ b/README
@@ -53,13 +53,20 @@ To upgrade Dolibarr from an old version to this one:
   
 - If you came from a beta version or from any version x.y.z to any
   other where x or y number differs, you must call the Dolibarr "install/"
-  page in your browser (this should be done automatically at first dolibarr
-  access).
-  This URL should looks like:
+  page in your browser.
+  Url might be for example:
    http://localhost/dolibarr/htdocs/install/
   or
    http://yourdolibarrhost/install/index.php
 
+  To know what is exactly correct URL for "install/" page, take URL you use
+  to go on login page. It it ends with "index.php", remove it. Then add
+  "install/" at the end.
+  For example, if your login page is: 
+  http://yourdolibarrhost/something/index.php
+  Then, your "install/" pages will be 
+  http://yourdolibarrhost/something/install/
+  
   Then choose the "update" option according to your case.
   Note: Migrate process can be ran safely several times.
   
diff --git a/README-FR b/README-FR
index 75962578d1d..404d3f1a521 100644
--- a/README-FR
+++ b/README-FR
@@ -53,13 +53,19 @@ Pour mettre a jour Dolibarr depuis une vieille version vers celle ci:
   il n'y a pas besoin de migration de données.
   
 - Si vous venez d'une beta ou d'un version x.y.z vers une autre ou les numeros x
-  ou y varient, vous devez appelez la page "install/" de migration dans votre 
-  navigateur (ceci doit se faire automatiquement au premier accès de l'application).
-  Ce sera une URL du genre:
+  ou y varient, vous devez appelez la page de migration dans votre navigateur:
    http://localhost/dolibarr/htdocs/install/index.php
   ou
    http://yourdolibarrhost/install/index.php
 
+  Pour savoir quelle est l'URL exactement de la page "install/", prenez l'URL que
+  vous utilisez pour vous loguer. Si elle se termine par "index.php", enlevez le.
+  Dans tous les cas, ajouter ensuite "install/" à la fin.
+  Par exemple, si votre page de connexion est: 
+  http://yourdolibarrhost/something/index.php
+  Alors la page "install/" sera 
+  http://yourdolibarrhost/something/install/
+
   Ensuite, choisir l'option de "mise a jour" en rapport avec votre cas.
   Note: Le processus de migration peut etre lance plusieurs fois sans risque.
   
diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php
index 9a36e5a2e8a..c508e65182f 100644
--- a/htdocs/compta/facture/impayees.php
+++ b/htdocs/compta/facture/impayees.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,7 +23,7 @@
  *		\file       htdocs/compta/facture/impayees.php
  *		\ingroup    facture
  *		\brief      Page to list and build liste of unpaid invoices
- *		\version    $Revision: 1.83 $
+ *		\version    $Revision$
  */
 
 require("../../main.inc.php");
@@ -268,7 +268,7 @@ if ($result)
 	print_fiche_titre($titre,$link);
 	//print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',0);	// We don't want pagination on this page
 
-	dol_htmloutput_mesg($mesg);
+	if ($mesg) print $mesg;
 
 	$i = 0;
 	print '<table class="liste" width="100%">';
@@ -351,10 +351,10 @@ if ($result)
 
 			// PDF Picto
 			print '<td width="16" align="right" class="nobordernopadding">';
-            $filename=dol_sanitizeFileName($objp->facnumber);
+			$filename=dol_sanitizeFileName($objp->facnumber);
 			$filedir=$conf->facture->dir_output . '/' . dol_sanitizeFileName($objp->facnumber);
 			$foundpdf=$formfile->show_documents('facture',$filename,$filedir,$urlsource,'','','',1,'',1,$param);
-            print '</td>';
+			print '</td>';
 
 			print '</tr></table>';
 
@@ -425,5 +425,5 @@ if ($result)
 
 $db->close();
 
-llxFooter('$Date: 2011/07/13 14:41:02 $ - $Revision: 1.83 $');
+llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index 4020909186d..f265d751e83 100755
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * 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
@@ -20,7 +20,7 @@
  *	    \file       htdocs/compta/paiement_charge.php
  *		\ingroup    tax
  *		\brief      Page to add payment of a tax
- *		\version    $Id: paiement_charge.php,v 1.52 2011/07/13 14:25:49 eldy Exp $
+ *		\version    $Id$
  */
 
 require('../main.inc.php');
@@ -42,9 +42,8 @@ if ($user->societe_id > 0)
 
 
 /*
- * Actions
+ * Actions add payment
  */
-
 if ($_POST["action"] == 'add_payment')
 {
 	$error=0;
@@ -146,7 +145,7 @@ if ($_POST["action"] == 'add_payment')
 
 
 /*
- * View
+ * Affichage
  */
 
 llxHeader();
@@ -154,7 +153,9 @@ llxHeader();
 $html=new Form($db);
 
 
-// Formulaire de creation d'un paiement de charge
+/*
+ * Formulaire de creation d'un paiement de charge
+ */
 if ($_GET["action"] == 'create')
 {
 
@@ -222,7 +223,7 @@ if ($_GET["action"] == 'create')
 	print '<tr>';
 	print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
 	print '<td>';
-	$html->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, '',1);  // Show opend bank account list
+	$html->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, "courant=1",1);  // Affiche liste des comptes courant
 	print '</td></tr>';
 
 	print '<tr><td>'.$langs->trans('Numero');
@@ -334,5 +335,5 @@ if ($_GET["action"] == 'create')
 
 $db->close();
 
-llxFooter('$Date: 2011/07/13 14:25:49 $ - $Revision: 1.52 $');
+llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index ab274743513..cfd46212a10 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -22,7 +22,7 @@
  *	\file       htdocs/core/class/html.formfile.class.php
  *  \ingroup    core
  *	\brief      File of class to offer components to list and upload files
- *	\version	$Id: html.formfile.class.php,v 1.49 2011/07/13 14:41:03 eldy Exp $
+ *	\version	$Id: html.formfile.class.php,v 1.48 2011/07/13 07:38:11 hregis Exp $
  */
 
 
@@ -152,7 +152,6 @@ class FormFile
 	 */
 	function show_documents($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$maxfilenamelength=28,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$hooks='')
 	{
-	    $this->numoffiles=0;
 		print $this->showdocuments($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed,$modelselected,$allowgenifempty,$forcenomultilang,$iconPDF,$maxfilenamelength,$noform,$param,$title,$buttonlabel,$codelang,$hooks);
 		return $this->numoffiles;
 	}
@@ -846,12 +845,12 @@ class FormFile
 		print '<button type="submit" class="start">'.$langs->trans('StartUpload').'</button>';
 		print '<button type="reset" class="cancel">'.$langs->trans('CancelUpload').'</button>';
 		print '</div></form>';
-
+		
 		print '</div><!-- end div fileupload -->';
-
+		
 		print '<div id="fileupload-view">';
 		print '<div class="fileupload-content">';
-
+		
 		print '<table width="100%" class="files">';
 		/*print '<tr>';
 		print '<td>'.$langs->trans("Documents2").'</td>';
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index 96292683296..1967e26eb00 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -9,8 +9,8 @@
 // Reference language: en_US
 CHARSET=UTF-8
 DIRECTION=ltr
-#FONTFORPDF=chinese
-FONTFORPDF=stsongstdlight
+FONTFORPDF=chinese
+#FONTFORPDF=stsongstdlight
 #FONTSIZEFORPDF=9
 SeparatorDecimal=.
 SeparatorThousand=None
diff --git a/htdocs/societe/socnote.php b/htdocs/societe/socnote.php
index e0a849af112..6385d48e759 100644
--- a/htdocs/societe/socnote.php
+++ b/htdocs/societe/socnote.php
@@ -23,7 +23,7 @@
  *   \file       htdocs/societe/socnote.php
  *   \brief      Tab for notes on third party
  *   \ingroup    societe
- *   \version    $Id: socnote.php,v 1.22 2011/07/13 16:24:57 eldy Exp $
+ *   \version    $Id$
  */
 
 require("../main.inc.php");
@@ -44,13 +44,13 @@ $result = restrictedArea($user, 'societe', $socid);
  * Actions
  */
 
-if ($action == 'add' && ! GETPOST('cancel'))
+if ($action == 'add')
 {
-    $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='".$db->escape($_POST["note"])."' WHERE rowid=".$_POST["socid"];
-    $result = $db->query($sql);
+  $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='".$db->escape($_POST["note"])."' WHERE rowid=".$_POST["socid"];
+  $result = $db->query($sql);
 
-    $_GET["socid"]=$_POST["socid"];   // Pour retour sur fiche
-    $socid = $_GET["socid"];
+  $_GET["socid"]=$_POST["socid"];   // Pour retour sur fiche
+  $socid = $_GET["socid"];
 }
 
 
@@ -70,25 +70,25 @@ if ($socid > 0)
     $societe = new Societe($db, $socid);
     $societe->fetch($socid);
 
-    /*
-     * Affichage onglets
-     */
+	/*
+	 * Affichage onglets
+	 */
     if ($conf->notification->enabled) $langs->load("mails");
 
-    $head = societe_prepare_head($societe);
+	$head = societe_prepare_head($societe);
 
-    dol_fiche_head($head, 'note', $langs->trans("ThirdParty"),0,'company');
+	dol_fiche_head($head, 'note', $langs->trans("ThirdParty"),0,'company');
 
 
-    print "<form method=\"post\" action=\"".DOL_URL_ROOT."/societe/socnote.php\">";
-    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print "<form method=\"post\" action=\"".DOL_URL_ROOT."/societe/socnote.php\">";
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-    print '<table class="border" width="100%">';
+	print '<table class="border" width="100%">';
 
-    print '<tr><td width="20%">'.$langs->trans('ThirdPartyName').'</td>';
-    print '<td colspan="3">';
-    print $form->showrefnav($societe,'socid','',($user->societe_id?0:1),'rowid','nom');
-    print '</td></tr>';
+	print '<tr><td width="20%">'.$langs->trans('ThirdPartyName').'</td>';
+	print '<td colspan="3">';
+	print $form->showrefnav($societe,'socid','',($user->societe_id?0:1),'rowid','nom');
+	print '</td></tr>';
 
     if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
     {
@@ -113,36 +113,32 @@ if ($socid > 0)
         print '</td></tr>';
     }
 
-    print '<tr><td valign="top">'.$langs->trans("Note").'</td>';
-    print '<td valign="top">';
-    if ($action == 'edit' && $user->rights->societe->creer)
-    {
-        print "<input type=\"hidden\" name=\"action\" value=\"add\">";
-        print "<input type=\"hidden\" name=\"socid\" value=\"".$societe->id."\">";
+	print '<tr><td valign="top">'.$langs->trans("Note").'</td>';
+	print '<td valign="top">';
+	if ($action == 'edit' && $user->rights->societe->creer)
+	{
+		print "<input type=\"hidden\" name=\"action\" value=\"add\">";
+		print "<input type=\"hidden\" name=\"socid\" value=\"".$societe->id."\">";
 
-        // Editeur wysiwyg
-        require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-        $doleditor=new DolEditor('note',$societe->note,'',360,'dolibarr_notes','In',true,false,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE,20,70);
-        $doleditor->Create();
-    }
-    else
-    {
-        print dol_textishtml($societe->note)?$societe->note:dol_nl2br($societe->note,1,true);
-    }
-    print "</td></tr>";
+	    // Editeur wysiwyg
+		require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
+		$doleditor=new DolEditor('note',$societe->note,'',360,'dolibarr_notes','In',true,false,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE,20,70);
+		$doleditor->Create();
+	}
+	else
+	{
+		print dol_textishtml($societe->note)?$societe->note:dol_nl2br($societe->note,1,true);
+	}
+	print "</td></tr>";
 
-    if ($action == 'edit')
-    {
-        print '<tr><td colspan="2" align="center">';
-        print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-        print ' &nbsp; ';
-        print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-        print '</td></tr>';
-    }
+	if ($action == 'edit')
+	{
+		print '<tr><td colspan="2" align="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></td></tr>';
+	}
 
-    print "</table>";
+	print "</table>";
 
-    print '</form>';
+	print '</form>';
 }
 
 print '</div>';
@@ -167,5 +163,5 @@ if ($action != 'edit')
 
 $db->close();
 
-llxFooter('$Date: 2011/07/13 16:24:57 $ - $Revision: 1.22 $');
+llxFooter('$Date$ - $Revision$');
 ?>

From d12bf9338b6644c109f7b234dfd63ba12e46ead8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 14:16:39 +0000
Subject: [PATCH 67/91] Doc

---
 ChangeLog | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 81aa3c6c02d..2808c594086 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,10 @@
 --------------------------------------------------------------
 English Dolibarr ChangeLog
-$Id: ChangeLog,v 1.423 2011/07/07 16:03:53 simnandez Exp $
+$Id: ChangeLog,v 1.424 2011/07/13 14:16:39 eldy Exp $
 --------------------------------------------------------------
 
 ***** ChangeLog for 3.1 compared to 3.0 *****
+WARNING: IE6 browser is no more supported in this version.
 For users:
 - New: War against number of clicks:
      - When adding a free bank transaction, form to add next one is still

From b722bbd6ecfb311ade257dd9cfad77a894fb0338 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 14:25:49 +0000
Subject: [PATCH 68/91] Fix: Cash account should be alos used to pay taxes

---
 htdocs/compta/paiement_charge.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index f265d751e83..4020909186d 100755
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * 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
@@ -20,7 +20,7 @@
  *	    \file       htdocs/compta/paiement_charge.php
  *		\ingroup    tax
  *		\brief      Page to add payment of a tax
- *		\version    $Id$
+ *		\version    $Id: paiement_charge.php,v 1.52 2011/07/13 14:25:49 eldy Exp $
  */
 
 require('../main.inc.php');
@@ -42,8 +42,9 @@ if ($user->societe_id > 0)
 
 
 /*
- * Actions add payment
+ * Actions
  */
+
 if ($_POST["action"] == 'add_payment')
 {
 	$error=0;
@@ -145,7 +146,7 @@ if ($_POST["action"] == 'add_payment')
 
 
 /*
- * Affichage
+ * View
  */
 
 llxHeader();
@@ -153,9 +154,7 @@ llxHeader();
 $html=new Form($db);
 
 
-/*
- * Formulaire de creation d'un paiement de charge
- */
+// Formulaire de creation d'un paiement de charge
 if ($_GET["action"] == 'create')
 {
 
@@ -223,7 +222,7 @@ if ($_GET["action"] == 'create')
 	print '<tr>';
 	print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
 	print '<td>';
-	$html->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, "courant=1",1);  // Affiche liste des comptes courant
+	$html->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, '',1);  // Show opend bank account list
 	print '</td></tr>';
 
 	print '<tr><td>'.$langs->trans('Numero');
@@ -335,5 +334,5 @@ if ($_GET["action"] == 'create')
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/13 14:25:49 $ - $Revision: 1.52 $');
 ?>

From 1135923e34ca172456a9ed56de3957713b79d0c6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 16:55:25 +0000
Subject: [PATCH 69/91] Fix: Avoid conflict with other payment modules
 functions New: EMail topics can be forced by external modules

---
 README                                    | 13 +---
 README-FR                                 | 12 +---
 htdocs/compta/facture/impayees.php        | 12 ++--
 htdocs/core/class/commonobject.class.php  | 10 +--
 htdocs/core/class/html.formfile.class.php |  9 +--
 htdocs/core/class/html.formmail.class.php | 26 +++----
 htdocs/langs/zh_CN/main.lang              |  4 +-
 htdocs/paypal/lib/paypal.lib.php          | 34 ++++-----
 htdocs/societe/socnote.php                | 86 ++++++++++++-----------
 9 files changed, 100 insertions(+), 106 deletions(-)

diff --git a/README b/README
index 342035579b4..2eebec8c5f8 100644
--- a/README
+++ b/README
@@ -53,20 +53,13 @@ To upgrade Dolibarr from an old version to this one:
   
 - If you came from a beta version or from any version x.y.z to any
   other where x or y number differs, you must call the Dolibarr "install/"
-  page in your browser.
-  Url might be for example:
+  page in your browser (this should be done automatically at first dolibarr
+  access).
+  This URL should looks like:
    http://localhost/dolibarr/htdocs/install/
   or
    http://yourdolibarrhost/install/index.php
 
-  To know what is exactly correct URL for "install/" page, take URL you use
-  to go on login page. It it ends with "index.php", remove it. Then add
-  "install/" at the end.
-  For example, if your login page is: 
-  http://yourdolibarrhost/something/index.php
-  Then, your "install/" pages will be 
-  http://yourdolibarrhost/something/install/
-  
   Then choose the "update" option according to your case.
   Note: Migrate process can be ran safely several times.
   
diff --git a/README-FR b/README-FR
index 404d3f1a521..75962578d1d 100644
--- a/README-FR
+++ b/README-FR
@@ -53,19 +53,13 @@ Pour mettre a jour Dolibarr depuis une vieille version vers celle ci:
   il n'y a pas besoin de migration de données.
   
 - Si vous venez d'une beta ou d'un version x.y.z vers une autre ou les numeros x
-  ou y varient, vous devez appelez la page de migration dans votre navigateur:
+  ou y varient, vous devez appelez la page "install/" de migration dans votre 
+  navigateur (ceci doit se faire automatiquement au premier accès de l'application).
+  Ce sera une URL du genre:
    http://localhost/dolibarr/htdocs/install/index.php
   ou
    http://yourdolibarrhost/install/index.php
 
-  Pour savoir quelle est l'URL exactement de la page "install/", prenez l'URL que
-  vous utilisez pour vous loguer. Si elle se termine par "index.php", enlevez le.
-  Dans tous les cas, ajouter ensuite "install/" à la fin.
-  Par exemple, si votre page de connexion est: 
-  http://yourdolibarrhost/something/index.php
-  Alors la page "install/" sera 
-  http://yourdolibarrhost/something/install/
-
   Ensuite, choisir l'option de "mise a jour" en rapport avec votre cas.
   Note: Le processus de migration peut etre lance plusieurs fois sans risque.
   
diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php
index c508e65182f..9a36e5a2e8a 100644
--- a/htdocs/compta/facture/impayees.php
+++ b/htdocs/compta/facture/impayees.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,7 +23,7 @@
  *		\file       htdocs/compta/facture/impayees.php
  *		\ingroup    facture
  *		\brief      Page to list and build liste of unpaid invoices
- *		\version    $Revision$
+ *		\version    $Revision: 1.83 $
  */
 
 require("../../main.inc.php");
@@ -268,7 +268,7 @@ if ($result)
 	print_fiche_titre($titre,$link);
 	//print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',0);	// We don't want pagination on this page
 
-	if ($mesg) print $mesg;
+	dol_htmloutput_mesg($mesg);
 
 	$i = 0;
 	print '<table class="liste" width="100%">';
@@ -351,10 +351,10 @@ if ($result)
 
 			// PDF Picto
 			print '<td width="16" align="right" class="nobordernopadding">';
-			$filename=dol_sanitizeFileName($objp->facnumber);
+            $filename=dol_sanitizeFileName($objp->facnumber);
 			$filedir=$conf->facture->dir_output . '/' . dol_sanitizeFileName($objp->facnumber);
 			$foundpdf=$formfile->show_documents('facture',$filename,$filedir,$urlsource,'','','',1,'',1,$param);
-			print '</td>';
+            print '</td>';
 
 			print '</tr></table>';
 
@@ -425,5 +425,5 @@ if ($result)
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/13 14:41:02 $ - $Revision: 1.83 $');
 ?>
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index e9ae1ea7e05..a6c93758797 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -22,7 +22,7 @@
  *	\file       htdocs/core/class/commonobject.class.php
  *	\ingroup    core
  *	\brief      File of parent class of all other business classes (invoices, contracts, proposals, orders, ...)
- *	\version    $Id: commonobject.class.php,v 1.145 2011/07/10 16:50:40 eldy Exp $
+ *	\version    $Id: commonobject.class.php,v 1.146 2011/07/13 16:55:25 eldy Exp $
  */
 
 
@@ -365,9 +365,10 @@ class CommonObject
 	 *      Return array with list of possible values for type of contacts
 	 *      @param      source      internal, external or all if not defined
 	 *      @param		order		Sort order by : code or rowid
-	 *      @return     array       List of type of contacts
+	 *      @param      option      0=Return array id->label, 1=Return array code->label
+	 *      @return     array       Array list of type of contacts (id->label if option=0, code->label if option=1)
 	 */
-	function liste_type_contact($source='internal', $order='code')
+	function liste_type_contact($source='internal', $order='code', $option=0)
 	{
 		global $langs;
 
@@ -390,7 +391,8 @@ class CommonObject
 
 				$transkey="TypeContact_".$this->element."_".$source."_".$obj->code;
 				$libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle);
-				$tab[$obj->rowid]=$libelle_type;
+				if (empty($option)) $tab[$obj->rowid]=$libelle_type;
+				else $tab[$obj->code]=$libelle_type;
 				$i++;
 			}
 			return $tab;
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index cfd46212a10..ab274743513 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -22,7 +22,7 @@
  *	\file       htdocs/core/class/html.formfile.class.php
  *  \ingroup    core
  *	\brief      File of class to offer components to list and upload files
- *	\version	$Id: html.formfile.class.php,v 1.48 2011/07/13 07:38:11 hregis Exp $
+ *	\version	$Id: html.formfile.class.php,v 1.49 2011/07/13 14:41:03 eldy Exp $
  */
 
 
@@ -152,6 +152,7 @@ class FormFile
 	 */
 	function show_documents($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$maxfilenamelength=28,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$hooks='')
 	{
+	    $this->numoffiles=0;
 		print $this->showdocuments($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed,$modelselected,$allowgenifempty,$forcenomultilang,$iconPDF,$maxfilenamelength,$noform,$param,$title,$buttonlabel,$codelang,$hooks);
 		return $this->numoffiles;
 	}
@@ -845,12 +846,12 @@ class FormFile
 		print '<button type="submit" class="start">'.$langs->trans('StartUpload').'</button>';
 		print '<button type="reset" class="cancel">'.$langs->trans('CancelUpload').'</button>';
 		print '</div></form>';
-		
+
 		print '</div><!-- end div fileupload -->';
-		
+
 		print '<div id="fileupload-view">';
 		print '<div class="fileupload-content">';
-		
+
 		print '<table width="100%" class="files">';
 		/*print '<tr>';
 		print '<td>'.$langs->trans("Documents2").'</td>';
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 3164f86d8e1..6ca8f1e007f 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -22,7 +22,7 @@
  *       \file       htdocs/core/class/html.formmail.class.php
  *       \ingroup    core
  *       \brief      Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire
- *       \version    $Id: html.formmail.class.php,v 1.31 2011/07/10 20:03:41 eldy Exp $
+ *       \version    $Id: html.formmail.class.php,v 1.32 2011/07/13 16:55:25 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT ."/core/class/html.form.class.php");
 
@@ -519,7 +519,7 @@ class FormMail
                 foreach($listofpaths as $key => $val)
                 {
                     $out.= '<div id="attachfile_'.$key.'">';
-                	$out.= img_mime($listofnames[$key]).' '.$listofnames[$key];
+                    $out.= img_mime($listofnames[$key]).' '.$listofnames[$key];
                     if (! $this->withfilereadonly)
                     {
                         $out.= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key+1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
@@ -547,15 +547,15 @@ class FormMail
             $defaultmessage="";
 
             // TODO    A partir du type, proposer liste de messages dans table llx_models
-            if ($this->param["models"]=='body')						{ $defaultmessage=$this->withbody; }
-            if ($this->param["models"]=='facture_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoice"); }
-            if ($this->param["models"]=='facture_relance')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
-            if ($this->param["models"]=='propal_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendProposal"); }
-            if ($this->param["models"]=='order_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrder"); }
-            if ($this->param["models"]=='order_supplier_send')		{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierOrder"); }
-            if ($this->param["models"]=='invoice_supplier_send')	{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
-            if ($this->param["models"]=='shipping_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendShipping"); }
-			if ($this->param["models"]=='fichinter_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendFichInter"); }
+            if     ($this->param["models"]=='facture_send')	            { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoice"); }
+            elseif ($this->param["models"]=='facture_relance')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
+            elseif ($this->param["models"]=='propal_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendProposal"); }
+            elseif ($this->param["models"]=='order_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrder"); }
+            elseif ($this->param["models"]=='order_supplier_send')		{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierOrder"); }
+            elseif ($this->param["models"]=='invoice_supplier_send')	{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
+            elseif ($this->param["models"]=='shipping_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendShipping"); }
+            elseif ($this->param["models"]=='fichinter_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendFichInter"); }
+            elseif (! is_numeric($this->withbody))                      { $defaultmessage=$this->withbody; }
 
             if ($conf->paypal->enabled && $conf->global->PAYPAL_ADD_PAYMENT_URL)
             {
@@ -565,12 +565,12 @@ class FormMail
 
                 if ($this->param["models"]=='order_send')
                 {
-                    $url=getPaymentUrl('order',$this->substit['__ORDERREF__']);
+                    $url=getPaypalPaymentUrl('order',$this->substit['__ORDERREF__']);
                     $defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrderWithPaypalLink",$url);
                 }
                 if ($this->param["models"]=='facture_send')
                 {
-                    $url=getPaymentUrl('invoice',$this->substit['__FACREF__']);
+                    $url=getPaypalPaymentUrl('invoice',$this->substit['__FACREF__']);
                     $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoiceWithPaypalLink",$url);
                 }
             }
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index 1967e26eb00..96292683296 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -9,8 +9,8 @@
 // Reference language: en_US
 CHARSET=UTF-8
 DIRECTION=ltr
-FONTFORPDF=chinese
-#FONTFORPDF=stsongstdlight
+#FONTFORPDF=chinese
+FONTFORPDF=stsongstdlight
 #FONTSIZEFORPDF=9
 SeparatorDecimal=.
 SeparatorThousand=None
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index 0e846c9e9a7..82ec9a15c2e 100755
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -22,7 +22,7 @@
  *	\file			htdocs/paypal/lib/paypal.lib.php
  *  \ingroup		paypal
  *  \brief			Library for common paypal functions
- *  \version		$Id$
+ *  \version		$Id: paypal.lib.php,v 1.25 2011/07/13 16:55:34 eldy Exp $
  */
 function llxHeaderPaypal($title, $head = "")
 {
@@ -132,7 +132,7 @@ function html_print_paypal_footer($fromcompany,$langs)
 function paypaladmin_prepare_head()
 {
 	global $langs, $conf;
-	
+
 	$h = 0;
 	$head = array();
 
@@ -140,7 +140,7 @@ function paypaladmin_prepare_head()
 	$head[$h][1] = $langs->trans("Account");
 	$head[$h][2] = 'paypalaccount';
 	$h++;
-    
+
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
@@ -151,24 +151,24 @@ function paypaladmin_prepare_head()
 }
 
 /**
- * 
+ *
  */
-function getPaymentUrl($source='',$ref='',$amount=0,$freetag='')
+function getPaypalPaymentUrl($source='',$ref='',$amount=0,$freetag='')
 {
 	global $conf;
-	
+
 	require_once(DOL_DOCUMENT_ROOT."/lib/security.lib.php");
-	
+
 	if (! empty($source) && ! empty($ref))
 	{
 		$token='';
 		if (! empty($conf->global->PAYPAL_SECURITY_TOKEN)) $token='&securekey='.dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$source.$ref, 2);
-		
+
 		if ($source == 'commande')	$source = 'order';
 		if ($source == 'facture')	$source = 'invoice';
-		
+
 		$url = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source='.$source.'&ref='.$ref.$token;
-		
+
 		return $url;
 	}
 }
@@ -482,7 +482,7 @@ function hash_call($methodName,$nvpStr)
     global $conf, $langs;
     global $API_Endpoint, $API_Url, $API_version, $USE_PROXY, $PROXY_HOST, $PROXY_PORT, $PROXY_USER, $PROXY_PASS;
     global $PAYPAL_API_USER, $PAYPAL_API_PASSWORD, $PAYPAL_API_SIGNATURE;
-    
+
     // TODO problem with triggers
     $API_version="56";
 	if ($conf->global->PAYPAL_API_SANDBOX)
@@ -495,7 +495,7 @@ function hash_call($methodName,$nvpStr)
 	    $API_Endpoint = "https://api-3t.paypal.com/nvp";
 	    $API_Url = "https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=";
 	}
-	
+
 	// Clean parameters
 	$PAYPAL_API_USER="";
 	if ($conf->global->PAYPAL_API_USER) $PAYPAL_API_USER=$conf->global->PAYPAL_API_USER;
@@ -506,7 +506,7 @@ function hash_call($methodName,$nvpStr)
 	$PAYPAL_API_SANDBOX="";
 	if ($conf->global->PAYPAL_API_SANDBOX) $PAYPAL_API_SANDBOX=$conf->global->PAYPAL_API_SANDBOX;
 	// TODO END problem with triggers
-	
+
     dol_syslog("Paypal API endpoint ".$API_Endpoint);
 
     //setting the curl parameters.
@@ -580,19 +580,19 @@ function hash_call($methodName,$nvpStr)
 function GetApiError()
 {
 	$errors=array();
-	
+
 	$resArray=$_SESSION['reshash'];
-	
+
 	if(isset($_SESSION['curl_error_no']))
 	{
 		$errors[] = $_SESSION['curl_error_no'].'-'.$_SESSION['curl_error_msg'];
 	}
-	
+
 	foreach($resArray as $key => $value)
 	{
 		$errors[] = $key.'-'.$value;
 	}
-	
+
 	return $errors;
 }
 
diff --git a/htdocs/societe/socnote.php b/htdocs/societe/socnote.php
index 6385d48e759..e0a849af112 100644
--- a/htdocs/societe/socnote.php
+++ b/htdocs/societe/socnote.php
@@ -23,7 +23,7 @@
  *   \file       htdocs/societe/socnote.php
  *   \brief      Tab for notes on third party
  *   \ingroup    societe
- *   \version    $Id$
+ *   \version    $Id: socnote.php,v 1.22 2011/07/13 16:24:57 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -44,13 +44,13 @@ $result = restrictedArea($user, 'societe', $socid);
  * Actions
  */
 
-if ($action == 'add')
+if ($action == 'add' && ! GETPOST('cancel'))
 {
-  $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='".$db->escape($_POST["note"])."' WHERE rowid=".$_POST["socid"];
-  $result = $db->query($sql);
+    $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='".$db->escape($_POST["note"])."' WHERE rowid=".$_POST["socid"];
+    $result = $db->query($sql);
 
-  $_GET["socid"]=$_POST["socid"];   // Pour retour sur fiche
-  $socid = $_GET["socid"];
+    $_GET["socid"]=$_POST["socid"];   // Pour retour sur fiche
+    $socid = $_GET["socid"];
 }
 
 
@@ -70,25 +70,25 @@ if ($socid > 0)
     $societe = new Societe($db, $socid);
     $societe->fetch($socid);
 
-	/*
-	 * Affichage onglets
-	 */
+    /*
+     * Affichage onglets
+     */
     if ($conf->notification->enabled) $langs->load("mails");
 
-	$head = societe_prepare_head($societe);
+    $head = societe_prepare_head($societe);
 
-	dol_fiche_head($head, 'note', $langs->trans("ThirdParty"),0,'company');
+    dol_fiche_head($head, 'note', $langs->trans("ThirdParty"),0,'company');
 
 
-	print "<form method=\"post\" action=\"".DOL_URL_ROOT."/societe/socnote.php\">";
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print "<form method=\"post\" action=\"".DOL_URL_ROOT."/societe/socnote.php\">";
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-	print '<table class="border" width="100%">';
+    print '<table class="border" width="100%">';
 
-	print '<tr><td width="20%">'.$langs->trans('ThirdPartyName').'</td>';
-	print '<td colspan="3">';
-	print $form->showrefnav($societe,'socid','',($user->societe_id?0:1),'rowid','nom');
-	print '</td></tr>';
+    print '<tr><td width="20%">'.$langs->trans('ThirdPartyName').'</td>';
+    print '<td colspan="3">';
+    print $form->showrefnav($societe,'socid','',($user->societe_id?0:1),'rowid','nom');
+    print '</td></tr>';
 
     if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
     {
@@ -113,32 +113,36 @@ if ($socid > 0)
         print '</td></tr>';
     }
 
-	print '<tr><td valign="top">'.$langs->trans("Note").'</td>';
-	print '<td valign="top">';
-	if ($action == 'edit' && $user->rights->societe->creer)
-	{
-		print "<input type=\"hidden\" name=\"action\" value=\"add\">";
-		print "<input type=\"hidden\" name=\"socid\" value=\"".$societe->id."\">";
+    print '<tr><td valign="top">'.$langs->trans("Note").'</td>';
+    print '<td valign="top">';
+    if ($action == 'edit' && $user->rights->societe->creer)
+    {
+        print "<input type=\"hidden\" name=\"action\" value=\"add\">";
+        print "<input type=\"hidden\" name=\"socid\" value=\"".$societe->id."\">";
 
-	    // Editeur wysiwyg
-		require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-		$doleditor=new DolEditor('note',$societe->note,'',360,'dolibarr_notes','In',true,false,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE,20,70);
-		$doleditor->Create();
-	}
-	else
-	{
-		print dol_textishtml($societe->note)?$societe->note:dol_nl2br($societe->note,1,true);
-	}
-	print "</td></tr>";
+        // Editeur wysiwyg
+        require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
+        $doleditor=new DolEditor('note',$societe->note,'',360,'dolibarr_notes','In',true,false,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE,20,70);
+        $doleditor->Create();
+    }
+    else
+    {
+        print dol_textishtml($societe->note)?$societe->note:dol_nl2br($societe->note,1,true);
+    }
+    print "</td></tr>";
 
-	if ($action == 'edit')
-	{
-		print '<tr><td colspan="2" align="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></td></tr>';
-	}
+    if ($action == 'edit')
+    {
+        print '<tr><td colspan="2" align="center">';
+        print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+        print ' &nbsp; ';
+        print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+        print '</td></tr>';
+    }
 
-	print "</table>";
+    print "</table>";
 
-	print '</form>';
+    print '</form>';
 }
 
 print '</div>';
@@ -163,5 +167,5 @@ if ($action != 'edit')
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/13 16:24:57 $ - $Revision: 1.22 $');
 ?>

From e36e34918f9f58ce2a74d629ed85a67506825554 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 18:04:25 +0000
Subject: [PATCH 70/91] Comment TODO

---
 htdocs/core/class/conf.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index e9e0a507b7e..bd15e21b0ab 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -25,7 +25,7 @@
  *	\ingroup		core
  *  \brief      	Fichier de la classe de stockage de la config courante
  *  \remarks		La config est stockee dans le fichier conf/conf.php
- *  \version    	$Id: conf.class.php,v 1.60 2011/07/09 05:28:42 hregis Exp $
+ *  \version    	$Id: conf.class.php,v 1.61 2011/07/13 18:04:25 eldy Exp $
  */
 
 
@@ -145,13 +145,13 @@ class Conf
 						elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg))
 						{
 							$modulename = strtolower($reg[1]);
-							$this->triggers_modules[] = '/'.$modulename.'/inc/triggers/';
+							$this->triggers_modules[] = '/'.$modulename.'/inc/triggers/';    // TODO Replace inc by includes to have same path than standard
 						}
 						// If this is constant for login method activated by a module
 						elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg))
 						{
 							$modulename = strtolower($reg[1]);
-							$this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/';
+							$this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/'; // TODO Replace inc by includes to have same path than standard
 						}
 						// If this is constant for hook activated by a module. Value is list of hooked tabs separated with :
 						elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg))

From b6ca5d1439f721884073c78831eed476f07b2fd6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 14:41:02 +0000
Subject: [PATCH 71/91] Fix: No check box if no PDF

---
 README                                    | 13 +++-
 README-FR                                 | 12 +++-
 htdocs/core/class/commonobject.class.php  | 10 ++-
 htdocs/core/class/conf.class.php          |  6 +-
 htdocs/core/class/html.formmail.class.php | 26 +++----
 htdocs/langs/zh_CN/main.lang              |  4 +-
 htdocs/paypal/lib/paypal.lib.php          | 34 ++++-----
 htdocs/societe/socnote.php                | 86 +++++++++++------------
 8 files changed, 99 insertions(+), 92 deletions(-)

diff --git a/README b/README
index 2eebec8c5f8..342035579b4 100644
--- a/README
+++ b/README
@@ -53,13 +53,20 @@ To upgrade Dolibarr from an old version to this one:
   
 - If you came from a beta version or from any version x.y.z to any
   other where x or y number differs, you must call the Dolibarr "install/"
-  page in your browser (this should be done automatically at first dolibarr
-  access).
-  This URL should looks like:
+  page in your browser.
+  Url might be for example:
    http://localhost/dolibarr/htdocs/install/
   or
    http://yourdolibarrhost/install/index.php
 
+  To know what is exactly correct URL for "install/" page, take URL you use
+  to go on login page. It it ends with "index.php", remove it. Then add
+  "install/" at the end.
+  For example, if your login page is: 
+  http://yourdolibarrhost/something/index.php
+  Then, your "install/" pages will be 
+  http://yourdolibarrhost/something/install/
+  
   Then choose the "update" option according to your case.
   Note: Migrate process can be ran safely several times.
   
diff --git a/README-FR b/README-FR
index 75962578d1d..404d3f1a521 100644
--- a/README-FR
+++ b/README-FR
@@ -53,13 +53,19 @@ Pour mettre a jour Dolibarr depuis une vieille version vers celle ci:
   il n'y a pas besoin de migration de données.
   
 - Si vous venez d'une beta ou d'un version x.y.z vers une autre ou les numeros x
-  ou y varient, vous devez appelez la page "install/" de migration dans votre 
-  navigateur (ceci doit se faire automatiquement au premier accès de l'application).
-  Ce sera une URL du genre:
+  ou y varient, vous devez appelez la page de migration dans votre navigateur:
    http://localhost/dolibarr/htdocs/install/index.php
   ou
    http://yourdolibarrhost/install/index.php
 
+  Pour savoir quelle est l'URL exactement de la page "install/", prenez l'URL que
+  vous utilisez pour vous loguer. Si elle se termine par "index.php", enlevez le.
+  Dans tous les cas, ajouter ensuite "install/" à la fin.
+  Par exemple, si votre page de connexion est: 
+  http://yourdolibarrhost/something/index.php
+  Alors la page "install/" sera 
+  http://yourdolibarrhost/something/install/
+
   Ensuite, choisir l'option de "mise a jour" en rapport avec votre cas.
   Note: Le processus de migration peut etre lance plusieurs fois sans risque.
   
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index a6c93758797..e9ae1ea7e05 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -22,7 +22,7 @@
  *	\file       htdocs/core/class/commonobject.class.php
  *	\ingroup    core
  *	\brief      File of parent class of all other business classes (invoices, contracts, proposals, orders, ...)
- *	\version    $Id: commonobject.class.php,v 1.146 2011/07/13 16:55:25 eldy Exp $
+ *	\version    $Id: commonobject.class.php,v 1.145 2011/07/10 16:50:40 eldy Exp $
  */
 
 
@@ -365,10 +365,9 @@ class CommonObject
 	 *      Return array with list of possible values for type of contacts
 	 *      @param      source      internal, external or all if not defined
 	 *      @param		order		Sort order by : code or rowid
-	 *      @param      option      0=Return array id->label, 1=Return array code->label
-	 *      @return     array       Array list of type of contacts (id->label if option=0, code->label if option=1)
+	 *      @return     array       List of type of contacts
 	 */
-	function liste_type_contact($source='internal', $order='code', $option=0)
+	function liste_type_contact($source='internal', $order='code')
 	{
 		global $langs;
 
@@ -391,8 +390,7 @@ class CommonObject
 
 				$transkey="TypeContact_".$this->element."_".$source."_".$obj->code;
 				$libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle);
-				if (empty($option)) $tab[$obj->rowid]=$libelle_type;
-				else $tab[$obj->code]=$libelle_type;
+				$tab[$obj->rowid]=$libelle_type;
 				$i++;
 			}
 			return $tab;
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index bd15e21b0ab..e9e0a507b7e 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -25,7 +25,7 @@
  *	\ingroup		core
  *  \brief      	Fichier de la classe de stockage de la config courante
  *  \remarks		La config est stockee dans le fichier conf/conf.php
- *  \version    	$Id: conf.class.php,v 1.61 2011/07/13 18:04:25 eldy Exp $
+ *  \version    	$Id: conf.class.php,v 1.60 2011/07/09 05:28:42 hregis Exp $
  */
 
 
@@ -145,13 +145,13 @@ class Conf
 						elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg))
 						{
 							$modulename = strtolower($reg[1]);
-							$this->triggers_modules[] = '/'.$modulename.'/inc/triggers/';    // TODO Replace inc by includes to have same path than standard
+							$this->triggers_modules[] = '/'.$modulename.'/inc/triggers/';
 						}
 						// If this is constant for login method activated by a module
 						elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg))
 						{
 							$modulename = strtolower($reg[1]);
-							$this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/'; // TODO Replace inc by includes to have same path than standard
+							$this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/';
 						}
 						// If this is constant for hook activated by a module. Value is list of hooked tabs separated with :
 						elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg))
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 6ca8f1e007f..3164f86d8e1 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -22,7 +22,7 @@
  *       \file       htdocs/core/class/html.formmail.class.php
  *       \ingroup    core
  *       \brief      Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire
- *       \version    $Id: html.formmail.class.php,v 1.32 2011/07/13 16:55:25 eldy Exp $
+ *       \version    $Id: html.formmail.class.php,v 1.31 2011/07/10 20:03:41 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT ."/core/class/html.form.class.php");
 
@@ -519,7 +519,7 @@ class FormMail
                 foreach($listofpaths as $key => $val)
                 {
                     $out.= '<div id="attachfile_'.$key.'">';
-                    $out.= img_mime($listofnames[$key]).' '.$listofnames[$key];
+                	$out.= img_mime($listofnames[$key]).' '.$listofnames[$key];
                     if (! $this->withfilereadonly)
                     {
                         $out.= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key+1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
@@ -547,15 +547,15 @@ class FormMail
             $defaultmessage="";
 
             // TODO    A partir du type, proposer liste de messages dans table llx_models
-            if     ($this->param["models"]=='facture_send')	            { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoice"); }
-            elseif ($this->param["models"]=='facture_relance')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
-            elseif ($this->param["models"]=='propal_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendProposal"); }
-            elseif ($this->param["models"]=='order_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrder"); }
-            elseif ($this->param["models"]=='order_supplier_send')		{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierOrder"); }
-            elseif ($this->param["models"]=='invoice_supplier_send')	{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
-            elseif ($this->param["models"]=='shipping_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendShipping"); }
-            elseif ($this->param["models"]=='fichinter_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendFichInter"); }
-            elseif (! is_numeric($this->withbody))                      { $defaultmessage=$this->withbody; }
+            if ($this->param["models"]=='body')						{ $defaultmessage=$this->withbody; }
+            if ($this->param["models"]=='facture_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoice"); }
+            if ($this->param["models"]=='facture_relance')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
+            if ($this->param["models"]=='propal_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendProposal"); }
+            if ($this->param["models"]=='order_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrder"); }
+            if ($this->param["models"]=='order_supplier_send')		{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierOrder"); }
+            if ($this->param["models"]=='invoice_supplier_send')	{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
+            if ($this->param["models"]=='shipping_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendShipping"); }
+			if ($this->param["models"]=='fichinter_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendFichInter"); }
 
             if ($conf->paypal->enabled && $conf->global->PAYPAL_ADD_PAYMENT_URL)
             {
@@ -565,12 +565,12 @@ class FormMail
 
                 if ($this->param["models"]=='order_send')
                 {
-                    $url=getPaypalPaymentUrl('order',$this->substit['__ORDERREF__']);
+                    $url=getPaymentUrl('order',$this->substit['__ORDERREF__']);
                     $defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrderWithPaypalLink",$url);
                 }
                 if ($this->param["models"]=='facture_send')
                 {
-                    $url=getPaypalPaymentUrl('invoice',$this->substit['__FACREF__']);
+                    $url=getPaymentUrl('invoice',$this->substit['__FACREF__']);
                     $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoiceWithPaypalLink",$url);
                 }
             }
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index 96292683296..1967e26eb00 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -9,8 +9,8 @@
 // Reference language: en_US
 CHARSET=UTF-8
 DIRECTION=ltr
-#FONTFORPDF=chinese
-FONTFORPDF=stsongstdlight
+FONTFORPDF=chinese
+#FONTFORPDF=stsongstdlight
 #FONTSIZEFORPDF=9
 SeparatorDecimal=.
 SeparatorThousand=None
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index 82ec9a15c2e..0e846c9e9a7 100755
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -22,7 +22,7 @@
  *	\file			htdocs/paypal/lib/paypal.lib.php
  *  \ingroup		paypal
  *  \brief			Library for common paypal functions
- *  \version		$Id: paypal.lib.php,v 1.25 2011/07/13 16:55:34 eldy Exp $
+ *  \version		$Id$
  */
 function llxHeaderPaypal($title, $head = "")
 {
@@ -132,7 +132,7 @@ function html_print_paypal_footer($fromcompany,$langs)
 function paypaladmin_prepare_head()
 {
 	global $langs, $conf;
-
+	
 	$h = 0;
 	$head = array();
 
@@ -140,7 +140,7 @@ function paypaladmin_prepare_head()
 	$head[$h][1] = $langs->trans("Account");
 	$head[$h][2] = 'paypalaccount';
 	$h++;
-
+    
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
@@ -151,24 +151,24 @@ function paypaladmin_prepare_head()
 }
 
 /**
- *
+ * 
  */
-function getPaypalPaymentUrl($source='',$ref='',$amount=0,$freetag='')
+function getPaymentUrl($source='',$ref='',$amount=0,$freetag='')
 {
 	global $conf;
-
+	
 	require_once(DOL_DOCUMENT_ROOT."/lib/security.lib.php");
-
+	
 	if (! empty($source) && ! empty($ref))
 	{
 		$token='';
 		if (! empty($conf->global->PAYPAL_SECURITY_TOKEN)) $token='&securekey='.dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$source.$ref, 2);
-
+		
 		if ($source == 'commande')	$source = 'order';
 		if ($source == 'facture')	$source = 'invoice';
-
+		
 		$url = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source='.$source.'&ref='.$ref.$token;
-
+		
 		return $url;
 	}
 }
@@ -482,7 +482,7 @@ function hash_call($methodName,$nvpStr)
     global $conf, $langs;
     global $API_Endpoint, $API_Url, $API_version, $USE_PROXY, $PROXY_HOST, $PROXY_PORT, $PROXY_USER, $PROXY_PASS;
     global $PAYPAL_API_USER, $PAYPAL_API_PASSWORD, $PAYPAL_API_SIGNATURE;
-
+    
     // TODO problem with triggers
     $API_version="56";
 	if ($conf->global->PAYPAL_API_SANDBOX)
@@ -495,7 +495,7 @@ function hash_call($methodName,$nvpStr)
 	    $API_Endpoint = "https://api-3t.paypal.com/nvp";
 	    $API_Url = "https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=";
 	}
-
+	
 	// Clean parameters
 	$PAYPAL_API_USER="";
 	if ($conf->global->PAYPAL_API_USER) $PAYPAL_API_USER=$conf->global->PAYPAL_API_USER;
@@ -506,7 +506,7 @@ function hash_call($methodName,$nvpStr)
 	$PAYPAL_API_SANDBOX="";
 	if ($conf->global->PAYPAL_API_SANDBOX) $PAYPAL_API_SANDBOX=$conf->global->PAYPAL_API_SANDBOX;
 	// TODO END problem with triggers
-
+	
     dol_syslog("Paypal API endpoint ".$API_Endpoint);
 
     //setting the curl parameters.
@@ -580,19 +580,19 @@ function hash_call($methodName,$nvpStr)
 function GetApiError()
 {
 	$errors=array();
-
+	
 	$resArray=$_SESSION['reshash'];
-
+	
 	if(isset($_SESSION['curl_error_no']))
 	{
 		$errors[] = $_SESSION['curl_error_no'].'-'.$_SESSION['curl_error_msg'];
 	}
-
+	
 	foreach($resArray as $key => $value)
 	{
 		$errors[] = $key.'-'.$value;
 	}
-
+	
 	return $errors;
 }
 
diff --git a/htdocs/societe/socnote.php b/htdocs/societe/socnote.php
index e0a849af112..6385d48e759 100644
--- a/htdocs/societe/socnote.php
+++ b/htdocs/societe/socnote.php
@@ -23,7 +23,7 @@
  *   \file       htdocs/societe/socnote.php
  *   \brief      Tab for notes on third party
  *   \ingroup    societe
- *   \version    $Id: socnote.php,v 1.22 2011/07/13 16:24:57 eldy Exp $
+ *   \version    $Id$
  */
 
 require("../main.inc.php");
@@ -44,13 +44,13 @@ $result = restrictedArea($user, 'societe', $socid);
  * Actions
  */
 
-if ($action == 'add' && ! GETPOST('cancel'))
+if ($action == 'add')
 {
-    $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='".$db->escape($_POST["note"])."' WHERE rowid=".$_POST["socid"];
-    $result = $db->query($sql);
+  $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='".$db->escape($_POST["note"])."' WHERE rowid=".$_POST["socid"];
+  $result = $db->query($sql);
 
-    $_GET["socid"]=$_POST["socid"];   // Pour retour sur fiche
-    $socid = $_GET["socid"];
+  $_GET["socid"]=$_POST["socid"];   // Pour retour sur fiche
+  $socid = $_GET["socid"];
 }
 
 
@@ -70,25 +70,25 @@ if ($socid > 0)
     $societe = new Societe($db, $socid);
     $societe->fetch($socid);
 
-    /*
-     * Affichage onglets
-     */
+	/*
+	 * Affichage onglets
+	 */
     if ($conf->notification->enabled) $langs->load("mails");
 
-    $head = societe_prepare_head($societe);
+	$head = societe_prepare_head($societe);
 
-    dol_fiche_head($head, 'note', $langs->trans("ThirdParty"),0,'company');
+	dol_fiche_head($head, 'note', $langs->trans("ThirdParty"),0,'company');
 
 
-    print "<form method=\"post\" action=\"".DOL_URL_ROOT."/societe/socnote.php\">";
-    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print "<form method=\"post\" action=\"".DOL_URL_ROOT."/societe/socnote.php\">";
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-    print '<table class="border" width="100%">';
+	print '<table class="border" width="100%">';
 
-    print '<tr><td width="20%">'.$langs->trans('ThirdPartyName').'</td>';
-    print '<td colspan="3">';
-    print $form->showrefnav($societe,'socid','',($user->societe_id?0:1),'rowid','nom');
-    print '</td></tr>';
+	print '<tr><td width="20%">'.$langs->trans('ThirdPartyName').'</td>';
+	print '<td colspan="3">';
+	print $form->showrefnav($societe,'socid','',($user->societe_id?0:1),'rowid','nom');
+	print '</td></tr>';
 
     if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
     {
@@ -113,36 +113,32 @@ if ($socid > 0)
         print '</td></tr>';
     }
 
-    print '<tr><td valign="top">'.$langs->trans("Note").'</td>';
-    print '<td valign="top">';
-    if ($action == 'edit' && $user->rights->societe->creer)
-    {
-        print "<input type=\"hidden\" name=\"action\" value=\"add\">";
-        print "<input type=\"hidden\" name=\"socid\" value=\"".$societe->id."\">";
+	print '<tr><td valign="top">'.$langs->trans("Note").'</td>';
+	print '<td valign="top">';
+	if ($action == 'edit' && $user->rights->societe->creer)
+	{
+		print "<input type=\"hidden\" name=\"action\" value=\"add\">";
+		print "<input type=\"hidden\" name=\"socid\" value=\"".$societe->id."\">";
 
-        // Editeur wysiwyg
-        require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-        $doleditor=new DolEditor('note',$societe->note,'',360,'dolibarr_notes','In',true,false,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE,20,70);
-        $doleditor->Create();
-    }
-    else
-    {
-        print dol_textishtml($societe->note)?$societe->note:dol_nl2br($societe->note,1,true);
-    }
-    print "</td></tr>";
+	    // Editeur wysiwyg
+		require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
+		$doleditor=new DolEditor('note',$societe->note,'',360,'dolibarr_notes','In',true,false,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE,20,70);
+		$doleditor->Create();
+	}
+	else
+	{
+		print dol_textishtml($societe->note)?$societe->note:dol_nl2br($societe->note,1,true);
+	}
+	print "</td></tr>";
 
-    if ($action == 'edit')
-    {
-        print '<tr><td colspan="2" align="center">';
-        print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-        print ' &nbsp; ';
-        print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-        print '</td></tr>';
-    }
+	if ($action == 'edit')
+	{
+		print '<tr><td colspan="2" align="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></td></tr>';
+	}
 
-    print "</table>";
+	print "</table>";
 
-    print '</form>';
+	print '</form>';
 }
 
 print '</div>';
@@ -167,5 +163,5 @@ if ($action != 'edit')
 
 $db->close();
 
-llxFooter('$Date: 2011/07/13 16:24:57 $ - $Revision: 1.22 $');
+llxFooter('$Date$ - $Revision$');
 ?>

From 204f7c9d981cbba8cef35b802669cfd2f791b253 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 18:05:27 +0000
Subject: [PATCH 72/91] Fix: Bad init of object on actions

---
 README                                        | 13 +--
 README-FR                                     | 12 +--
 htdocs/core/class/commonobject.class.php      | 10 ++-
 htdocs/core/class/conf.class.php              |  6 +-
 htdocs/core/class/html.formmail.class.php     | 26 +++---
 .../interface_modAgenda_ActionsAuto.class.php | 14 ++-
 htdocs/langs/zh_CN/main.lang                  |  4 +-
 htdocs/paypal/lib/paypal.lib.php              | 34 ++++----
 htdocs/societe/socnote.php                    | 86 ++++++++++---------
 9 files changed, 102 insertions(+), 103 deletions(-)

diff --git a/README b/README
index 342035579b4..2eebec8c5f8 100644
--- a/README
+++ b/README
@@ -53,20 +53,13 @@ To upgrade Dolibarr from an old version to this one:
   
 - If you came from a beta version or from any version x.y.z to any
   other where x or y number differs, you must call the Dolibarr "install/"
-  page in your browser.
-  Url might be for example:
+  page in your browser (this should be done automatically at first dolibarr
+  access).
+  This URL should looks like:
    http://localhost/dolibarr/htdocs/install/
   or
    http://yourdolibarrhost/install/index.php
 
-  To know what is exactly correct URL for "install/" page, take URL you use
-  to go on login page. It it ends with "index.php", remove it. Then add
-  "install/" at the end.
-  For example, if your login page is: 
-  http://yourdolibarrhost/something/index.php
-  Then, your "install/" pages will be 
-  http://yourdolibarrhost/something/install/
-  
   Then choose the "update" option according to your case.
   Note: Migrate process can be ran safely several times.
   
diff --git a/README-FR b/README-FR
index 404d3f1a521..75962578d1d 100644
--- a/README-FR
+++ b/README-FR
@@ -53,19 +53,13 @@ Pour mettre a jour Dolibarr depuis une vieille version vers celle ci:
   il n'y a pas besoin de migration de données.
   
 - Si vous venez d'une beta ou d'un version x.y.z vers une autre ou les numeros x
-  ou y varient, vous devez appelez la page de migration dans votre navigateur:
+  ou y varient, vous devez appelez la page "install/" de migration dans votre 
+  navigateur (ceci doit se faire automatiquement au premier accès de l'application).
+  Ce sera une URL du genre:
    http://localhost/dolibarr/htdocs/install/index.php
   ou
    http://yourdolibarrhost/install/index.php
 
-  Pour savoir quelle est l'URL exactement de la page "install/", prenez l'URL que
-  vous utilisez pour vous loguer. Si elle se termine par "index.php", enlevez le.
-  Dans tous les cas, ajouter ensuite "install/" à la fin.
-  Par exemple, si votre page de connexion est: 
-  http://yourdolibarrhost/something/index.php
-  Alors la page "install/" sera 
-  http://yourdolibarrhost/something/install/
-
   Ensuite, choisir l'option de "mise a jour" en rapport avec votre cas.
   Note: Le processus de migration peut etre lance plusieurs fois sans risque.
   
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index e9ae1ea7e05..a6c93758797 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -22,7 +22,7 @@
  *	\file       htdocs/core/class/commonobject.class.php
  *	\ingroup    core
  *	\brief      File of parent class of all other business classes (invoices, contracts, proposals, orders, ...)
- *	\version    $Id: commonobject.class.php,v 1.145 2011/07/10 16:50:40 eldy Exp $
+ *	\version    $Id: commonobject.class.php,v 1.146 2011/07/13 16:55:25 eldy Exp $
  */
 
 
@@ -365,9 +365,10 @@ class CommonObject
 	 *      Return array with list of possible values for type of contacts
 	 *      @param      source      internal, external or all if not defined
 	 *      @param		order		Sort order by : code or rowid
-	 *      @return     array       List of type of contacts
+	 *      @param      option      0=Return array id->label, 1=Return array code->label
+	 *      @return     array       Array list of type of contacts (id->label if option=0, code->label if option=1)
 	 */
-	function liste_type_contact($source='internal', $order='code')
+	function liste_type_contact($source='internal', $order='code', $option=0)
 	{
 		global $langs;
 
@@ -390,7 +391,8 @@ class CommonObject
 
 				$transkey="TypeContact_".$this->element."_".$source."_".$obj->code;
 				$libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle);
-				$tab[$obj->rowid]=$libelle_type;
+				if (empty($option)) $tab[$obj->rowid]=$libelle_type;
+				else $tab[$obj->code]=$libelle_type;
 				$i++;
 			}
 			return $tab;
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index e9e0a507b7e..bd15e21b0ab 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -25,7 +25,7 @@
  *	\ingroup		core
  *  \brief      	Fichier de la classe de stockage de la config courante
  *  \remarks		La config est stockee dans le fichier conf/conf.php
- *  \version    	$Id: conf.class.php,v 1.60 2011/07/09 05:28:42 hregis Exp $
+ *  \version    	$Id: conf.class.php,v 1.61 2011/07/13 18:04:25 eldy Exp $
  */
 
 
@@ -145,13 +145,13 @@ class Conf
 						elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg))
 						{
 							$modulename = strtolower($reg[1]);
-							$this->triggers_modules[] = '/'.$modulename.'/inc/triggers/';
+							$this->triggers_modules[] = '/'.$modulename.'/inc/triggers/';    // TODO Replace inc by includes to have same path than standard
 						}
 						// If this is constant for login method activated by a module
 						elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg))
 						{
 							$modulename = strtolower($reg[1]);
-							$this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/';
+							$this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/'; // TODO Replace inc by includes to have same path than standard
 						}
 						// If this is constant for hook activated by a module. Value is list of hooked tabs separated with :
 						elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg))
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 3164f86d8e1..6ca8f1e007f 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -22,7 +22,7 @@
  *       \file       htdocs/core/class/html.formmail.class.php
  *       \ingroup    core
  *       \brief      Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire
- *       \version    $Id: html.formmail.class.php,v 1.31 2011/07/10 20:03:41 eldy Exp $
+ *       \version    $Id: html.formmail.class.php,v 1.32 2011/07/13 16:55:25 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT ."/core/class/html.form.class.php");
 
@@ -519,7 +519,7 @@ class FormMail
                 foreach($listofpaths as $key => $val)
                 {
                     $out.= '<div id="attachfile_'.$key.'">';
-                	$out.= img_mime($listofnames[$key]).' '.$listofnames[$key];
+                    $out.= img_mime($listofnames[$key]).' '.$listofnames[$key];
                     if (! $this->withfilereadonly)
                     {
                         $out.= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key+1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
@@ -547,15 +547,15 @@ class FormMail
             $defaultmessage="";
 
             // TODO    A partir du type, proposer liste de messages dans table llx_models
-            if ($this->param["models"]=='body')						{ $defaultmessage=$this->withbody; }
-            if ($this->param["models"]=='facture_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoice"); }
-            if ($this->param["models"]=='facture_relance')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
-            if ($this->param["models"]=='propal_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendProposal"); }
-            if ($this->param["models"]=='order_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrder"); }
-            if ($this->param["models"]=='order_supplier_send')		{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierOrder"); }
-            if ($this->param["models"]=='invoice_supplier_send')	{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
-            if ($this->param["models"]=='shipping_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendShipping"); }
-			if ($this->param["models"]=='fichinter_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendFichInter"); }
+            if     ($this->param["models"]=='facture_send')	            { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoice"); }
+            elseif ($this->param["models"]=='facture_relance')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
+            elseif ($this->param["models"]=='propal_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendProposal"); }
+            elseif ($this->param["models"]=='order_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrder"); }
+            elseif ($this->param["models"]=='order_supplier_send')		{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierOrder"); }
+            elseif ($this->param["models"]=='invoice_supplier_send')	{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
+            elseif ($this->param["models"]=='shipping_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendShipping"); }
+            elseif ($this->param["models"]=='fichinter_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendFichInter"); }
+            elseif (! is_numeric($this->withbody))                      { $defaultmessage=$this->withbody; }
 
             if ($conf->paypal->enabled && $conf->global->PAYPAL_ADD_PAYMENT_URL)
             {
@@ -565,12 +565,12 @@ class FormMail
 
                 if ($this->param["models"]=='order_send')
                 {
-                    $url=getPaymentUrl('order',$this->substit['__ORDERREF__']);
+                    $url=getPaypalPaymentUrl('order',$this->substit['__ORDERREF__']);
                     $defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrderWithPaypalLink",$url);
                 }
                 if ($this->param["models"]=='facture_send')
                 {
-                    $url=getPaymentUrl('invoice',$this->substit['__FACREF__']);
+                    $url=getPaypalPaymentUrl('invoice',$this->substit['__FACREF__']);
                     $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoiceWithPaypalLink",$url);
                 }
             }
diff --git a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php b/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
index 2ff7b4003b3..e2987f224ee 100644
--- a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
+++ b/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
@@ -22,7 +22,7 @@
  *	\file       htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
  *  \ingroup    agenda
  *  \brief      Trigger file for agenda module
- *	\version	$Id: interface_modAgenda_ActionsAuto.class.php,v 1.33 2011/07/07 09:18:27 simnandez Exp $
+ *	\version	$Id: interface_modAgenda_ActionsAuto.class.php,v 1.34 2011/07/13 18:05:27 eldy Exp $
  */
 
 
@@ -550,8 +550,14 @@ class InterfaceActionsAuto
         {
 			$now=dol_now();
 
+            require_once(DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php');
+            require_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php');
+			$contactforaction=new Contact($this->db);
+            $societeforaction=new Societe($this->db);
+            if ($object->sendtoid > 0) $contactforaction->fetch($object->sendtoid);
+            if ($object->socid > 0)    $societeforaction->fetch($object->socid);
+
 			// Insertion action
-			require_once(DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php');
 			require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php');
 			$actioncomm = new ActionComm($this->db);
 			$actioncomm->type_code   = $object->actiontypecode;
@@ -562,8 +568,8 @@ class InterfaceActionsAuto
 			$actioncomm->durationp   = 0;
 			$actioncomm->punctual    = 1;
 			$actioncomm->percentage  = -1;   // Not applicable
-			$actioncomm->contact     = new Contact($this->db,$object->sendtoid);
-			$actioncomm->societe     = new Societe($this->db,$object->socid);
+			$actioncomm->contact     = $contactforaction;
+			$actioncomm->societe     = $societeforaction;
 			$actioncomm->author      = $user;   // User saving action
 			//$actioncomm->usertodo  = $user;	// User affected to action
 			$actioncomm->userdone    = $user;	// User doing action
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index 1967e26eb00..96292683296 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -9,8 +9,8 @@
 // Reference language: en_US
 CHARSET=UTF-8
 DIRECTION=ltr
-FONTFORPDF=chinese
-#FONTFORPDF=stsongstdlight
+#FONTFORPDF=chinese
+FONTFORPDF=stsongstdlight
 #FONTSIZEFORPDF=9
 SeparatorDecimal=.
 SeparatorThousand=None
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index 0e846c9e9a7..82ec9a15c2e 100755
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -22,7 +22,7 @@
  *	\file			htdocs/paypal/lib/paypal.lib.php
  *  \ingroup		paypal
  *  \brief			Library for common paypal functions
- *  \version		$Id$
+ *  \version		$Id: paypal.lib.php,v 1.25 2011/07/13 16:55:34 eldy Exp $
  */
 function llxHeaderPaypal($title, $head = "")
 {
@@ -132,7 +132,7 @@ function html_print_paypal_footer($fromcompany,$langs)
 function paypaladmin_prepare_head()
 {
 	global $langs, $conf;
-	
+
 	$h = 0;
 	$head = array();
 
@@ -140,7 +140,7 @@ function paypaladmin_prepare_head()
 	$head[$h][1] = $langs->trans("Account");
 	$head[$h][2] = 'paypalaccount';
 	$h++;
-    
+
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
@@ -151,24 +151,24 @@ function paypaladmin_prepare_head()
 }
 
 /**
- * 
+ *
  */
-function getPaymentUrl($source='',$ref='',$amount=0,$freetag='')
+function getPaypalPaymentUrl($source='',$ref='',$amount=0,$freetag='')
 {
 	global $conf;
-	
+
 	require_once(DOL_DOCUMENT_ROOT."/lib/security.lib.php");
-	
+
 	if (! empty($source) && ! empty($ref))
 	{
 		$token='';
 		if (! empty($conf->global->PAYPAL_SECURITY_TOKEN)) $token='&securekey='.dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$source.$ref, 2);
-		
+
 		if ($source == 'commande')	$source = 'order';
 		if ($source == 'facture')	$source = 'invoice';
-		
+
 		$url = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source='.$source.'&ref='.$ref.$token;
-		
+
 		return $url;
 	}
 }
@@ -482,7 +482,7 @@ function hash_call($methodName,$nvpStr)
     global $conf, $langs;
     global $API_Endpoint, $API_Url, $API_version, $USE_PROXY, $PROXY_HOST, $PROXY_PORT, $PROXY_USER, $PROXY_PASS;
     global $PAYPAL_API_USER, $PAYPAL_API_PASSWORD, $PAYPAL_API_SIGNATURE;
-    
+
     // TODO problem with triggers
     $API_version="56";
 	if ($conf->global->PAYPAL_API_SANDBOX)
@@ -495,7 +495,7 @@ function hash_call($methodName,$nvpStr)
 	    $API_Endpoint = "https://api-3t.paypal.com/nvp";
 	    $API_Url = "https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=";
 	}
-	
+
 	// Clean parameters
 	$PAYPAL_API_USER="";
 	if ($conf->global->PAYPAL_API_USER) $PAYPAL_API_USER=$conf->global->PAYPAL_API_USER;
@@ -506,7 +506,7 @@ function hash_call($methodName,$nvpStr)
 	$PAYPAL_API_SANDBOX="";
 	if ($conf->global->PAYPAL_API_SANDBOX) $PAYPAL_API_SANDBOX=$conf->global->PAYPAL_API_SANDBOX;
 	// TODO END problem with triggers
-	
+
     dol_syslog("Paypal API endpoint ".$API_Endpoint);
 
     //setting the curl parameters.
@@ -580,19 +580,19 @@ function hash_call($methodName,$nvpStr)
 function GetApiError()
 {
 	$errors=array();
-	
+
 	$resArray=$_SESSION['reshash'];
-	
+
 	if(isset($_SESSION['curl_error_no']))
 	{
 		$errors[] = $_SESSION['curl_error_no'].'-'.$_SESSION['curl_error_msg'];
 	}
-	
+
 	foreach($resArray as $key => $value)
 	{
 		$errors[] = $key.'-'.$value;
 	}
-	
+
 	return $errors;
 }
 
diff --git a/htdocs/societe/socnote.php b/htdocs/societe/socnote.php
index 6385d48e759..e0a849af112 100644
--- a/htdocs/societe/socnote.php
+++ b/htdocs/societe/socnote.php
@@ -23,7 +23,7 @@
  *   \file       htdocs/societe/socnote.php
  *   \brief      Tab for notes on third party
  *   \ingroup    societe
- *   \version    $Id$
+ *   \version    $Id: socnote.php,v 1.22 2011/07/13 16:24:57 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -44,13 +44,13 @@ $result = restrictedArea($user, 'societe', $socid);
  * Actions
  */
 
-if ($action == 'add')
+if ($action == 'add' && ! GETPOST('cancel'))
 {
-  $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='".$db->escape($_POST["note"])."' WHERE rowid=".$_POST["socid"];
-  $result = $db->query($sql);
+    $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='".$db->escape($_POST["note"])."' WHERE rowid=".$_POST["socid"];
+    $result = $db->query($sql);
 
-  $_GET["socid"]=$_POST["socid"];   // Pour retour sur fiche
-  $socid = $_GET["socid"];
+    $_GET["socid"]=$_POST["socid"];   // Pour retour sur fiche
+    $socid = $_GET["socid"];
 }
 
 
@@ -70,25 +70,25 @@ if ($socid > 0)
     $societe = new Societe($db, $socid);
     $societe->fetch($socid);
 
-	/*
-	 * Affichage onglets
-	 */
+    /*
+     * Affichage onglets
+     */
     if ($conf->notification->enabled) $langs->load("mails");
 
-	$head = societe_prepare_head($societe);
+    $head = societe_prepare_head($societe);
 
-	dol_fiche_head($head, 'note', $langs->trans("ThirdParty"),0,'company');
+    dol_fiche_head($head, 'note', $langs->trans("ThirdParty"),0,'company');
 
 
-	print "<form method=\"post\" action=\"".DOL_URL_ROOT."/societe/socnote.php\">";
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print "<form method=\"post\" action=\"".DOL_URL_ROOT."/societe/socnote.php\">";
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-	print '<table class="border" width="100%">';
+    print '<table class="border" width="100%">';
 
-	print '<tr><td width="20%">'.$langs->trans('ThirdPartyName').'</td>';
-	print '<td colspan="3">';
-	print $form->showrefnav($societe,'socid','',($user->societe_id?0:1),'rowid','nom');
-	print '</td></tr>';
+    print '<tr><td width="20%">'.$langs->trans('ThirdPartyName').'</td>';
+    print '<td colspan="3">';
+    print $form->showrefnav($societe,'socid','',($user->societe_id?0:1),'rowid','nom');
+    print '</td></tr>';
 
     if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
     {
@@ -113,32 +113,36 @@ if ($socid > 0)
         print '</td></tr>';
     }
 
-	print '<tr><td valign="top">'.$langs->trans("Note").'</td>';
-	print '<td valign="top">';
-	if ($action == 'edit' && $user->rights->societe->creer)
-	{
-		print "<input type=\"hidden\" name=\"action\" value=\"add\">";
-		print "<input type=\"hidden\" name=\"socid\" value=\"".$societe->id."\">";
+    print '<tr><td valign="top">'.$langs->trans("Note").'</td>';
+    print '<td valign="top">';
+    if ($action == 'edit' && $user->rights->societe->creer)
+    {
+        print "<input type=\"hidden\" name=\"action\" value=\"add\">";
+        print "<input type=\"hidden\" name=\"socid\" value=\"".$societe->id."\">";
 
-	    // Editeur wysiwyg
-		require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-		$doleditor=new DolEditor('note',$societe->note,'',360,'dolibarr_notes','In',true,false,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE,20,70);
-		$doleditor->Create();
-	}
-	else
-	{
-		print dol_textishtml($societe->note)?$societe->note:dol_nl2br($societe->note,1,true);
-	}
-	print "</td></tr>";
+        // Editeur wysiwyg
+        require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
+        $doleditor=new DolEditor('note',$societe->note,'',360,'dolibarr_notes','In',true,false,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE,20,70);
+        $doleditor->Create();
+    }
+    else
+    {
+        print dol_textishtml($societe->note)?$societe->note:dol_nl2br($societe->note,1,true);
+    }
+    print "</td></tr>";
 
-	if ($action == 'edit')
-	{
-		print '<tr><td colspan="2" align="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></td></tr>';
-	}
+    if ($action == 'edit')
+    {
+        print '<tr><td colspan="2" align="center">';
+        print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+        print ' &nbsp; ';
+        print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+        print '</td></tr>';
+    }
 
-	print "</table>";
+    print "</table>";
 
-	print '</form>';
+    print '</form>';
 }
 
 print '</div>';
@@ -163,5 +167,5 @@ if ($action != 'edit')
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/13 16:24:57 $ - $Revision: 1.22 $');
 ?>

From d01a8f22bd9bfa68e3d00f9628c8ecd4a18ccdce Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 18:30:29 +0000
Subject: [PATCH 73/91] Trans

---
 htdocs/langs/fr_FR/categories.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index 092becf4c98..484cc8ce9a3 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -42,7 +42,7 @@ ErrCatAlreadyExists=Ce nom est déjà utilisé
 AddProductToCat=Ajouter ce produit à une catégorie ?
 ImpossibleAddCat=Impossible d'ajouter la catégorie
 ImpossibleAssociateCategory=Impossible d'associer la catégorie
-WasAddedSuccessfully=<b>%s</b> a été ajoutée avec succès.
+WasAddedSuccessfully=<b>%s</b> a été ajouté avec succès.
 ObjectAlreadyLinkedToCategory=L'élément est déjà lié à cette catégorie.
 CategorySuccessfullyCreated=La catégorie %s a été ajouté avec succès.
 ProductIsInCategories=Ce produit/service est dans les catégories suivantes

From cf184ec351427f88e347520ca15b5e64c62ecebc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 15:25:21 +0000
Subject: [PATCH 74/91] Doc

---
 htdocs/core/class/commonobject.class.php      | 10 +--
 htdocs/core/class/conf.class.php              |  6 +-
 htdocs/core/class/html.formmail.class.php     | 26 +++---
 .../interface_modAgenda_ActionsAuto.class.php | 14 +--
 htdocs/langs/fr_FR/categories.lang            |  2 +-
 htdocs/paypal/lib/paypal.lib.php              | 34 ++++----
 htdocs/societe/socnote.php                    | 86 +++++++++----------
 7 files changed, 83 insertions(+), 95 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index a6c93758797..e9ae1ea7e05 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -22,7 +22,7 @@
  *	\file       htdocs/core/class/commonobject.class.php
  *	\ingroup    core
  *	\brief      File of parent class of all other business classes (invoices, contracts, proposals, orders, ...)
- *	\version    $Id: commonobject.class.php,v 1.146 2011/07/13 16:55:25 eldy Exp $
+ *	\version    $Id: commonobject.class.php,v 1.145 2011/07/10 16:50:40 eldy Exp $
  */
 
 
@@ -365,10 +365,9 @@ class CommonObject
 	 *      Return array with list of possible values for type of contacts
 	 *      @param      source      internal, external or all if not defined
 	 *      @param		order		Sort order by : code or rowid
-	 *      @param      option      0=Return array id->label, 1=Return array code->label
-	 *      @return     array       Array list of type of contacts (id->label if option=0, code->label if option=1)
+	 *      @return     array       List of type of contacts
 	 */
-	function liste_type_contact($source='internal', $order='code', $option=0)
+	function liste_type_contact($source='internal', $order='code')
 	{
 		global $langs;
 
@@ -391,8 +390,7 @@ class CommonObject
 
 				$transkey="TypeContact_".$this->element."_".$source."_".$obj->code;
 				$libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle);
-				if (empty($option)) $tab[$obj->rowid]=$libelle_type;
-				else $tab[$obj->code]=$libelle_type;
+				$tab[$obj->rowid]=$libelle_type;
 				$i++;
 			}
 			return $tab;
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index bd15e21b0ab..e9e0a507b7e 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -25,7 +25,7 @@
  *	\ingroup		core
  *  \brief      	Fichier de la classe de stockage de la config courante
  *  \remarks		La config est stockee dans le fichier conf/conf.php
- *  \version    	$Id: conf.class.php,v 1.61 2011/07/13 18:04:25 eldy Exp $
+ *  \version    	$Id: conf.class.php,v 1.60 2011/07/09 05:28:42 hregis Exp $
  */
 
 
@@ -145,13 +145,13 @@ class Conf
 						elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg))
 						{
 							$modulename = strtolower($reg[1]);
-							$this->triggers_modules[] = '/'.$modulename.'/inc/triggers/';    // TODO Replace inc by includes to have same path than standard
+							$this->triggers_modules[] = '/'.$modulename.'/inc/triggers/';
 						}
 						// If this is constant for login method activated by a module
 						elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg))
 						{
 							$modulename = strtolower($reg[1]);
-							$this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/'; // TODO Replace inc by includes to have same path than standard
+							$this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/';
 						}
 						// If this is constant for hook activated by a module. Value is list of hooked tabs separated with :
 						elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg))
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 6ca8f1e007f..3164f86d8e1 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -22,7 +22,7 @@
  *       \file       htdocs/core/class/html.formmail.class.php
  *       \ingroup    core
  *       \brief      Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire
- *       \version    $Id: html.formmail.class.php,v 1.32 2011/07/13 16:55:25 eldy Exp $
+ *       \version    $Id: html.formmail.class.php,v 1.31 2011/07/10 20:03:41 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT ."/core/class/html.form.class.php");
 
@@ -519,7 +519,7 @@ class FormMail
                 foreach($listofpaths as $key => $val)
                 {
                     $out.= '<div id="attachfile_'.$key.'">';
-                    $out.= img_mime($listofnames[$key]).' '.$listofnames[$key];
+                	$out.= img_mime($listofnames[$key]).' '.$listofnames[$key];
                     if (! $this->withfilereadonly)
                     {
                         $out.= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key+1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
@@ -547,15 +547,15 @@ class FormMail
             $defaultmessage="";
 
             // TODO    A partir du type, proposer liste de messages dans table llx_models
-            if     ($this->param["models"]=='facture_send')	            { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoice"); }
-            elseif ($this->param["models"]=='facture_relance')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
-            elseif ($this->param["models"]=='propal_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendProposal"); }
-            elseif ($this->param["models"]=='order_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrder"); }
-            elseif ($this->param["models"]=='order_supplier_send')		{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierOrder"); }
-            elseif ($this->param["models"]=='invoice_supplier_send')	{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
-            elseif ($this->param["models"]=='shipping_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendShipping"); }
-            elseif ($this->param["models"]=='fichinter_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendFichInter"); }
-            elseif (! is_numeric($this->withbody))                      { $defaultmessage=$this->withbody; }
+            if ($this->param["models"]=='body')						{ $defaultmessage=$this->withbody; }
+            if ($this->param["models"]=='facture_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoice"); }
+            if ($this->param["models"]=='facture_relance')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
+            if ($this->param["models"]=='propal_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendProposal"); }
+            if ($this->param["models"]=='order_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrder"); }
+            if ($this->param["models"]=='order_supplier_send')		{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierOrder"); }
+            if ($this->param["models"]=='invoice_supplier_send')	{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
+            if ($this->param["models"]=='shipping_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendShipping"); }
+			if ($this->param["models"]=='fichinter_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendFichInter"); }
 
             if ($conf->paypal->enabled && $conf->global->PAYPAL_ADD_PAYMENT_URL)
             {
@@ -565,12 +565,12 @@ class FormMail
 
                 if ($this->param["models"]=='order_send')
                 {
-                    $url=getPaypalPaymentUrl('order',$this->substit['__ORDERREF__']);
+                    $url=getPaymentUrl('order',$this->substit['__ORDERREF__']);
                     $defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrderWithPaypalLink",$url);
                 }
                 if ($this->param["models"]=='facture_send')
                 {
-                    $url=getPaypalPaymentUrl('invoice',$this->substit['__FACREF__']);
+                    $url=getPaymentUrl('invoice',$this->substit['__FACREF__']);
                     $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoiceWithPaypalLink",$url);
                 }
             }
diff --git a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php b/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
index e2987f224ee..2ff7b4003b3 100644
--- a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
+++ b/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
@@ -22,7 +22,7 @@
  *	\file       htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
  *  \ingroup    agenda
  *  \brief      Trigger file for agenda module
- *	\version	$Id: interface_modAgenda_ActionsAuto.class.php,v 1.34 2011/07/13 18:05:27 eldy Exp $
+ *	\version	$Id: interface_modAgenda_ActionsAuto.class.php,v 1.33 2011/07/07 09:18:27 simnandez Exp $
  */
 
 
@@ -550,14 +550,8 @@ class InterfaceActionsAuto
         {
 			$now=dol_now();
 
-            require_once(DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php');
-            require_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php');
-			$contactforaction=new Contact($this->db);
-            $societeforaction=new Societe($this->db);
-            if ($object->sendtoid > 0) $contactforaction->fetch($object->sendtoid);
-            if ($object->socid > 0)    $societeforaction->fetch($object->socid);
-
 			// Insertion action
+			require_once(DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php');
 			require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php');
 			$actioncomm = new ActionComm($this->db);
 			$actioncomm->type_code   = $object->actiontypecode;
@@ -568,8 +562,8 @@ class InterfaceActionsAuto
 			$actioncomm->durationp   = 0;
 			$actioncomm->punctual    = 1;
 			$actioncomm->percentage  = -1;   // Not applicable
-			$actioncomm->contact     = $contactforaction;
-			$actioncomm->societe     = $societeforaction;
+			$actioncomm->contact     = new Contact($this->db,$object->sendtoid);
+			$actioncomm->societe     = new Societe($this->db,$object->socid);
 			$actioncomm->author      = $user;   // User saving action
 			//$actioncomm->usertodo  = $user;	// User affected to action
 			$actioncomm->userdone    = $user;	// User doing action
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index 484cc8ce9a3..092becf4c98 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -42,7 +42,7 @@ ErrCatAlreadyExists=Ce nom est déjà utilisé
 AddProductToCat=Ajouter ce produit à une catégorie ?
 ImpossibleAddCat=Impossible d'ajouter la catégorie
 ImpossibleAssociateCategory=Impossible d'associer la catégorie
-WasAddedSuccessfully=<b>%s</b> a été ajouté avec succès.
+WasAddedSuccessfully=<b>%s</b> a été ajoutée avec succès.
 ObjectAlreadyLinkedToCategory=L'élément est déjà lié à cette catégorie.
 CategorySuccessfullyCreated=La catégorie %s a été ajouté avec succès.
 ProductIsInCategories=Ce produit/service est dans les catégories suivantes
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index 82ec9a15c2e..0e846c9e9a7 100755
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -22,7 +22,7 @@
  *	\file			htdocs/paypal/lib/paypal.lib.php
  *  \ingroup		paypal
  *  \brief			Library for common paypal functions
- *  \version		$Id: paypal.lib.php,v 1.25 2011/07/13 16:55:34 eldy Exp $
+ *  \version		$Id$
  */
 function llxHeaderPaypal($title, $head = "")
 {
@@ -132,7 +132,7 @@ function html_print_paypal_footer($fromcompany,$langs)
 function paypaladmin_prepare_head()
 {
 	global $langs, $conf;
-
+	
 	$h = 0;
 	$head = array();
 
@@ -140,7 +140,7 @@ function paypaladmin_prepare_head()
 	$head[$h][1] = $langs->trans("Account");
 	$head[$h][2] = 'paypalaccount';
 	$h++;
-
+    
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
@@ -151,24 +151,24 @@ function paypaladmin_prepare_head()
 }
 
 /**
- *
+ * 
  */
-function getPaypalPaymentUrl($source='',$ref='',$amount=0,$freetag='')
+function getPaymentUrl($source='',$ref='',$amount=0,$freetag='')
 {
 	global $conf;
-
+	
 	require_once(DOL_DOCUMENT_ROOT."/lib/security.lib.php");
-
+	
 	if (! empty($source) && ! empty($ref))
 	{
 		$token='';
 		if (! empty($conf->global->PAYPAL_SECURITY_TOKEN)) $token='&securekey='.dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$source.$ref, 2);
-
+		
 		if ($source == 'commande')	$source = 'order';
 		if ($source == 'facture')	$source = 'invoice';
-
+		
 		$url = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source='.$source.'&ref='.$ref.$token;
-
+		
 		return $url;
 	}
 }
@@ -482,7 +482,7 @@ function hash_call($methodName,$nvpStr)
     global $conf, $langs;
     global $API_Endpoint, $API_Url, $API_version, $USE_PROXY, $PROXY_HOST, $PROXY_PORT, $PROXY_USER, $PROXY_PASS;
     global $PAYPAL_API_USER, $PAYPAL_API_PASSWORD, $PAYPAL_API_SIGNATURE;
-
+    
     // TODO problem with triggers
     $API_version="56";
 	if ($conf->global->PAYPAL_API_SANDBOX)
@@ -495,7 +495,7 @@ function hash_call($methodName,$nvpStr)
 	    $API_Endpoint = "https://api-3t.paypal.com/nvp";
 	    $API_Url = "https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=";
 	}
-
+	
 	// Clean parameters
 	$PAYPAL_API_USER="";
 	if ($conf->global->PAYPAL_API_USER) $PAYPAL_API_USER=$conf->global->PAYPAL_API_USER;
@@ -506,7 +506,7 @@ function hash_call($methodName,$nvpStr)
 	$PAYPAL_API_SANDBOX="";
 	if ($conf->global->PAYPAL_API_SANDBOX) $PAYPAL_API_SANDBOX=$conf->global->PAYPAL_API_SANDBOX;
 	// TODO END problem with triggers
-
+	
     dol_syslog("Paypal API endpoint ".$API_Endpoint);
 
     //setting the curl parameters.
@@ -580,19 +580,19 @@ function hash_call($methodName,$nvpStr)
 function GetApiError()
 {
 	$errors=array();
-
+	
 	$resArray=$_SESSION['reshash'];
-
+	
 	if(isset($_SESSION['curl_error_no']))
 	{
 		$errors[] = $_SESSION['curl_error_no'].'-'.$_SESSION['curl_error_msg'];
 	}
-
+	
 	foreach($resArray as $key => $value)
 	{
 		$errors[] = $key.'-'.$value;
 	}
-
+	
 	return $errors;
 }
 
diff --git a/htdocs/societe/socnote.php b/htdocs/societe/socnote.php
index e0a849af112..6385d48e759 100644
--- a/htdocs/societe/socnote.php
+++ b/htdocs/societe/socnote.php
@@ -23,7 +23,7 @@
  *   \file       htdocs/societe/socnote.php
  *   \brief      Tab for notes on third party
  *   \ingroup    societe
- *   \version    $Id: socnote.php,v 1.22 2011/07/13 16:24:57 eldy Exp $
+ *   \version    $Id$
  */
 
 require("../main.inc.php");
@@ -44,13 +44,13 @@ $result = restrictedArea($user, 'societe', $socid);
  * Actions
  */
 
-if ($action == 'add' && ! GETPOST('cancel'))
+if ($action == 'add')
 {
-    $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='".$db->escape($_POST["note"])."' WHERE rowid=".$_POST["socid"];
-    $result = $db->query($sql);
+  $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='".$db->escape($_POST["note"])."' WHERE rowid=".$_POST["socid"];
+  $result = $db->query($sql);
 
-    $_GET["socid"]=$_POST["socid"];   // Pour retour sur fiche
-    $socid = $_GET["socid"];
+  $_GET["socid"]=$_POST["socid"];   // Pour retour sur fiche
+  $socid = $_GET["socid"];
 }
 
 
@@ -70,25 +70,25 @@ if ($socid > 0)
     $societe = new Societe($db, $socid);
     $societe->fetch($socid);
 
-    /*
-     * Affichage onglets
-     */
+	/*
+	 * Affichage onglets
+	 */
     if ($conf->notification->enabled) $langs->load("mails");
 
-    $head = societe_prepare_head($societe);
+	$head = societe_prepare_head($societe);
 
-    dol_fiche_head($head, 'note', $langs->trans("ThirdParty"),0,'company');
+	dol_fiche_head($head, 'note', $langs->trans("ThirdParty"),0,'company');
 
 
-    print "<form method=\"post\" action=\"".DOL_URL_ROOT."/societe/socnote.php\">";
-    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print "<form method=\"post\" action=\"".DOL_URL_ROOT."/societe/socnote.php\">";
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-    print '<table class="border" width="100%">';
+	print '<table class="border" width="100%">';
 
-    print '<tr><td width="20%">'.$langs->trans('ThirdPartyName').'</td>';
-    print '<td colspan="3">';
-    print $form->showrefnav($societe,'socid','',($user->societe_id?0:1),'rowid','nom');
-    print '</td></tr>';
+	print '<tr><td width="20%">'.$langs->trans('ThirdPartyName').'</td>';
+	print '<td colspan="3">';
+	print $form->showrefnav($societe,'socid','',($user->societe_id?0:1),'rowid','nom');
+	print '</td></tr>';
 
     if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
     {
@@ -113,36 +113,32 @@ if ($socid > 0)
         print '</td></tr>';
     }
 
-    print '<tr><td valign="top">'.$langs->trans("Note").'</td>';
-    print '<td valign="top">';
-    if ($action == 'edit' && $user->rights->societe->creer)
-    {
-        print "<input type=\"hidden\" name=\"action\" value=\"add\">";
-        print "<input type=\"hidden\" name=\"socid\" value=\"".$societe->id."\">";
+	print '<tr><td valign="top">'.$langs->trans("Note").'</td>';
+	print '<td valign="top">';
+	if ($action == 'edit' && $user->rights->societe->creer)
+	{
+		print "<input type=\"hidden\" name=\"action\" value=\"add\">";
+		print "<input type=\"hidden\" name=\"socid\" value=\"".$societe->id."\">";
 
-        // Editeur wysiwyg
-        require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-        $doleditor=new DolEditor('note',$societe->note,'',360,'dolibarr_notes','In',true,false,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE,20,70);
-        $doleditor->Create();
-    }
-    else
-    {
-        print dol_textishtml($societe->note)?$societe->note:dol_nl2br($societe->note,1,true);
-    }
-    print "</td></tr>";
+	    // Editeur wysiwyg
+		require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
+		$doleditor=new DolEditor('note',$societe->note,'',360,'dolibarr_notes','In',true,false,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE,20,70);
+		$doleditor->Create();
+	}
+	else
+	{
+		print dol_textishtml($societe->note)?$societe->note:dol_nl2br($societe->note,1,true);
+	}
+	print "</td></tr>";
 
-    if ($action == 'edit')
-    {
-        print '<tr><td colspan="2" align="center">';
-        print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-        print ' &nbsp; ';
-        print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-        print '</td></tr>';
-    }
+	if ($action == 'edit')
+	{
+		print '<tr><td colspan="2" align="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></td></tr>';
+	}
 
-    print "</table>";
+	print "</table>";
 
-    print '</form>';
+	print '</form>';
 }
 
 print '</div>';
@@ -167,5 +163,5 @@ if ($action != 'edit')
 
 $db->close();
 
-llxFooter('$Date: 2011/07/13 16:24:57 $ - $Revision: 1.22 $');
+llxFooter('$Date$ - $Revision$');
 ?>

From adbff7bc5072743576d10f2c50b3b84715e4588d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 16:24:57 +0000
Subject: [PATCH 75/91] New: Add cancel button on note edit

---
 htdocs/societe/socnote.php | 86 ++++++++++++++++++++------------------
 1 file changed, 45 insertions(+), 41 deletions(-)

diff --git a/htdocs/societe/socnote.php b/htdocs/societe/socnote.php
index 6385d48e759..e0a849af112 100644
--- a/htdocs/societe/socnote.php
+++ b/htdocs/societe/socnote.php
@@ -23,7 +23,7 @@
  *   \file       htdocs/societe/socnote.php
  *   \brief      Tab for notes on third party
  *   \ingroup    societe
- *   \version    $Id$
+ *   \version    $Id: socnote.php,v 1.22 2011/07/13 16:24:57 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -44,13 +44,13 @@ $result = restrictedArea($user, 'societe', $socid);
  * Actions
  */
 
-if ($action == 'add')
+if ($action == 'add' && ! GETPOST('cancel'))
 {
-  $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='".$db->escape($_POST["note"])."' WHERE rowid=".$_POST["socid"];
-  $result = $db->query($sql);
+    $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='".$db->escape($_POST["note"])."' WHERE rowid=".$_POST["socid"];
+    $result = $db->query($sql);
 
-  $_GET["socid"]=$_POST["socid"];   // Pour retour sur fiche
-  $socid = $_GET["socid"];
+    $_GET["socid"]=$_POST["socid"];   // Pour retour sur fiche
+    $socid = $_GET["socid"];
 }
 
 
@@ -70,25 +70,25 @@ if ($socid > 0)
     $societe = new Societe($db, $socid);
     $societe->fetch($socid);
 
-	/*
-	 * Affichage onglets
-	 */
+    /*
+     * Affichage onglets
+     */
     if ($conf->notification->enabled) $langs->load("mails");
 
-	$head = societe_prepare_head($societe);
+    $head = societe_prepare_head($societe);
 
-	dol_fiche_head($head, 'note', $langs->trans("ThirdParty"),0,'company');
+    dol_fiche_head($head, 'note', $langs->trans("ThirdParty"),0,'company');
 
 
-	print "<form method=\"post\" action=\"".DOL_URL_ROOT."/societe/socnote.php\">";
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print "<form method=\"post\" action=\"".DOL_URL_ROOT."/societe/socnote.php\">";
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-	print '<table class="border" width="100%">';
+    print '<table class="border" width="100%">';
 
-	print '<tr><td width="20%">'.$langs->trans('ThirdPartyName').'</td>';
-	print '<td colspan="3">';
-	print $form->showrefnav($societe,'socid','',($user->societe_id?0:1),'rowid','nom');
-	print '</td></tr>';
+    print '<tr><td width="20%">'.$langs->trans('ThirdPartyName').'</td>';
+    print '<td colspan="3">';
+    print $form->showrefnav($societe,'socid','',($user->societe_id?0:1),'rowid','nom');
+    print '</td></tr>';
 
     if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
     {
@@ -113,32 +113,36 @@ if ($socid > 0)
         print '</td></tr>';
     }
 
-	print '<tr><td valign="top">'.$langs->trans("Note").'</td>';
-	print '<td valign="top">';
-	if ($action == 'edit' && $user->rights->societe->creer)
-	{
-		print "<input type=\"hidden\" name=\"action\" value=\"add\">";
-		print "<input type=\"hidden\" name=\"socid\" value=\"".$societe->id."\">";
+    print '<tr><td valign="top">'.$langs->trans("Note").'</td>';
+    print '<td valign="top">';
+    if ($action == 'edit' && $user->rights->societe->creer)
+    {
+        print "<input type=\"hidden\" name=\"action\" value=\"add\">";
+        print "<input type=\"hidden\" name=\"socid\" value=\"".$societe->id."\">";
 
-	    // Editeur wysiwyg
-		require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-		$doleditor=new DolEditor('note',$societe->note,'',360,'dolibarr_notes','In',true,false,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE,20,70);
-		$doleditor->Create();
-	}
-	else
-	{
-		print dol_textishtml($societe->note)?$societe->note:dol_nl2br($societe->note,1,true);
-	}
-	print "</td></tr>";
+        // Editeur wysiwyg
+        require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
+        $doleditor=new DolEditor('note',$societe->note,'',360,'dolibarr_notes','In',true,false,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE,20,70);
+        $doleditor->Create();
+    }
+    else
+    {
+        print dol_textishtml($societe->note)?$societe->note:dol_nl2br($societe->note,1,true);
+    }
+    print "</td></tr>";
 
-	if ($action == 'edit')
-	{
-		print '<tr><td colspan="2" align="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></td></tr>';
-	}
+    if ($action == 'edit')
+    {
+        print '<tr><td colspan="2" align="center">';
+        print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+        print ' &nbsp; ';
+        print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+        print '</td></tr>';
+    }
 
-	print "</table>";
+    print "</table>";
 
-	print '</form>';
+    print '</form>';
 }
 
 print '</div>';
@@ -163,5 +167,5 @@ if ($action != 'edit')
 
 $db->close();
 
-llxFooter('$Date$ - $Revision$');
+llxFooter('$Date: 2011/07/13 16:24:57 $ - $Revision: 1.22 $');
 ?>

From 46380c0b1845ba400ee62b859a757e6d7211a764 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 21:09:30 +0000
Subject: [PATCH 76/91] Work on 3.1.0 release

---
 build/exe/doliwamp/doliwamp.iss               | 16 ++++-----
 htdocs/core/class/commonobject.class.php      | 10 +++---
 htdocs/core/class/conf.class.php              |  6 ++--
 htdocs/core/class/html.formmail.class.php     | 26 +++++++-------
 .../interface_modAgenda_ActionsAuto.class.php | 14 +++++---
 htdocs/langs/fr_FR/categories.lang            |  2 +-
 htdocs/paypal/lib/paypal.lib.php              | 34 +++++++++----------
 7 files changed, 58 insertions(+), 50 deletions(-)

diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index f89ff75f410..c731758148d 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -10,7 +10,7 @@
 ; only the root user with no password, stop server and catch
 ; files user.MY* to put them in the Dolibarr build/exe/doliwamp/mysql directory.
 ;
-; Version: $Id$
+; Version: $Id: doliwamp.iss,v 1.82 2011/07/13 21:09:30 eldy Exp $
 ;----------------------------------------------------------------------------------------
 
 
@@ -18,12 +18,12 @@
 ; ----- Change this -----
 AppName=DoliWamp
 ; DoliWamp-x.x.x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta
-AppVerName=DoliWamp-3.1.0-alpha
+AppVerName=DoliWamp-3.1.0-beta
 ; DoliWamp-x.x x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta
-OutputBaseFilename=DoliWamp-3.1.0-alpha
+OutputBaseFilename=DoliWamp-3.1.0-beta
 ; Define full path from wich all relative path are defined
 ; You must modify this to put here your dolibarr root directory
-SourceDir=C:\Work\Data\Workspace\dolibarr
+SourceDir=C:\Mes Developpements\dolibarr
 ; ----- End of change
 ;OutputManifestFile=build\doliwampbuild.log
 AppId=doliwamp
@@ -101,10 +101,10 @@ Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversi
 ; PhpMyAdmin, Apache, Php, Mysql
 ; Put here path of Wampserver applications
 ; Value OK: apache 2.2.6, php 5.2.5 (5.2.11 fails if php_exif is on), mysql 5.0.45 or 5.1.36
-Source: "C:\Work\Applis\Wamp\apps\phpmyadmin3.2.0.1\*.*"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log"
-Source: "C:\Work\Applis\Wamp\bin\apache\apache2.2.6\*.*"; DestDir: "{app}\bin\apache\apache2.2.6"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
-Source: "C:\Work\Applis\Wamp\bin\php\php5.2.5\*.*"; DestDir: "{app}\bin\php\php5.2.5"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
-Source: "C:\Work\Applis\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
+Source: "C:\Program Files\Wamp\apps\phpmyadmin3.2.0.1\*.*"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log"
+Source: "C:\Program Files\Wamp\bin\apache\apache2.2.6\*.*"; DestDir: "{app}\bin\apache\apache2.2.6"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
+Source: "C:\Program Files\Wamp\bin\php\php5.2.5\*.*"; DestDir: "{app}\bin\php\php5.2.5"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
+Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
 ; Mysql data files (does not overwrite if exists)
 Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db"
 ; Dolibarr
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index e9ae1ea7e05..a6c93758797 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -22,7 +22,7 @@
  *	\file       htdocs/core/class/commonobject.class.php
  *	\ingroup    core
  *	\brief      File of parent class of all other business classes (invoices, contracts, proposals, orders, ...)
- *	\version    $Id: commonobject.class.php,v 1.145 2011/07/10 16:50:40 eldy Exp $
+ *	\version    $Id: commonobject.class.php,v 1.146 2011/07/13 16:55:25 eldy Exp $
  */
 
 
@@ -365,9 +365,10 @@ class CommonObject
 	 *      Return array with list of possible values for type of contacts
 	 *      @param      source      internal, external or all if not defined
 	 *      @param		order		Sort order by : code or rowid
-	 *      @return     array       List of type of contacts
+	 *      @param      option      0=Return array id->label, 1=Return array code->label
+	 *      @return     array       Array list of type of contacts (id->label if option=0, code->label if option=1)
 	 */
-	function liste_type_contact($source='internal', $order='code')
+	function liste_type_contact($source='internal', $order='code', $option=0)
 	{
 		global $langs;
 
@@ -390,7 +391,8 @@ class CommonObject
 
 				$transkey="TypeContact_".$this->element."_".$source."_".$obj->code;
 				$libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle);
-				$tab[$obj->rowid]=$libelle_type;
+				if (empty($option)) $tab[$obj->rowid]=$libelle_type;
+				else $tab[$obj->code]=$libelle_type;
 				$i++;
 			}
 			return $tab;
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index e9e0a507b7e..bd15e21b0ab 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -25,7 +25,7 @@
  *	\ingroup		core
  *  \brief      	Fichier de la classe de stockage de la config courante
  *  \remarks		La config est stockee dans le fichier conf/conf.php
- *  \version    	$Id: conf.class.php,v 1.60 2011/07/09 05:28:42 hregis Exp $
+ *  \version    	$Id: conf.class.php,v 1.61 2011/07/13 18:04:25 eldy Exp $
  */
 
 
@@ -145,13 +145,13 @@ class Conf
 						elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg))
 						{
 							$modulename = strtolower($reg[1]);
-							$this->triggers_modules[] = '/'.$modulename.'/inc/triggers/';
+							$this->triggers_modules[] = '/'.$modulename.'/inc/triggers/';    // TODO Replace inc by includes to have same path than standard
 						}
 						// If this is constant for login method activated by a module
 						elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg))
 						{
 							$modulename = strtolower($reg[1]);
-							$this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/';
+							$this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/'; // TODO Replace inc by includes to have same path than standard
 						}
 						// If this is constant for hook activated by a module. Value is list of hooked tabs separated with :
 						elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg))
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 3164f86d8e1..6ca8f1e007f 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -22,7 +22,7 @@
  *       \file       htdocs/core/class/html.formmail.class.php
  *       \ingroup    core
  *       \brief      Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire
- *       \version    $Id: html.formmail.class.php,v 1.31 2011/07/10 20:03:41 eldy Exp $
+ *       \version    $Id: html.formmail.class.php,v 1.32 2011/07/13 16:55:25 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT ."/core/class/html.form.class.php");
 
@@ -519,7 +519,7 @@ class FormMail
                 foreach($listofpaths as $key => $val)
                 {
                     $out.= '<div id="attachfile_'.$key.'">';
-                	$out.= img_mime($listofnames[$key]).' '.$listofnames[$key];
+                    $out.= img_mime($listofnames[$key]).' '.$listofnames[$key];
                     if (! $this->withfilereadonly)
                     {
                         $out.= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key+1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
@@ -547,15 +547,15 @@ class FormMail
             $defaultmessage="";
 
             // TODO    A partir du type, proposer liste de messages dans table llx_models
-            if ($this->param["models"]=='body')						{ $defaultmessage=$this->withbody; }
-            if ($this->param["models"]=='facture_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoice"); }
-            if ($this->param["models"]=='facture_relance')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
-            if ($this->param["models"]=='propal_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendProposal"); }
-            if ($this->param["models"]=='order_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrder"); }
-            if ($this->param["models"]=='order_supplier_send')		{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierOrder"); }
-            if ($this->param["models"]=='invoice_supplier_send')	{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
-            if ($this->param["models"]=='shipping_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendShipping"); }
-			if ($this->param["models"]=='fichinter_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendFichInter"); }
+            if     ($this->param["models"]=='facture_send')	            { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoice"); }
+            elseif ($this->param["models"]=='facture_relance')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
+            elseif ($this->param["models"]=='propal_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendProposal"); }
+            elseif ($this->param["models"]=='order_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrder"); }
+            elseif ($this->param["models"]=='order_supplier_send')		{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierOrder"); }
+            elseif ($this->param["models"]=='invoice_supplier_send')	{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
+            elseif ($this->param["models"]=='shipping_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendShipping"); }
+            elseif ($this->param["models"]=='fichinter_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendFichInter"); }
+            elseif (! is_numeric($this->withbody))                      { $defaultmessage=$this->withbody; }
 
             if ($conf->paypal->enabled && $conf->global->PAYPAL_ADD_PAYMENT_URL)
             {
@@ -565,12 +565,12 @@ class FormMail
 
                 if ($this->param["models"]=='order_send')
                 {
-                    $url=getPaymentUrl('order',$this->substit['__ORDERREF__']);
+                    $url=getPaypalPaymentUrl('order',$this->substit['__ORDERREF__']);
                     $defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrderWithPaypalLink",$url);
                 }
                 if ($this->param["models"]=='facture_send')
                 {
-                    $url=getPaymentUrl('invoice',$this->substit['__FACREF__']);
+                    $url=getPaypalPaymentUrl('invoice',$this->substit['__FACREF__']);
                     $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoiceWithPaypalLink",$url);
                 }
             }
diff --git a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php b/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
index 2ff7b4003b3..e2987f224ee 100644
--- a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
+++ b/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
@@ -22,7 +22,7 @@
  *	\file       htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
  *  \ingroup    agenda
  *  \brief      Trigger file for agenda module
- *	\version	$Id: interface_modAgenda_ActionsAuto.class.php,v 1.33 2011/07/07 09:18:27 simnandez Exp $
+ *	\version	$Id: interface_modAgenda_ActionsAuto.class.php,v 1.34 2011/07/13 18:05:27 eldy Exp $
  */
 
 
@@ -550,8 +550,14 @@ class InterfaceActionsAuto
         {
 			$now=dol_now();
 
+            require_once(DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php');
+            require_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php');
+			$contactforaction=new Contact($this->db);
+            $societeforaction=new Societe($this->db);
+            if ($object->sendtoid > 0) $contactforaction->fetch($object->sendtoid);
+            if ($object->socid > 0)    $societeforaction->fetch($object->socid);
+
 			// Insertion action
-			require_once(DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php');
 			require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php');
 			$actioncomm = new ActionComm($this->db);
 			$actioncomm->type_code   = $object->actiontypecode;
@@ -562,8 +568,8 @@ class InterfaceActionsAuto
 			$actioncomm->durationp   = 0;
 			$actioncomm->punctual    = 1;
 			$actioncomm->percentage  = -1;   // Not applicable
-			$actioncomm->contact     = new Contact($this->db,$object->sendtoid);
-			$actioncomm->societe     = new Societe($this->db,$object->socid);
+			$actioncomm->contact     = $contactforaction;
+			$actioncomm->societe     = $societeforaction;
 			$actioncomm->author      = $user;   // User saving action
 			//$actioncomm->usertodo  = $user;	// User affected to action
 			$actioncomm->userdone    = $user;	// User doing action
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index 092becf4c98..484cc8ce9a3 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -42,7 +42,7 @@ ErrCatAlreadyExists=Ce nom est déjà utilisé
 AddProductToCat=Ajouter ce produit à une catégorie ?
 ImpossibleAddCat=Impossible d'ajouter la catégorie
 ImpossibleAssociateCategory=Impossible d'associer la catégorie
-WasAddedSuccessfully=<b>%s</b> a été ajoutée avec succès.
+WasAddedSuccessfully=<b>%s</b> a été ajouté avec succès.
 ObjectAlreadyLinkedToCategory=L'élément est déjà lié à cette catégorie.
 CategorySuccessfullyCreated=La catégorie %s a été ajouté avec succès.
 ProductIsInCategories=Ce produit/service est dans les catégories suivantes
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index 0e846c9e9a7..82ec9a15c2e 100755
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -22,7 +22,7 @@
  *	\file			htdocs/paypal/lib/paypal.lib.php
  *  \ingroup		paypal
  *  \brief			Library for common paypal functions
- *  \version		$Id$
+ *  \version		$Id: paypal.lib.php,v 1.25 2011/07/13 16:55:34 eldy Exp $
  */
 function llxHeaderPaypal($title, $head = "")
 {
@@ -132,7 +132,7 @@ function html_print_paypal_footer($fromcompany,$langs)
 function paypaladmin_prepare_head()
 {
 	global $langs, $conf;
-	
+
 	$h = 0;
 	$head = array();
 
@@ -140,7 +140,7 @@ function paypaladmin_prepare_head()
 	$head[$h][1] = $langs->trans("Account");
 	$head[$h][2] = 'paypalaccount';
 	$h++;
-    
+
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
@@ -151,24 +151,24 @@ function paypaladmin_prepare_head()
 }
 
 /**
- * 
+ *
  */
-function getPaymentUrl($source='',$ref='',$amount=0,$freetag='')
+function getPaypalPaymentUrl($source='',$ref='',$amount=0,$freetag='')
 {
 	global $conf;
-	
+
 	require_once(DOL_DOCUMENT_ROOT."/lib/security.lib.php");
-	
+
 	if (! empty($source) && ! empty($ref))
 	{
 		$token='';
 		if (! empty($conf->global->PAYPAL_SECURITY_TOKEN)) $token='&securekey='.dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$source.$ref, 2);
-		
+
 		if ($source == 'commande')	$source = 'order';
 		if ($source == 'facture')	$source = 'invoice';
-		
+
 		$url = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source='.$source.'&ref='.$ref.$token;
-		
+
 		return $url;
 	}
 }
@@ -482,7 +482,7 @@ function hash_call($methodName,$nvpStr)
     global $conf, $langs;
     global $API_Endpoint, $API_Url, $API_version, $USE_PROXY, $PROXY_HOST, $PROXY_PORT, $PROXY_USER, $PROXY_PASS;
     global $PAYPAL_API_USER, $PAYPAL_API_PASSWORD, $PAYPAL_API_SIGNATURE;
-    
+
     // TODO problem with triggers
     $API_version="56";
 	if ($conf->global->PAYPAL_API_SANDBOX)
@@ -495,7 +495,7 @@ function hash_call($methodName,$nvpStr)
 	    $API_Endpoint = "https://api-3t.paypal.com/nvp";
 	    $API_Url = "https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=";
 	}
-	
+
 	// Clean parameters
 	$PAYPAL_API_USER="";
 	if ($conf->global->PAYPAL_API_USER) $PAYPAL_API_USER=$conf->global->PAYPAL_API_USER;
@@ -506,7 +506,7 @@ function hash_call($methodName,$nvpStr)
 	$PAYPAL_API_SANDBOX="";
 	if ($conf->global->PAYPAL_API_SANDBOX) $PAYPAL_API_SANDBOX=$conf->global->PAYPAL_API_SANDBOX;
 	// TODO END problem with triggers
-	
+
     dol_syslog("Paypal API endpoint ".$API_Endpoint);
 
     //setting the curl parameters.
@@ -580,19 +580,19 @@ function hash_call($methodName,$nvpStr)
 function GetApiError()
 {
 	$errors=array();
-	
+
 	$resArray=$_SESSION['reshash'];
-	
+
 	if(isset($_SESSION['curl_error_no']))
 	{
 		$errors[] = $_SESSION['curl_error_no'].'-'.$_SESSION['curl_error_msg'];
 	}
-	
+
 	foreach($resArray as $key => $value)
 	{
 		$errors[] = $key.'-'.$value;
 	}
-	
+
 	return $errors;
 }
 

From 17cdbd2ea664078530244f3d28c8c35fbe44099f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 21:19:58 +0000
Subject: [PATCH 77/91] Prepare 3.1 beta

---
 htdocs/filefunc.inc.php | 4 ++--
 htdocs/install/inc.php  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 54a53fc9175..4e96c341f34 100755
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -28,10 +28,10 @@
  *	\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.17 2011/06/28 12:25:43 hregis Exp $
+ *  \version    $Id: filefunc.inc.php,v 1.18 2011/07/13 21:19:58 eldy Exp $
  */
 
-define('DOL_VERSION','3.1.0-alpha');	// Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
+define('DOL_VERSION','3.1.0-beta');	// Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
 define('EURO',chr(128));
 
 // Definition des constantes syslog
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 1fd1774d185..bb49200a208 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -22,10 +22,10 @@
 /**	    \file       htdocs/install/inc.php
  * 		\ingroup	core
  *		\brief      File that define environment for install pages
- *		\version    $Id: inc.php,v 1.134 2011/07/11 10:53:37 eldy Exp $
+ *		\version    $Id: inc.php,v 1.135 2011/07/13 21:19:58 eldy Exp $
  */
 
-define('DOL_VERSION','3.1.0-alpha');	// Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z)
+define('DOL_VERSION','3.1.0-beta');	// Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z)
 
 require_once('../core/class/translate.class.php');
 require_once('../lib/functions.lib.php');

From 7f81e029ab5f44e4f98c680cf5fbeac133e8e876 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 16:55:25 +0000
Subject: [PATCH 78/91] Fix: Avoid conflict with other payment modules
 functions New: EMail topics can be forced by external modules

---
 build/exe/doliwamp/doliwamp.iss                  | 16 ++++++++--------
 htdocs/core/class/conf.class.php                 |  6 +++---
 htdocs/filefunc.inc.php                          |  4 ++--
 .../interface_modAgenda_ActionsAuto.class.php    | 14 ++++----------
 htdocs/install/inc.php                           |  4 ++--
 htdocs/langs/fr_FR/categories.lang               |  2 +-
 6 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index c731758148d..f89ff75f410 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -10,7 +10,7 @@
 ; only the root user with no password, stop server and catch
 ; files user.MY* to put them in the Dolibarr build/exe/doliwamp/mysql directory.
 ;
-; Version: $Id: doliwamp.iss,v 1.82 2011/07/13 21:09:30 eldy Exp $
+; Version: $Id$
 ;----------------------------------------------------------------------------------------
 
 
@@ -18,12 +18,12 @@
 ; ----- Change this -----
 AppName=DoliWamp
 ; DoliWamp-x.x.x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta
-AppVerName=DoliWamp-3.1.0-beta
+AppVerName=DoliWamp-3.1.0-alpha
 ; DoliWamp-x.x x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta
-OutputBaseFilename=DoliWamp-3.1.0-beta
+OutputBaseFilename=DoliWamp-3.1.0-alpha
 ; Define full path from wich all relative path are defined
 ; You must modify this to put here your dolibarr root directory
-SourceDir=C:\Mes Developpements\dolibarr
+SourceDir=C:\Work\Data\Workspace\dolibarr
 ; ----- End of change
 ;OutputManifestFile=build\doliwampbuild.log
 AppId=doliwamp
@@ -101,10 +101,10 @@ Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversi
 ; PhpMyAdmin, Apache, Php, Mysql
 ; Put here path of Wampserver applications
 ; Value OK: apache 2.2.6, php 5.2.5 (5.2.11 fails if php_exif is on), mysql 5.0.45 or 5.1.36
-Source: "C:\Program Files\Wamp\apps\phpmyadmin3.2.0.1\*.*"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log"
-Source: "C:\Program Files\Wamp\bin\apache\apache2.2.6\*.*"; DestDir: "{app}\bin\apache\apache2.2.6"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
-Source: "C:\Program Files\Wamp\bin\php\php5.2.5\*.*"; DestDir: "{app}\bin\php\php5.2.5"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
-Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
+Source: "C:\Work\Applis\Wamp\apps\phpmyadmin3.2.0.1\*.*"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log"
+Source: "C:\Work\Applis\Wamp\bin\apache\apache2.2.6\*.*"; DestDir: "{app}\bin\apache\apache2.2.6"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
+Source: "C:\Work\Applis\Wamp\bin\php\php5.2.5\*.*"; DestDir: "{app}\bin\php\php5.2.5"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
+Source: "C:\Work\Applis\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
 ; Mysql data files (does not overwrite if exists)
 Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db"
 ; Dolibarr
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index bd15e21b0ab..e9e0a507b7e 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -25,7 +25,7 @@
  *	\ingroup		core
  *  \brief      	Fichier de la classe de stockage de la config courante
  *  \remarks		La config est stockee dans le fichier conf/conf.php
- *  \version    	$Id: conf.class.php,v 1.61 2011/07/13 18:04:25 eldy Exp $
+ *  \version    	$Id: conf.class.php,v 1.60 2011/07/09 05:28:42 hregis Exp $
  */
 
 
@@ -145,13 +145,13 @@ class Conf
 						elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg))
 						{
 							$modulename = strtolower($reg[1]);
-							$this->triggers_modules[] = '/'.$modulename.'/inc/triggers/';    // TODO Replace inc by includes to have same path than standard
+							$this->triggers_modules[] = '/'.$modulename.'/inc/triggers/';
 						}
 						// If this is constant for login method activated by a module
 						elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg))
 						{
 							$modulename = strtolower($reg[1]);
-							$this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/'; // TODO Replace inc by includes to have same path than standard
+							$this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/';
 						}
 						// If this is constant for hook activated by a module. Value is list of hooked tabs separated with :
 						elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg))
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 4e96c341f34..54a53fc9175 100755
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -28,10 +28,10 @@
  *	\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.18 2011/07/13 21:19:58 eldy Exp $
+ *  \version    $Id: filefunc.inc.php,v 1.17 2011/06/28 12:25:43 hregis Exp $
  */
 
-define('DOL_VERSION','3.1.0-beta');	// Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
+define('DOL_VERSION','3.1.0-alpha');	// Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
 define('EURO',chr(128));
 
 // Definition des constantes syslog
diff --git a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php b/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
index e2987f224ee..2ff7b4003b3 100644
--- a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
+++ b/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
@@ -22,7 +22,7 @@
  *	\file       htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
  *  \ingroup    agenda
  *  \brief      Trigger file for agenda module
- *	\version	$Id: interface_modAgenda_ActionsAuto.class.php,v 1.34 2011/07/13 18:05:27 eldy Exp $
+ *	\version	$Id: interface_modAgenda_ActionsAuto.class.php,v 1.33 2011/07/07 09:18:27 simnandez Exp $
  */
 
 
@@ -550,14 +550,8 @@ class InterfaceActionsAuto
         {
 			$now=dol_now();
 
-            require_once(DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php');
-            require_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php');
-			$contactforaction=new Contact($this->db);
-            $societeforaction=new Societe($this->db);
-            if ($object->sendtoid > 0) $contactforaction->fetch($object->sendtoid);
-            if ($object->socid > 0)    $societeforaction->fetch($object->socid);
-
 			// Insertion action
+			require_once(DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php');
 			require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php');
 			$actioncomm = new ActionComm($this->db);
 			$actioncomm->type_code   = $object->actiontypecode;
@@ -568,8 +562,8 @@ class InterfaceActionsAuto
 			$actioncomm->durationp   = 0;
 			$actioncomm->punctual    = 1;
 			$actioncomm->percentage  = -1;   // Not applicable
-			$actioncomm->contact     = $contactforaction;
-			$actioncomm->societe     = $societeforaction;
+			$actioncomm->contact     = new Contact($this->db,$object->sendtoid);
+			$actioncomm->societe     = new Societe($this->db,$object->socid);
 			$actioncomm->author      = $user;   // User saving action
 			//$actioncomm->usertodo  = $user;	// User affected to action
 			$actioncomm->userdone    = $user;	// User doing action
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index bb49200a208..1fd1774d185 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -22,10 +22,10 @@
 /**	    \file       htdocs/install/inc.php
  * 		\ingroup	core
  *		\brief      File that define environment for install pages
- *		\version    $Id: inc.php,v 1.135 2011/07/13 21:19:58 eldy Exp $
+ *		\version    $Id: inc.php,v 1.134 2011/07/11 10:53:37 eldy Exp $
  */
 
-define('DOL_VERSION','3.1.0-beta');	// Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z)
+define('DOL_VERSION','3.1.0-alpha');	// Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z)
 
 require_once('../core/class/translate.class.php');
 require_once('../lib/functions.lib.php');
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index 484cc8ce9a3..092becf4c98 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -42,7 +42,7 @@ ErrCatAlreadyExists=Ce nom est déjà utilisé
 AddProductToCat=Ajouter ce produit à une catégorie ?
 ImpossibleAddCat=Impossible d'ajouter la catégorie
 ImpossibleAssociateCategory=Impossible d'associer la catégorie
-WasAddedSuccessfully=<b>%s</b> a été ajouté avec succès.
+WasAddedSuccessfully=<b>%s</b> a été ajoutée avec succès.
 ObjectAlreadyLinkedToCategory=L'élément est déjà lié à cette catégorie.
 CategorySuccessfullyCreated=La catégorie %s a été ajouté avec succès.
 ProductIsInCategories=Ce produit/service est dans les catégories suivantes

From 19904fba77db9e94dab6eeb8b815bc26e03b66e0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 18:04:25 +0000
Subject: [PATCH 79/91] Comment TODO

---
 htdocs/core/class/conf.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index e9e0a507b7e..bd15e21b0ab 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -25,7 +25,7 @@
  *	\ingroup		core
  *  \brief      	Fichier de la classe de stockage de la config courante
  *  \remarks		La config est stockee dans le fichier conf/conf.php
- *  \version    	$Id: conf.class.php,v 1.60 2011/07/09 05:28:42 hregis Exp $
+ *  \version    	$Id: conf.class.php,v 1.61 2011/07/13 18:04:25 eldy Exp $
  */
 
 
@@ -145,13 +145,13 @@ class Conf
 						elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg))
 						{
 							$modulename = strtolower($reg[1]);
-							$this->triggers_modules[] = '/'.$modulename.'/inc/triggers/';
+							$this->triggers_modules[] = '/'.$modulename.'/inc/triggers/';    // TODO Replace inc by includes to have same path than standard
 						}
 						// If this is constant for login method activated by a module
 						elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg))
 						{
 							$modulename = strtolower($reg[1]);
-							$this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/';
+							$this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/'; // TODO Replace inc by includes to have same path than standard
 						}
 						// If this is constant for hook activated by a module. Value is list of hooked tabs separated with :
 						elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg))

From fe3f8609536bac17566ab9dbeef6d0fd5df0bdec Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 21:33:38 +0000
Subject: [PATCH 80/91] Fix: Object should never be a global variable as there
 is several object in a context. Also object type must be fixed for each
 "trigger code". So we add trigger code and object on parameter because only
 caller of a function know which object type we use and what trigger code we
 want to trigger.

---
 build/exe/doliwamp/doliwamp.iss                  | 16 ++++++++--------
 htdocs/filefunc.inc.php                          |  4 ++--
 .../interface_modAgenda_ActionsAuto.class.php    | 14 ++++++++++----
 htdocs/install/inc.php                           |  4 ++--
 htdocs/langs/fr_FR/categories.lang               |  2 +-
 htdocs/lib/files.lib.php                         | 12 +++++++-----
 6 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index f89ff75f410..c731758148d 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -10,7 +10,7 @@
 ; only the root user with no password, stop server and catch
 ; files user.MY* to put them in the Dolibarr build/exe/doliwamp/mysql directory.
 ;
-; Version: $Id$
+; Version: $Id: doliwamp.iss,v 1.82 2011/07/13 21:09:30 eldy Exp $
 ;----------------------------------------------------------------------------------------
 
 
@@ -18,12 +18,12 @@
 ; ----- Change this -----
 AppName=DoliWamp
 ; DoliWamp-x.x.x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta
-AppVerName=DoliWamp-3.1.0-alpha
+AppVerName=DoliWamp-3.1.0-beta
 ; DoliWamp-x.x x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta
-OutputBaseFilename=DoliWamp-3.1.0-alpha
+OutputBaseFilename=DoliWamp-3.1.0-beta
 ; Define full path from wich all relative path are defined
 ; You must modify this to put here your dolibarr root directory
-SourceDir=C:\Work\Data\Workspace\dolibarr
+SourceDir=C:\Mes Developpements\dolibarr
 ; ----- End of change
 ;OutputManifestFile=build\doliwampbuild.log
 AppId=doliwamp
@@ -101,10 +101,10 @@ Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversi
 ; PhpMyAdmin, Apache, Php, Mysql
 ; Put here path of Wampserver applications
 ; Value OK: apache 2.2.6, php 5.2.5 (5.2.11 fails if php_exif is on), mysql 5.0.45 or 5.1.36
-Source: "C:\Work\Applis\Wamp\apps\phpmyadmin3.2.0.1\*.*"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log"
-Source: "C:\Work\Applis\Wamp\bin\apache\apache2.2.6\*.*"; DestDir: "{app}\bin\apache\apache2.2.6"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
-Source: "C:\Work\Applis\Wamp\bin\php\php5.2.5\*.*"; DestDir: "{app}\bin\php\php5.2.5"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
-Source: "C:\Work\Applis\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
+Source: "C:\Program Files\Wamp\apps\phpmyadmin3.2.0.1\*.*"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log"
+Source: "C:\Program Files\Wamp\bin\apache\apache2.2.6\*.*"; DestDir: "{app}\bin\apache\apache2.2.6"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
+Source: "C:\Program Files\Wamp\bin\php\php5.2.5\*.*"; DestDir: "{app}\bin\php\php5.2.5"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
+Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
 ; Mysql data files (does not overwrite if exists)
 Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db"
 ; Dolibarr
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 54a53fc9175..4e96c341f34 100755
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -28,10 +28,10 @@
  *	\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.17 2011/06/28 12:25:43 hregis Exp $
+ *  \version    $Id: filefunc.inc.php,v 1.18 2011/07/13 21:19:58 eldy Exp $
  */
 
-define('DOL_VERSION','3.1.0-alpha');	// Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
+define('DOL_VERSION','3.1.0-beta');	// Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
 define('EURO',chr(128));
 
 // Definition des constantes syslog
diff --git a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php b/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
index 2ff7b4003b3..e2987f224ee 100644
--- a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
+++ b/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
@@ -22,7 +22,7 @@
  *	\file       htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
  *  \ingroup    agenda
  *  \brief      Trigger file for agenda module
- *	\version	$Id: interface_modAgenda_ActionsAuto.class.php,v 1.33 2011/07/07 09:18:27 simnandez Exp $
+ *	\version	$Id: interface_modAgenda_ActionsAuto.class.php,v 1.34 2011/07/13 18:05:27 eldy Exp $
  */
 
 
@@ -550,8 +550,14 @@ class InterfaceActionsAuto
         {
 			$now=dol_now();
 
+            require_once(DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php');
+            require_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php');
+			$contactforaction=new Contact($this->db);
+            $societeforaction=new Societe($this->db);
+            if ($object->sendtoid > 0) $contactforaction->fetch($object->sendtoid);
+            if ($object->socid > 0)    $societeforaction->fetch($object->socid);
+
 			// Insertion action
-			require_once(DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php');
 			require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php');
 			$actioncomm = new ActionComm($this->db);
 			$actioncomm->type_code   = $object->actiontypecode;
@@ -562,8 +568,8 @@ class InterfaceActionsAuto
 			$actioncomm->durationp   = 0;
 			$actioncomm->punctual    = 1;
 			$actioncomm->percentage  = -1;   // Not applicable
-			$actioncomm->contact     = new Contact($this->db,$object->sendtoid);
-			$actioncomm->societe     = new Societe($this->db,$object->socid);
+			$actioncomm->contact     = $contactforaction;
+			$actioncomm->societe     = $societeforaction;
 			$actioncomm->author      = $user;   // User saving action
 			//$actioncomm->usertodo  = $user;	// User affected to action
 			$actioncomm->userdone    = $user;	// User doing action
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 1fd1774d185..bb49200a208 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -22,10 +22,10 @@
 /**	    \file       htdocs/install/inc.php
  * 		\ingroup	core
  *		\brief      File that define environment for install pages
- *		\version    $Id: inc.php,v 1.134 2011/07/11 10:53:37 eldy Exp $
+ *		\version    $Id: inc.php,v 1.135 2011/07/13 21:19:58 eldy Exp $
  */
 
-define('DOL_VERSION','3.1.0-alpha');	// Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z)
+define('DOL_VERSION','3.1.0-beta');	// Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z)
 
 require_once('../core/class/translate.class.php');
 require_once('../lib/functions.lib.php');
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index 092becf4c98..484cc8ce9a3 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -42,7 +42,7 @@ ErrCatAlreadyExists=Ce nom est déjà utilisé
 AddProductToCat=Ajouter ce produit à une catégorie ?
 ImpossibleAddCat=Impossible d'ajouter la catégorie
 ImpossibleAssociateCategory=Impossible d'associer la catégorie
-WasAddedSuccessfully=<b>%s</b> a été ajoutée avec succès.
+WasAddedSuccessfully=<b>%s</b> a été ajouté avec succès.
 ObjectAlreadyLinkedToCategory=L'élément est déjà lié à cette catégorie.
 CategorySuccessfullyCreated=La catégorie %s a été ajouté avec succès.
 ProductIsInCategories=Ce produit/service est dans les catégories suivantes
diff --git a/htdocs/lib/files.lib.php b/htdocs/lib/files.lib.php
index 3dbbef2c6b2..5dda38dcc5c 100644
--- a/htdocs/lib/files.lib.php
+++ b/htdocs/lib/files.lib.php
@@ -20,7 +20,7 @@
 /**
  *  \file		htdocs/lib/files.lib.php
  *  \brief		Library for file managing functions
- *  \version	$Id: files.lib.php,v 1.68 2011/07/11 06:23:22 hregis Exp $
+ *  \version	$Id: files.lib.php,v 1.69 2011/07/13 21:33:38 eldy Exp $
  */
 
 /**
@@ -590,12 +590,13 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
  *  @param      disableglob     Disable usage of glob like *
  *  @param      nophperrors     Disable all PHP output errors
  *  @param		notrigger		Disable all triggers
+ *  @param      triggercode     Code of trigger
+ *  @param      object          Object for trigger
  *  @return     boolean         True if file is deleted, False if error
  */
-function dol_delete_file($file,$disableglob=0,$nophperrors=0,$notrigger=0)
+function dol_delete_file($file,$disableglob=0,$nophperrors=0,$notrigger=0,$triggercode='FILE_DELETE',$object=null)
 {
-	global $conf, $user, $langs;
-	global $object;
+	global $db, $conf, $user, $langs;
 
     //print "x".$file." ".$disableglob;
     $ok=true;
@@ -611,12 +612,13 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$notrigger=0)
             	dol_syslog("Removed file ".$filename,LOG_DEBUG);
             	if (! $notrigger)
             	{
+                    if (! is_object($object)) $object=(object) 'dummy';
             		$object->src_file=$file;
 
             		// Appel des triggers
             		include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
             		$interface=new Interfaces($db);
-            		$result=$interface->run_triggers('FILE_DELETE',$object,$user,$langs,$conf);
+            		$result=$interface->run_triggers($triggercode,$object,$user,$langs,$conf);
             		if ($result < 0) { $error++; $errors=$interface->errors; }
             		// Fin appel triggers
             	}

From eecb0227f8b1d06018be4daa606d1fcdc62e0de7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 18:05:27 +0000
Subject: [PATCH 81/91] Fix: Bad init of object on actions

---
 build/exe/doliwamp/doliwamp.iss    | 16 ++++++++--------
 htdocs/filefunc.inc.php            |  4 ++--
 htdocs/install/inc.php             |  4 ++--
 htdocs/langs/fr_FR/categories.lang |  2 +-
 htdocs/lib/files.lib.php           | 12 +++++-------
 5 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index c731758148d..f89ff75f410 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -10,7 +10,7 @@
 ; only the root user with no password, stop server and catch
 ; files user.MY* to put them in the Dolibarr build/exe/doliwamp/mysql directory.
 ;
-; Version: $Id: doliwamp.iss,v 1.82 2011/07/13 21:09:30 eldy Exp $
+; Version: $Id$
 ;----------------------------------------------------------------------------------------
 
 
@@ -18,12 +18,12 @@
 ; ----- Change this -----
 AppName=DoliWamp
 ; DoliWamp-x.x.x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta
-AppVerName=DoliWamp-3.1.0-beta
+AppVerName=DoliWamp-3.1.0-alpha
 ; DoliWamp-x.x x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta
-OutputBaseFilename=DoliWamp-3.1.0-beta
+OutputBaseFilename=DoliWamp-3.1.0-alpha
 ; Define full path from wich all relative path are defined
 ; You must modify this to put here your dolibarr root directory
-SourceDir=C:\Mes Developpements\dolibarr
+SourceDir=C:\Work\Data\Workspace\dolibarr
 ; ----- End of change
 ;OutputManifestFile=build\doliwampbuild.log
 AppId=doliwamp
@@ -101,10 +101,10 @@ Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversi
 ; PhpMyAdmin, Apache, Php, Mysql
 ; Put here path of Wampserver applications
 ; Value OK: apache 2.2.6, php 5.2.5 (5.2.11 fails if php_exif is on), mysql 5.0.45 or 5.1.36
-Source: "C:\Program Files\Wamp\apps\phpmyadmin3.2.0.1\*.*"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log"
-Source: "C:\Program Files\Wamp\bin\apache\apache2.2.6\*.*"; DestDir: "{app}\bin\apache\apache2.2.6"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
-Source: "C:\Program Files\Wamp\bin\php\php5.2.5\*.*"; DestDir: "{app}\bin\php\php5.2.5"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
-Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
+Source: "C:\Work\Applis\Wamp\apps\phpmyadmin3.2.0.1\*.*"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log"
+Source: "C:\Work\Applis\Wamp\bin\apache\apache2.2.6\*.*"; DestDir: "{app}\bin\apache\apache2.2.6"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
+Source: "C:\Work\Applis\Wamp\bin\php\php5.2.5\*.*"; DestDir: "{app}\bin\php\php5.2.5"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
+Source: "C:\Work\Applis\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
 ; Mysql data files (does not overwrite if exists)
 Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db"
 ; Dolibarr
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 4e96c341f34..54a53fc9175 100755
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -28,10 +28,10 @@
  *	\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.18 2011/07/13 21:19:58 eldy Exp $
+ *  \version    $Id: filefunc.inc.php,v 1.17 2011/06/28 12:25:43 hregis Exp $
  */
 
-define('DOL_VERSION','3.1.0-beta');	// Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
+define('DOL_VERSION','3.1.0-alpha');	// Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
 define('EURO',chr(128));
 
 // Definition des constantes syslog
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index bb49200a208..1fd1774d185 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -22,10 +22,10 @@
 /**	    \file       htdocs/install/inc.php
  * 		\ingroup	core
  *		\brief      File that define environment for install pages
- *		\version    $Id: inc.php,v 1.135 2011/07/13 21:19:58 eldy Exp $
+ *		\version    $Id: inc.php,v 1.134 2011/07/11 10:53:37 eldy Exp $
  */
 
-define('DOL_VERSION','3.1.0-beta');	// Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z)
+define('DOL_VERSION','3.1.0-alpha');	// Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z)
 
 require_once('../core/class/translate.class.php');
 require_once('../lib/functions.lib.php');
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index 484cc8ce9a3..092becf4c98 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -42,7 +42,7 @@ ErrCatAlreadyExists=Ce nom est déjà utilisé
 AddProductToCat=Ajouter ce produit à une catégorie ?
 ImpossibleAddCat=Impossible d'ajouter la catégorie
 ImpossibleAssociateCategory=Impossible d'associer la catégorie
-WasAddedSuccessfully=<b>%s</b> a été ajouté avec succès.
+WasAddedSuccessfully=<b>%s</b> a été ajoutée avec succès.
 ObjectAlreadyLinkedToCategory=L'élément est déjà lié à cette catégorie.
 CategorySuccessfullyCreated=La catégorie %s a été ajouté avec succès.
 ProductIsInCategories=Ce produit/service est dans les catégories suivantes
diff --git a/htdocs/lib/files.lib.php b/htdocs/lib/files.lib.php
index 5dda38dcc5c..3dbbef2c6b2 100644
--- a/htdocs/lib/files.lib.php
+++ b/htdocs/lib/files.lib.php
@@ -20,7 +20,7 @@
 /**
  *  \file		htdocs/lib/files.lib.php
  *  \brief		Library for file managing functions
- *  \version	$Id: files.lib.php,v 1.69 2011/07/13 21:33:38 eldy Exp $
+ *  \version	$Id: files.lib.php,v 1.68 2011/07/11 06:23:22 hregis Exp $
  */
 
 /**
@@ -590,13 +590,12 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
  *  @param      disableglob     Disable usage of glob like *
  *  @param      nophperrors     Disable all PHP output errors
  *  @param		notrigger		Disable all triggers
- *  @param      triggercode     Code of trigger
- *  @param      object          Object for trigger
  *  @return     boolean         True if file is deleted, False if error
  */
-function dol_delete_file($file,$disableglob=0,$nophperrors=0,$notrigger=0,$triggercode='FILE_DELETE',$object=null)
+function dol_delete_file($file,$disableglob=0,$nophperrors=0,$notrigger=0)
 {
-	global $db, $conf, $user, $langs;
+	global $conf, $user, $langs;
+	global $object;
 
     //print "x".$file." ".$disableglob;
     $ok=true;
@@ -612,13 +611,12 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$notrigger=0,$trigg
             	dol_syslog("Removed file ".$filename,LOG_DEBUG);
             	if (! $notrigger)
             	{
-                    if (! is_object($object)) $object=(object) 'dummy';
             		$object->src_file=$file;
 
             		// Appel des triggers
             		include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
             		$interface=new Interfaces($db);
-            		$result=$interface->run_triggers($triggercode,$object,$user,$langs,$conf);
+            		$result=$interface->run_triggers('FILE_DELETE',$object,$user,$langs,$conf);
             		if ($result < 0) { $error++; $errors=$interface->errors; }
             		// Fin appel triggers
             	}

From 1c7ed29a76008f0962dbc7d799b4e20a2959cd13 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 21:54:07 +0000
Subject: [PATCH 82/91] Fix: Removed warning

---
 build/exe/doliwamp/doliwamp.iss                  | 16 ++++++++--------
 htdocs/filefunc.inc.php                          |  4 ++--
 .../includes/modules/DolibarrModules.class.php   |  4 ++--
 htdocs/install/inc.php                           |  4 ++--
 htdocs/langs/fr_FR/categories.lang               |  2 +-
 htdocs/lib/files.lib.php                         | 12 +++++++-----
 6 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index f89ff75f410..c731758148d 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -10,7 +10,7 @@
 ; only the root user with no password, stop server and catch
 ; files user.MY* to put them in the Dolibarr build/exe/doliwamp/mysql directory.
 ;
-; Version: $Id$
+; Version: $Id: doliwamp.iss,v 1.82 2011/07/13 21:09:30 eldy Exp $
 ;----------------------------------------------------------------------------------------
 
 
@@ -18,12 +18,12 @@
 ; ----- Change this -----
 AppName=DoliWamp
 ; DoliWamp-x.x.x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta
-AppVerName=DoliWamp-3.1.0-alpha
+AppVerName=DoliWamp-3.1.0-beta
 ; DoliWamp-x.x x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta
-OutputBaseFilename=DoliWamp-3.1.0-alpha
+OutputBaseFilename=DoliWamp-3.1.0-beta
 ; Define full path from wich all relative path are defined
 ; You must modify this to put here your dolibarr root directory
-SourceDir=C:\Work\Data\Workspace\dolibarr
+SourceDir=C:\Mes Developpements\dolibarr
 ; ----- End of change
 ;OutputManifestFile=build\doliwampbuild.log
 AppId=doliwamp
@@ -101,10 +101,10 @@ Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversi
 ; PhpMyAdmin, Apache, Php, Mysql
 ; Put here path of Wampserver applications
 ; Value OK: apache 2.2.6, php 5.2.5 (5.2.11 fails if php_exif is on), mysql 5.0.45 or 5.1.36
-Source: "C:\Work\Applis\Wamp\apps\phpmyadmin3.2.0.1\*.*"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log"
-Source: "C:\Work\Applis\Wamp\bin\apache\apache2.2.6\*.*"; DestDir: "{app}\bin\apache\apache2.2.6"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
-Source: "C:\Work\Applis\Wamp\bin\php\php5.2.5\*.*"; DestDir: "{app}\bin\php\php5.2.5"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
-Source: "C:\Work\Applis\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
+Source: "C:\Program Files\Wamp\apps\phpmyadmin3.2.0.1\*.*"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log"
+Source: "C:\Program Files\Wamp\bin\apache\apache2.2.6\*.*"; DestDir: "{app}\bin\apache\apache2.2.6"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
+Source: "C:\Program Files\Wamp\bin\php\php5.2.5\*.*"; DestDir: "{app}\bin\php\php5.2.5"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
+Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
 ; Mysql data files (does not overwrite if exists)
 Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db"
 ; Dolibarr
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 54a53fc9175..4e96c341f34 100755
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -28,10 +28,10 @@
  *	\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.17 2011/06/28 12:25:43 hregis Exp $
+ *  \version    $Id: filefunc.inc.php,v 1.18 2011/07/13 21:19:58 eldy Exp $
  */
 
-define('DOL_VERSION','3.1.0-alpha');	// Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
+define('DOL_VERSION','3.1.0-beta');	// Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
 define('EURO',chr(128));
 
 // Definition des constantes syslog
diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php
index ccf074c5150..d5c37a443e4 100644
--- a/htdocs/includes/modules/DolibarrModules.class.php
+++ b/htdocs/includes/modules/DolibarrModules.class.php
@@ -24,7 +24,7 @@
 /**
  *  \file           htdocs/includes/modules/DolibarrModules.class.php
  *  \brief          Fichier de description et activation des modules Dolibarr
- *  \version        $Id: DolibarrModules.class.php,v 1.159 2011/06/28 20:31:23 eldy Exp $
+ *  \version        $Id: DolibarrModules.class.php,v 1.160 2011/07/13 21:54:07 eldy Exp $
  */
 
 
@@ -955,7 +955,7 @@ class DolibarrModules
                 {
                     $r_id       = $this->rights[$key][0];
                     $r_desc     = $this->rights[$key][1];
-                    $r_type     = $this->rights[$key][2];
+                    $r_type     = isset($this->rights[$key][2])?$this->rights[$key][2]:'';
                     $r_def      = $this->rights[$key][3];
                     $r_perms    = $this->rights[$key][4];
                     $r_subperms = isset($this->rights[$key][5])?$this->rights[$key][5]:'';
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 1fd1774d185..bb49200a208 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -22,10 +22,10 @@
 /**	    \file       htdocs/install/inc.php
  * 		\ingroup	core
  *		\brief      File that define environment for install pages
- *		\version    $Id: inc.php,v 1.134 2011/07/11 10:53:37 eldy Exp $
+ *		\version    $Id: inc.php,v 1.135 2011/07/13 21:19:58 eldy Exp $
  */
 
-define('DOL_VERSION','3.1.0-alpha');	// Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z)
+define('DOL_VERSION','3.1.0-beta');	// Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z)
 
 require_once('../core/class/translate.class.php');
 require_once('../lib/functions.lib.php');
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index 092becf4c98..484cc8ce9a3 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -42,7 +42,7 @@ ErrCatAlreadyExists=Ce nom est déjà utilisé
 AddProductToCat=Ajouter ce produit à une catégorie ?
 ImpossibleAddCat=Impossible d'ajouter la catégorie
 ImpossibleAssociateCategory=Impossible d'associer la catégorie
-WasAddedSuccessfully=<b>%s</b> a été ajoutée avec succès.
+WasAddedSuccessfully=<b>%s</b> a été ajouté avec succès.
 ObjectAlreadyLinkedToCategory=L'élément est déjà lié à cette catégorie.
 CategorySuccessfullyCreated=La catégorie %s a été ajouté avec succès.
 ProductIsInCategories=Ce produit/service est dans les catégories suivantes
diff --git a/htdocs/lib/files.lib.php b/htdocs/lib/files.lib.php
index 3dbbef2c6b2..5dda38dcc5c 100644
--- a/htdocs/lib/files.lib.php
+++ b/htdocs/lib/files.lib.php
@@ -20,7 +20,7 @@
 /**
  *  \file		htdocs/lib/files.lib.php
  *  \brief		Library for file managing functions
- *  \version	$Id: files.lib.php,v 1.68 2011/07/11 06:23:22 hregis Exp $
+ *  \version	$Id: files.lib.php,v 1.69 2011/07/13 21:33:38 eldy Exp $
  */
 
 /**
@@ -590,12 +590,13 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
  *  @param      disableglob     Disable usage of glob like *
  *  @param      nophperrors     Disable all PHP output errors
  *  @param		notrigger		Disable all triggers
+ *  @param      triggercode     Code of trigger
+ *  @param      object          Object for trigger
  *  @return     boolean         True if file is deleted, False if error
  */
-function dol_delete_file($file,$disableglob=0,$nophperrors=0,$notrigger=0)
+function dol_delete_file($file,$disableglob=0,$nophperrors=0,$notrigger=0,$triggercode='FILE_DELETE',$object=null)
 {
-	global $conf, $user, $langs;
-	global $object;
+	global $db, $conf, $user, $langs;
 
     //print "x".$file." ".$disableglob;
     $ok=true;
@@ -611,12 +612,13 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$notrigger=0)
             	dol_syslog("Removed file ".$filename,LOG_DEBUG);
             	if (! $notrigger)
             	{
+                    if (! is_object($object)) $object=(object) 'dummy';
             		$object->src_file=$file;
 
             		// Appel des triggers
             		include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
             		$interface=new Interfaces($db);
-            		$result=$interface->run_triggers('FILE_DELETE',$object,$user,$langs,$conf);
+            		$result=$interface->run_triggers($triggercode,$object,$user,$langs,$conf);
             		if ($result < 0) { $error++; $errors=$interface->errors; }
             		// Fin appel triggers
             	}

From 450dcc94c80aa6803463ae5da02ca2b1cf98ade5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 18:30:29 +0000
Subject: [PATCH 83/91] Trans

---
 build/exe/doliwamp/doliwamp.iss                  | 16 ++++++++--------
 htdocs/filefunc.inc.php                          |  4 ++--
 .../includes/modules/DolibarrModules.class.php   |  4 ++--
 htdocs/install/inc.php                           |  4 ++--
 htdocs/lib/files.lib.php                         | 12 +++++-------
 5 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index c731758148d..f89ff75f410 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -10,7 +10,7 @@
 ; only the root user with no password, stop server and catch
 ; files user.MY* to put them in the Dolibarr build/exe/doliwamp/mysql directory.
 ;
-; Version: $Id: doliwamp.iss,v 1.82 2011/07/13 21:09:30 eldy Exp $
+; Version: $Id$
 ;----------------------------------------------------------------------------------------
 
 
@@ -18,12 +18,12 @@
 ; ----- Change this -----
 AppName=DoliWamp
 ; DoliWamp-x.x.x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta
-AppVerName=DoliWamp-3.1.0-beta
+AppVerName=DoliWamp-3.1.0-alpha
 ; DoliWamp-x.x x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta
-OutputBaseFilename=DoliWamp-3.1.0-beta
+OutputBaseFilename=DoliWamp-3.1.0-alpha
 ; Define full path from wich all relative path are defined
 ; You must modify this to put here your dolibarr root directory
-SourceDir=C:\Mes Developpements\dolibarr
+SourceDir=C:\Work\Data\Workspace\dolibarr
 ; ----- End of change
 ;OutputManifestFile=build\doliwampbuild.log
 AppId=doliwamp
@@ -101,10 +101,10 @@ Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversi
 ; PhpMyAdmin, Apache, Php, Mysql
 ; Put here path of Wampserver applications
 ; Value OK: apache 2.2.6, php 5.2.5 (5.2.11 fails if php_exif is on), mysql 5.0.45 or 5.1.36
-Source: "C:\Program Files\Wamp\apps\phpmyadmin3.2.0.1\*.*"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log"
-Source: "C:\Program Files\Wamp\bin\apache\apache2.2.6\*.*"; DestDir: "{app}\bin\apache\apache2.2.6"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
-Source: "C:\Program Files\Wamp\bin\php\php5.2.5\*.*"; DestDir: "{app}\bin\php\php5.2.5"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
-Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
+Source: "C:\Work\Applis\Wamp\apps\phpmyadmin3.2.0.1\*.*"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log"
+Source: "C:\Work\Applis\Wamp\bin\apache\apache2.2.6\*.*"; DestDir: "{app}\bin\apache\apache2.2.6"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
+Source: "C:\Work\Applis\Wamp\bin\php\php5.2.5\*.*"; DestDir: "{app}\bin\php\php5.2.5"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
+Source: "C:\Work\Applis\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
 ; Mysql data files (does not overwrite if exists)
 Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db"
 ; Dolibarr
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 4e96c341f34..54a53fc9175 100755
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -28,10 +28,10 @@
  *	\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.18 2011/07/13 21:19:58 eldy Exp $
+ *  \version    $Id: filefunc.inc.php,v 1.17 2011/06/28 12:25:43 hregis Exp $
  */
 
-define('DOL_VERSION','3.1.0-beta');	// Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
+define('DOL_VERSION','3.1.0-alpha');	// Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
 define('EURO',chr(128));
 
 // Definition des constantes syslog
diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php
index d5c37a443e4..ccf074c5150 100644
--- a/htdocs/includes/modules/DolibarrModules.class.php
+++ b/htdocs/includes/modules/DolibarrModules.class.php
@@ -24,7 +24,7 @@
 /**
  *  \file           htdocs/includes/modules/DolibarrModules.class.php
  *  \brief          Fichier de description et activation des modules Dolibarr
- *  \version        $Id: DolibarrModules.class.php,v 1.160 2011/07/13 21:54:07 eldy Exp $
+ *  \version        $Id: DolibarrModules.class.php,v 1.159 2011/06/28 20:31:23 eldy Exp $
  */
 
 
@@ -955,7 +955,7 @@ class DolibarrModules
                 {
                     $r_id       = $this->rights[$key][0];
                     $r_desc     = $this->rights[$key][1];
-                    $r_type     = isset($this->rights[$key][2])?$this->rights[$key][2]:'';
+                    $r_type     = $this->rights[$key][2];
                     $r_def      = $this->rights[$key][3];
                     $r_perms    = $this->rights[$key][4];
                     $r_subperms = isset($this->rights[$key][5])?$this->rights[$key][5]:'';
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index bb49200a208..1fd1774d185 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -22,10 +22,10 @@
 /**	    \file       htdocs/install/inc.php
  * 		\ingroup	core
  *		\brief      File that define environment for install pages
- *		\version    $Id: inc.php,v 1.135 2011/07/13 21:19:58 eldy Exp $
+ *		\version    $Id: inc.php,v 1.134 2011/07/11 10:53:37 eldy Exp $
  */
 
-define('DOL_VERSION','3.1.0-beta');	// Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z)
+define('DOL_VERSION','3.1.0-alpha');	// Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z)
 
 require_once('../core/class/translate.class.php');
 require_once('../lib/functions.lib.php');
diff --git a/htdocs/lib/files.lib.php b/htdocs/lib/files.lib.php
index 5dda38dcc5c..3dbbef2c6b2 100644
--- a/htdocs/lib/files.lib.php
+++ b/htdocs/lib/files.lib.php
@@ -20,7 +20,7 @@
 /**
  *  \file		htdocs/lib/files.lib.php
  *  \brief		Library for file managing functions
- *  \version	$Id: files.lib.php,v 1.69 2011/07/13 21:33:38 eldy Exp $
+ *  \version	$Id: files.lib.php,v 1.68 2011/07/11 06:23:22 hregis Exp $
  */
 
 /**
@@ -590,13 +590,12 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
  *  @param      disableglob     Disable usage of glob like *
  *  @param      nophperrors     Disable all PHP output errors
  *  @param		notrigger		Disable all triggers
- *  @param      triggercode     Code of trigger
- *  @param      object          Object for trigger
  *  @return     boolean         True if file is deleted, False if error
  */
-function dol_delete_file($file,$disableglob=0,$nophperrors=0,$notrigger=0,$triggercode='FILE_DELETE',$object=null)
+function dol_delete_file($file,$disableglob=0,$nophperrors=0,$notrigger=0)
 {
-	global $db, $conf, $user, $langs;
+	global $conf, $user, $langs;
+	global $object;
 
     //print "x".$file." ".$disableglob;
     $ok=true;
@@ -612,13 +611,12 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$notrigger=0,$trigg
             	dol_syslog("Removed file ".$filename,LOG_DEBUG);
             	if (! $notrigger)
             	{
-                    if (! is_object($object)) $object=(object) 'dummy';
             		$object->src_file=$file;
 
             		// Appel des triggers
             		include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
             		$interface=new Interfaces($db);
-            		$result=$interface->run_triggers($triggercode,$object,$user,$langs,$conf);
+            		$result=$interface->run_triggers('FILE_DELETE',$object,$user,$langs,$conf);
             		if ($result < 0) { $error++; $errors=$interface->errors; }
             		// Fin appel triggers
             	}

From 597a99a51841b25782b57828341a588679e54f4d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 21:09:30 +0000
Subject: [PATCH 84/91] Work on 3.1.0 release

---
 build/exe/doliwamp/doliwamp.iss | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index f89ff75f410..c731758148d 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -10,7 +10,7 @@
 ; only the root user with no password, stop server and catch
 ; files user.MY* to put them in the Dolibarr build/exe/doliwamp/mysql directory.
 ;
-; Version: $Id$
+; Version: $Id: doliwamp.iss,v 1.82 2011/07/13 21:09:30 eldy Exp $
 ;----------------------------------------------------------------------------------------
 
 
@@ -18,12 +18,12 @@
 ; ----- Change this -----
 AppName=DoliWamp
 ; DoliWamp-x.x.x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta
-AppVerName=DoliWamp-3.1.0-alpha
+AppVerName=DoliWamp-3.1.0-beta
 ; DoliWamp-x.x x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta
-OutputBaseFilename=DoliWamp-3.1.0-alpha
+OutputBaseFilename=DoliWamp-3.1.0-beta
 ; Define full path from wich all relative path are defined
 ; You must modify this to put here your dolibarr root directory
-SourceDir=C:\Work\Data\Workspace\dolibarr
+SourceDir=C:\Mes Developpements\dolibarr
 ; ----- End of change
 ;OutputManifestFile=build\doliwampbuild.log
 AppId=doliwamp
@@ -101,10 +101,10 @@ Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversi
 ; PhpMyAdmin, Apache, Php, Mysql
 ; Put here path of Wampserver applications
 ; Value OK: apache 2.2.6, php 5.2.5 (5.2.11 fails if php_exif is on), mysql 5.0.45 or 5.1.36
-Source: "C:\Work\Applis\Wamp\apps\phpmyadmin3.2.0.1\*.*"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log"
-Source: "C:\Work\Applis\Wamp\bin\apache\apache2.2.6\*.*"; DestDir: "{app}\bin\apache\apache2.2.6"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
-Source: "C:\Work\Applis\Wamp\bin\php\php5.2.5\*.*"; DestDir: "{app}\bin\php\php5.2.5"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
-Source: "C:\Work\Applis\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
+Source: "C:\Program Files\Wamp\apps\phpmyadmin3.2.0.1\*.*"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log"
+Source: "C:\Program Files\Wamp\bin\apache\apache2.2.6\*.*"; DestDir: "{app}\bin\apache\apache2.2.6"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
+Source: "C:\Program Files\Wamp\bin\php\php5.2.5\*.*"; DestDir: "{app}\bin\php\php5.2.5"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
+Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
 ; Mysql data files (does not overwrite if exists)
 Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db"
 ; Dolibarr

From 5485706bdc801af826af44436fc9dc53a6f41893 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 22:15:19 +0000
Subject: [PATCH 85/91] Fix: Activation of a module must works even when $user
 not defined (for installer).

---
 htdocs/core/class/menubase.class.php          |  4 ++--
 htdocs/filefunc.inc.php                       |  4 ++--
 .../modules/DolibarrModules.class.php         | 23 ++++++++++---------
 htdocs/install/inc.php                        |  4 ++--
 htdocs/lib/files.lib.php                      | 12 ++++++----
 5 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 373a211bdad..fd39396163f 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -20,7 +20,7 @@
 /**
  *  \file       htdocs/core/class/menubase.class.php
  *  \ingroup    core
- *  \version	$Id$
+ *  \version	$Id: menubase.class.php,v 1.25 2011/07/13 22:18:48 eldy Exp $
  *  \brief      File of class to manage dynamic menu entries
  *  \remarks	Initialy built by build_class_from_table on 2008-01-12 14:19
  */
@@ -78,7 +78,7 @@ class Menubase
      *      @param      user        User that create
      *      @return     int         <0 if KO, Id of record if OK
      */
-    function create($user)
+    function create($user=0)
     {
         global $conf, $langs;
 
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 54a53fc9175..4e96c341f34 100755
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -28,10 +28,10 @@
  *	\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.17 2011/06/28 12:25:43 hregis Exp $
+ *  \version    $Id: filefunc.inc.php,v 1.18 2011/07/13 21:19:58 eldy Exp $
  */
 
-define('DOL_VERSION','3.1.0-alpha');	// Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
+define('DOL_VERSION','3.1.0-beta');	// Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
 define('EURO',chr(128));
 
 // Definition des constantes syslog
diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php
index ccf074c5150..b41e2e2b31f 100644
--- a/htdocs/includes/modules/DolibarrModules.class.php
+++ b/htdocs/includes/modules/DolibarrModules.class.php
@@ -24,7 +24,7 @@
 /**
  *  \file           htdocs/includes/modules/DolibarrModules.class.php
  *  \brief          Fichier de description et activation des modules Dolibarr
- *  \version        $Id: DolibarrModules.class.php,v 1.159 2011/06/28 20:31:23 eldy Exp $
+ *  \version        $Id: DolibarrModules.class.php,v 1.161 2011/07/13 22:15:19 eldy Exp $
  */
 
 
@@ -926,7 +926,7 @@ class DolibarrModules
 
     /**
      *  Insert permissions definitions related to the module into llx_rights_def
-     *  @param      $reinitadminperms   If 1, we also grant them to admin user
+     *  @param      $reinitadminperms   If 1, we also grant them to all admin users
      *  @return     int                 Number of error (0 if OK)
      */
     function insert_permissions($reinitadminperms=0)
@@ -955,7 +955,7 @@ class DolibarrModules
                 {
                     $r_id       = $this->rights[$key][0];
                     $r_desc     = $this->rights[$key][1];
-                    $r_type     = $this->rights[$key][2];
+                    $r_type     = isset($this->rights[$key][2])?$this->rights[$key][2]:'';
                     $r_def      = $this->rights[$key][3];
                     $r_perms    = $this->rights[$key][4];
                     $r_subperms = isset($this->rights[$key][5])?$this->rights[$key][5]:'';
@@ -1004,12 +1004,15 @@ class DolibarrModules
                     }
 
                     // If we are into a logged session and we are an admin user, we take permission of new activated module
-                    if ($reinitadminperms && ! empty($user->admin))
+                    if ($reinitadminperms)
                     {
-                        $user->addrights($r_id);
-                        // We reload permissions
-                        $user->clearrights();
-                        $user->getrights();
+                        if (! empty($user->admin))  // FIXME. We must loop on each admin records and make grant on each fuser object. We must removed global $user.
+                        {
+                            $user->addrights($r_id);
+                            // We reload permissions
+                            $user->clearrights();
+                            $user->getrights();
+                        }
                     }
                 }
             }
@@ -1056,8 +1059,6 @@ class DolibarrModules
      */
     function insert_menus()
     {
-        global $user;
-
         require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php");
 
         $err=0;
@@ -1118,7 +1119,7 @@ class DolibarrModules
 
             if (! $err)
             {
-                $result=$menu->create($user);
+                $result=$menu->create();
                 if ($result > 0)
                 {
                     $this->menu[$key]['rowid']=$result;
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 1fd1774d185..bb49200a208 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -22,10 +22,10 @@
 /**	    \file       htdocs/install/inc.php
  * 		\ingroup	core
  *		\brief      File that define environment for install pages
- *		\version    $Id: inc.php,v 1.134 2011/07/11 10:53:37 eldy Exp $
+ *		\version    $Id: inc.php,v 1.135 2011/07/13 21:19:58 eldy Exp $
  */
 
-define('DOL_VERSION','3.1.0-alpha');	// Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z)
+define('DOL_VERSION','3.1.0-beta');	// Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z)
 
 require_once('../core/class/translate.class.php');
 require_once('../lib/functions.lib.php');
diff --git a/htdocs/lib/files.lib.php b/htdocs/lib/files.lib.php
index 3dbbef2c6b2..5dda38dcc5c 100644
--- a/htdocs/lib/files.lib.php
+++ b/htdocs/lib/files.lib.php
@@ -20,7 +20,7 @@
 /**
  *  \file		htdocs/lib/files.lib.php
  *  \brief		Library for file managing functions
- *  \version	$Id: files.lib.php,v 1.68 2011/07/11 06:23:22 hregis Exp $
+ *  \version	$Id: files.lib.php,v 1.69 2011/07/13 21:33:38 eldy Exp $
  */
 
 /**
@@ -590,12 +590,13 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
  *  @param      disableglob     Disable usage of glob like *
  *  @param      nophperrors     Disable all PHP output errors
  *  @param		notrigger		Disable all triggers
+ *  @param      triggercode     Code of trigger
+ *  @param      object          Object for trigger
  *  @return     boolean         True if file is deleted, False if error
  */
-function dol_delete_file($file,$disableglob=0,$nophperrors=0,$notrigger=0)
+function dol_delete_file($file,$disableglob=0,$nophperrors=0,$notrigger=0,$triggercode='FILE_DELETE',$object=null)
 {
-	global $conf, $user, $langs;
-	global $object;
+	global $db, $conf, $user, $langs;
 
     //print "x".$file." ".$disableglob;
     $ok=true;
@@ -611,12 +612,13 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$notrigger=0)
             	dol_syslog("Removed file ".$filename,LOG_DEBUG);
             	if (! $notrigger)
             	{
+                    if (! is_object($object)) $object=(object) 'dummy';
             		$object->src_file=$file;
 
             		// Appel des triggers
             		include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
             		$interface=new Interfaces($db);
-            		$result=$interface->run_triggers('FILE_DELETE',$object,$user,$langs,$conf);
+            		$result=$interface->run_triggers($triggercode,$object,$user,$langs,$conf);
             		if ($result < 0) { $error++; $errors=$interface->errors; }
             		// Fin appel triggers
             	}

From 2c98e8a5812df9da3bf8416b38452e10179ee1b9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 22:18:12 +0000
Subject: [PATCH 86/91] Convert a FIXME into a TODO

---
 htdocs/core/class/html.formmail.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 6ca8f1e007f..4b32e65ea54 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -22,7 +22,7 @@
  *       \file       htdocs/core/class/html.formmail.class.php
  *       \ingroup    core
  *       \brief      Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire
- *       \version    $Id: html.formmail.class.php,v 1.32 2011/07/13 16:55:25 eldy Exp $
+ *       \version    $Id: html.formmail.class.php,v 1.33 2011/07/13 22:18:12 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT ."/core/class/html.form.class.php");
 
@@ -505,7 +505,7 @@ class FormMail
             $out.= '<tr>';
             $out.= '<td width="180">'.$langs->trans("MailFile").'</td>';
             $out.= '<td>';
-            // FIXME Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
+            // TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
             $out.= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";
             $out.= '<script type="text/javascript" language="javascript">';
             $out.= 'jQuery(document).ready(function () {';

From 8113a6448322c869564a080948deaa2baf190d6d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 21:19:58 +0000
Subject: [PATCH 87/91] Prepare 3.1 beta

---
 htdocs/core/class/html.formmail.class.php     |  4 ++--
 htdocs/core/class/menubase.class.php          |  4 ++--
 .../modules/DolibarrModules.class.php         | 23 +++++++++----------
 htdocs/lib/files.lib.php                      | 12 ++++------
 4 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 4b32e65ea54..6ca8f1e007f 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -22,7 +22,7 @@
  *       \file       htdocs/core/class/html.formmail.class.php
  *       \ingroup    core
  *       \brief      Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire
- *       \version    $Id: html.formmail.class.php,v 1.33 2011/07/13 22:18:12 eldy Exp $
+ *       \version    $Id: html.formmail.class.php,v 1.32 2011/07/13 16:55:25 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT ."/core/class/html.form.class.php");
 
@@ -505,7 +505,7 @@ class FormMail
             $out.= '<tr>';
             $out.= '<td width="180">'.$langs->trans("MailFile").'</td>';
             $out.= '<td>';
-            // TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
+            // FIXME Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
             $out.= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";
             $out.= '<script type="text/javascript" language="javascript">';
             $out.= 'jQuery(document).ready(function () {';
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index fd39396163f..373a211bdad 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -20,7 +20,7 @@
 /**
  *  \file       htdocs/core/class/menubase.class.php
  *  \ingroup    core
- *  \version	$Id: menubase.class.php,v 1.25 2011/07/13 22:18:48 eldy Exp $
+ *  \version	$Id$
  *  \brief      File of class to manage dynamic menu entries
  *  \remarks	Initialy built by build_class_from_table on 2008-01-12 14:19
  */
@@ -78,7 +78,7 @@ class Menubase
      *      @param      user        User that create
      *      @return     int         <0 if KO, Id of record if OK
      */
-    function create($user=0)
+    function create($user)
     {
         global $conf, $langs;
 
diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php
index b41e2e2b31f..ccf074c5150 100644
--- a/htdocs/includes/modules/DolibarrModules.class.php
+++ b/htdocs/includes/modules/DolibarrModules.class.php
@@ -24,7 +24,7 @@
 /**
  *  \file           htdocs/includes/modules/DolibarrModules.class.php
  *  \brief          Fichier de description et activation des modules Dolibarr
- *  \version        $Id: DolibarrModules.class.php,v 1.161 2011/07/13 22:15:19 eldy Exp $
+ *  \version        $Id: DolibarrModules.class.php,v 1.159 2011/06/28 20:31:23 eldy Exp $
  */
 
 
@@ -926,7 +926,7 @@ class DolibarrModules
 
     /**
      *  Insert permissions definitions related to the module into llx_rights_def
-     *  @param      $reinitadminperms   If 1, we also grant them to all admin users
+     *  @param      $reinitadminperms   If 1, we also grant them to admin user
      *  @return     int                 Number of error (0 if OK)
      */
     function insert_permissions($reinitadminperms=0)
@@ -955,7 +955,7 @@ class DolibarrModules
                 {
                     $r_id       = $this->rights[$key][0];
                     $r_desc     = $this->rights[$key][1];
-                    $r_type     = isset($this->rights[$key][2])?$this->rights[$key][2]:'';
+                    $r_type     = $this->rights[$key][2];
                     $r_def      = $this->rights[$key][3];
                     $r_perms    = $this->rights[$key][4];
                     $r_subperms = isset($this->rights[$key][5])?$this->rights[$key][5]:'';
@@ -1004,15 +1004,12 @@ class DolibarrModules
                     }
 
                     // If we are into a logged session and we are an admin user, we take permission of new activated module
-                    if ($reinitadminperms)
+                    if ($reinitadminperms && ! empty($user->admin))
                     {
-                        if (! empty($user->admin))  // FIXME. We must loop on each admin records and make grant on each fuser object. We must removed global $user.
-                        {
-                            $user->addrights($r_id);
-                            // We reload permissions
-                            $user->clearrights();
-                            $user->getrights();
-                        }
+                        $user->addrights($r_id);
+                        // We reload permissions
+                        $user->clearrights();
+                        $user->getrights();
                     }
                 }
             }
@@ -1059,6 +1056,8 @@ class DolibarrModules
      */
     function insert_menus()
     {
+        global $user;
+
         require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php");
 
         $err=0;
@@ -1119,7 +1118,7 @@ class DolibarrModules
 
             if (! $err)
             {
-                $result=$menu->create();
+                $result=$menu->create($user);
                 if ($result > 0)
                 {
                     $this->menu[$key]['rowid']=$result;
diff --git a/htdocs/lib/files.lib.php b/htdocs/lib/files.lib.php
index 5dda38dcc5c..3dbbef2c6b2 100644
--- a/htdocs/lib/files.lib.php
+++ b/htdocs/lib/files.lib.php
@@ -20,7 +20,7 @@
 /**
  *  \file		htdocs/lib/files.lib.php
  *  \brief		Library for file managing functions
- *  \version	$Id: files.lib.php,v 1.69 2011/07/13 21:33:38 eldy Exp $
+ *  \version	$Id: files.lib.php,v 1.68 2011/07/11 06:23:22 hregis Exp $
  */
 
 /**
@@ -590,13 +590,12 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
  *  @param      disableglob     Disable usage of glob like *
  *  @param      nophperrors     Disable all PHP output errors
  *  @param		notrigger		Disable all triggers
- *  @param      triggercode     Code of trigger
- *  @param      object          Object for trigger
  *  @return     boolean         True if file is deleted, False if error
  */
-function dol_delete_file($file,$disableglob=0,$nophperrors=0,$notrigger=0,$triggercode='FILE_DELETE',$object=null)
+function dol_delete_file($file,$disableglob=0,$nophperrors=0,$notrigger=0)
 {
-	global $db, $conf, $user, $langs;
+	global $conf, $user, $langs;
+	global $object;
 
     //print "x".$file." ".$disableglob;
     $ok=true;
@@ -612,13 +611,12 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$notrigger=0,$trigg
             	dol_syslog("Removed file ".$filename,LOG_DEBUG);
             	if (! $notrigger)
             	{
-                    if (! is_object($object)) $object=(object) 'dummy';
             		$object->src_file=$file;
 
             		// Appel des triggers
             		include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
             		$interface=new Interfaces($db);
-            		$result=$interface->run_triggers($triggercode,$object,$user,$langs,$conf);
+            		$result=$interface->run_triggers('FILE_DELETE',$object,$user,$langs,$conf);
             		if ($result < 0) { $error++; $errors=$interface->errors; }
             		// Fin appel triggers
             	}

From 1d8b4a24d5395bc772eaa8c9f8fa37ed2ff4cb30 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 21:33:38 +0000
Subject: [PATCH 88/91] Fix: Object should never be a global variable as there
 is several object in a context. Also object type must be fixed for each
 "trigger code". So we add trigger code and object on parameter because only
 caller of a function know which object type we use and what trigger code we
 want to trigger.

---
 htdocs/lib/files.lib.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/htdocs/lib/files.lib.php b/htdocs/lib/files.lib.php
index 3dbbef2c6b2..5dda38dcc5c 100644
--- a/htdocs/lib/files.lib.php
+++ b/htdocs/lib/files.lib.php
@@ -20,7 +20,7 @@
 /**
  *  \file		htdocs/lib/files.lib.php
  *  \brief		Library for file managing functions
- *  \version	$Id: files.lib.php,v 1.68 2011/07/11 06:23:22 hregis Exp $
+ *  \version	$Id: files.lib.php,v 1.69 2011/07/13 21:33:38 eldy Exp $
  */
 
 /**
@@ -590,12 +590,13 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
  *  @param      disableglob     Disable usage of glob like *
  *  @param      nophperrors     Disable all PHP output errors
  *  @param		notrigger		Disable all triggers
+ *  @param      triggercode     Code of trigger
+ *  @param      object          Object for trigger
  *  @return     boolean         True if file is deleted, False if error
  */
-function dol_delete_file($file,$disableglob=0,$nophperrors=0,$notrigger=0)
+function dol_delete_file($file,$disableglob=0,$nophperrors=0,$notrigger=0,$triggercode='FILE_DELETE',$object=null)
 {
-	global $conf, $user, $langs;
-	global $object;
+	global $db, $conf, $user, $langs;
 
     //print "x".$file." ".$disableglob;
     $ok=true;
@@ -611,12 +612,13 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$notrigger=0)
             	dol_syslog("Removed file ".$filename,LOG_DEBUG);
             	if (! $notrigger)
             	{
+                    if (! is_object($object)) $object=(object) 'dummy';
             		$object->src_file=$file;
 
             		// Appel des triggers
             		include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
             		$interface=new Interfaces($db);
-            		$result=$interface->run_triggers('FILE_DELETE',$object,$user,$langs,$conf);
+            		$result=$interface->run_triggers($triggercode,$object,$user,$langs,$conf);
             		if ($result < 0) { $error++; $errors=$interface->errors; }
             		// Fin appel triggers
             	}

From 39d05be28e26004fdc220ff5379c44776f274c35 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 21:54:07 +0000
Subject: [PATCH 89/91] Fix: Removed warning

---
 htdocs/includes/modules/DolibarrModules.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php
index ccf074c5150..d5c37a443e4 100644
--- a/htdocs/includes/modules/DolibarrModules.class.php
+++ b/htdocs/includes/modules/DolibarrModules.class.php
@@ -24,7 +24,7 @@
 /**
  *  \file           htdocs/includes/modules/DolibarrModules.class.php
  *  \brief          Fichier de description et activation des modules Dolibarr
- *  \version        $Id: DolibarrModules.class.php,v 1.159 2011/06/28 20:31:23 eldy Exp $
+ *  \version        $Id: DolibarrModules.class.php,v 1.160 2011/07/13 21:54:07 eldy Exp $
  */
 
 
@@ -955,7 +955,7 @@ class DolibarrModules
                 {
                     $r_id       = $this->rights[$key][0];
                     $r_desc     = $this->rights[$key][1];
-                    $r_type     = $this->rights[$key][2];
+                    $r_type     = isset($this->rights[$key][2])?$this->rights[$key][2]:'';
                     $r_def      = $this->rights[$key][3];
                     $r_perms    = $this->rights[$key][4];
                     $r_subperms = isset($this->rights[$key][5])?$this->rights[$key][5]:'';

From 8ed480df20567ffe42a77f87b1f64cdea38e4d08 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 22:15:19 +0000
Subject: [PATCH 90/91] Fix: Activation of a module must works even when $user
 not defined (for installer).

---
 htdocs/core/class/menubase.class.php          |  4 ++--
 .../modules/DolibarrModules.class.php         | 21 ++++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 373a211bdad..fd39396163f 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -20,7 +20,7 @@
 /**
  *  \file       htdocs/core/class/menubase.class.php
  *  \ingroup    core
- *  \version	$Id$
+ *  \version	$Id: menubase.class.php,v 1.25 2011/07/13 22:18:48 eldy Exp $
  *  \brief      File of class to manage dynamic menu entries
  *  \remarks	Initialy built by build_class_from_table on 2008-01-12 14:19
  */
@@ -78,7 +78,7 @@ class Menubase
      *      @param      user        User that create
      *      @return     int         <0 if KO, Id of record if OK
      */
-    function create($user)
+    function create($user=0)
     {
         global $conf, $langs;
 
diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php
index d5c37a443e4..b41e2e2b31f 100644
--- a/htdocs/includes/modules/DolibarrModules.class.php
+++ b/htdocs/includes/modules/DolibarrModules.class.php
@@ -24,7 +24,7 @@
 /**
  *  \file           htdocs/includes/modules/DolibarrModules.class.php
  *  \brief          Fichier de description et activation des modules Dolibarr
- *  \version        $Id: DolibarrModules.class.php,v 1.160 2011/07/13 21:54:07 eldy Exp $
+ *  \version        $Id: DolibarrModules.class.php,v 1.161 2011/07/13 22:15:19 eldy Exp $
  */
 
 
@@ -926,7 +926,7 @@ class DolibarrModules
 
     /**
      *  Insert permissions definitions related to the module into llx_rights_def
-     *  @param      $reinitadminperms   If 1, we also grant them to admin user
+     *  @param      $reinitadminperms   If 1, we also grant them to all admin users
      *  @return     int                 Number of error (0 if OK)
      */
     function insert_permissions($reinitadminperms=0)
@@ -1004,12 +1004,15 @@ class DolibarrModules
                     }
 
                     // If we are into a logged session and we are an admin user, we take permission of new activated module
-                    if ($reinitadminperms && ! empty($user->admin))
+                    if ($reinitadminperms)
                     {
-                        $user->addrights($r_id);
-                        // We reload permissions
-                        $user->clearrights();
-                        $user->getrights();
+                        if (! empty($user->admin))  // FIXME. We must loop on each admin records and make grant on each fuser object. We must removed global $user.
+                        {
+                            $user->addrights($r_id);
+                            // We reload permissions
+                            $user->clearrights();
+                            $user->getrights();
+                        }
                     }
                 }
             }
@@ -1056,8 +1059,6 @@ class DolibarrModules
      */
     function insert_menus()
     {
-        global $user;
-
         require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php");
 
         $err=0;
@@ -1118,7 +1119,7 @@ class DolibarrModules
 
             if (! $err)
             {
-                $result=$menu->create($user);
+                $result=$menu->create();
                 if ($result > 0)
                 {
                     $this->menu[$key]['rowid']=$result;

From d4349987afecf4d0515793ac587edfeaeb24edd9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 13 Jul 2011 22:18:12 +0000
Subject: [PATCH 91/91] Convert a FIXME into a TODO

---
 htdocs/core/class/html.formmail.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 6ca8f1e007f..4b32e65ea54 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -22,7 +22,7 @@
  *       \file       htdocs/core/class/html.formmail.class.php
  *       \ingroup    core
  *       \brief      Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire
- *       \version    $Id: html.formmail.class.php,v 1.32 2011/07/13 16:55:25 eldy Exp $
+ *       \version    $Id: html.formmail.class.php,v 1.33 2011/07/13 22:18:12 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT ."/core/class/html.form.class.php");
 
@@ -505,7 +505,7 @@ class FormMail
             $out.= '<tr>';
             $out.= '<td width="180">'.$langs->trans("MailFile").'</td>';
             $out.= '<td>';
-            // FIXME Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
+            // TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
             $out.= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";
             $out.= '<script type="text/javascript" language="javascript">';
             $out.= 'jQuery(document).ready(function () {';