Merge remote-tracking branch 'origin/3.5' into develop

Conflicts: build/debian/control htdocs/fourn/facture/paiement.php
2014-02-03 18:44:48 +01:00 · 2014-02-03 18:44:48 +01:00 · efcff80a28
commit efcff80a28
parent e5cd32623c 2b2d764180
18 changed files with 168 additions and 133 deletions
--- a/build/debian/changelog
+++ b/build/debian/changelog
@ -10,7 +10,7 @@ dolibarr (3.5.0-3) unstable; urgency=low
  [ Laurent Destailleur (eldy) ]
  * New upstream release.
    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 30 Dec 2013 12:00:00 +0100     
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Fri, 31 Jan 2014 12:00:00 +0100     

 dolibarr (3.4.2-3) unstable; urgency=low

@ -24,11 +24,11 @@ dolibarr (3.4.1-3) unstable; urgency=low
  [ Laurent Destailleur (eldy) ]
  * Maintenance release.
    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 22 Apr 2013 12:00:00 +0100     
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 27 Apr 2013 12:00:00 +0100     

 dolibarr (3.4.0-3) unstable; urgency=low

  [ Laurent Destailleur (eldy) ]
  * Maintenance release.
    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 22 Apr 2013 12:00:00 +0100     
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 22 Apr 2013 12:00:00 +0100
--- a/build/debian/control
+++ b/build/debian/control
@ -1,40 +1,47 @@
 Source: dolibarr
-Maintainer: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>
-Uploaders: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>
-Standards-Version: 3.9.2
 Section: web
 Priority: optional
+Maintainer: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>
+Uploaders: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>
+Standards-Version: 3.9.4
 Homepage: http://www.dolibarr.org
-Build-Depends: debhelper (>= 7), po-debconf, dpatch
+Build-Depends: debhelper (>= 9), po-debconf, dpatch
 Comments: This package need at least debian 7 or ubuntu 13.04 or any distribution based on this version
 
 Package: dolibarr
+Architecture: all
 Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5,
-    php5-mysql | php5-mysqli, 
-    php5-cli, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, php5-geoip,
-	libphp-adodb,
-    libnusoap-php,
-    libphp-pclzip,
-    libfpdi-php, libfpdf-tpl-php, php-fpdf,
-    libjs-jquery, libjs-jquery-ui, libjs-flot, ckeditor,
-    ttf-dejavu-core,
+    php5-cli, 
+# Required PHP extensions
+    php5-mysql | php5-mysqli, php5-curl, php5-gd, php5-ldap, php5-geoip,
+# Required PHP libraries
+    php-pear, php-mail-mime, 
+#    libfpdi-php, libfpdf-tpl-php, php-fpdf,
+#    libphp-adodb,
+#    libnusoap-php,
+#    libphp-pclzip,
+# Required javascript libraries
+#    libjs-jquery, libjs-jquery-ui, libjs-flot, ckeditor,
+# Misc dependencies
+#    fonts-dejavu-core | ttf-dejavu-core,
    xdg-utils,
    mysql-server,
    ${misc:Depends},
    ${perl:Depends}
-Recommends: apache2 | lighttpd | httpd, mysql-client
+Recommends: mysql-client, apache2 | lighttpd | httpd
 Suggests: www-browser
-Architecture: all
 Description: Web based software to manage a small company or foundation
 Dolibarr ERP & CRM is an easy to use open source/free software for small 
 and medium companies, foundations or freelances. It includes different 
 features for Enterprise Resource Planning (ERP) and Customer Relationship
 Management (CRM) but also for different other activities.
+ .
 It's a web software you can install as a standalone program or on any web
 hosting provider to use it from anywhere with any web browser.
 .
- Dolibarr was designed to be easy to use. Only features you need are 
+ Dolibarr was designed to be easy to use. Only the features that you need are 
 visible, depending on which modules were activated.
+ .
 Most common used modules are:
 .
 Customers, Suppliers or Prospects directory,
--- a/build/debian/dolibarr.install
+++ b/build/debian/dolibarr.install
@ -6,7 +6,7 @@ debian/lighttpd/50-dolibarr.conf etc/lighttpd/conf-available/
 debian/install.forced.php.install etc/dolibarr/
 htdocs usr/share/dolibarr/
 scripts usr/share/dolibarr/
-ChangeLog usr/share/doc/dolibarr/
+changelog usr/share/doc/dolibarr/
 README usr/share/doc/dolibarr/
 doc/install usr/share/doc/dolibarr/
 doc/user usr/share/doc/dolibarr/
--- a/build/debian/dolibarr.postinst
+++ b/build/debian/dolibarr.postinst
@ -13,6 +13,11 @@ set -e
 #          <conflicting-package> <version>
 # for details, see /usr/share/doc/packaging-manual/

+if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+	# Needs to be run outside of functions to have access to parameters
+	. /usr/share/apache2/apache2-maintscript-helper
+fi
+
 setup_empty_conf() {
 	echo Create empty file $config		
    mkdir -p /etc/dolibarr
@ -37,20 +42,23 @@ enable_install_upgrade_wizard() {

 apache_install() {
 	webserver=$1
-	if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then
-		echo "Add link for Apache config file"
-		ln -s /etc/$webserver/conf-available/dolibarr.conf /etc/$webserver/conf.d/dolibarr.conf
+	if which a2enconf >/dev/null 2>&1 ;then
+		# a2enconf exists for ubuntu only
+		a2enconf dolibarr
+	else 
+		if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then
+			echo "Add link for Apache config file"
+			ln -s /etc/$webserver/conf-available/dolibarr.conf /etc/$webserver/conf.d/dolibarr.conf
+		fi
 	fi
 }

 lighttpd_install() {
-	if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then
-		if which lighty-enable-mod >/dev/null 2>&1 ; then
-			echo "Enable lighttpd link for dolibarr config file"
-			lighty-enable-mod dolibarr fastcgi-php
-		else
-			echo "Lighttpd not installed, skipping"
-		fi
+	if which lighty-enable-mod >/dev/null 2>&1 ; then
+		echo "Enable lighttpd link for dolibarr config file"
+		lighty-enable-mod dolibarr fastcgi-php
+	else
+		echo "Lighttpd not installed, skipping"
 	fi
 }

@ -79,6 +87,12 @@ case "$1" in
 		else
 			echo This is not a first install
 		fi
+
+		# Apache 2 setup
+		if which a2enmod >/dev/null 2>&1 ;then
+			a2enmod alias
+		fi
+		
 		apache_install
 		lighttpd_install
 		
--- a/build/debian/dolibarr.postrm
+++ b/build/debian/dolibarr.postrm
@ -177,18 +177,19 @@ case "$1" in
 			    passopt="--password='"`echo "$dbadmpass" | sed -e "s/'/'"'"'"'"'"'"'/g"`"'"
 			fi
 			mysqlcmd="mysql $hostopt $passopt -u $dbadmin"
-
+			mysqlcmdnopass="mysql $hostopt -u $dbadmin"
+			
 		    # Now run the drop user
 			if eval $mysqlcmd -f -e "\"DROP USER '$dbuser'@'localhost';\"" ; then
 				echo postrm Database login $dbuser@localhost removed
 			else
-			    error="Unable to run $mysqlcmd -f -e \"DROP USER '$dbuser'@'localhost';\""
+			    error="Unable to run $mysqlcmdnopass -f -e \"DROP USER '$dbuser'@'localhost';\""
 				echo postrm $error
 			fi
 			if eval $mysqlcmd -f -e "\"DROP USER '$dbuser'@'%';\"" ; then
 				echo postrm Database login $dbuser@% removed
 			else
-			    error="Unable to run $mysqlcmd -f -e \"DROP USER '$dbuser'@'%';\""
+			    error="Unable to run $mysqlcmdnopass -f -e \"DROP USER '$dbuser'@'%';\""
 				echo postrm $error
 			fi

--- a/build/debian/install.forced.php.install
+++ b/build/debian/install.forced.php.install
@ -27,20 +27,20 @@ $force_install_lockinstall='444';

 // Value to overwrite path to use shared libraries/fonts instead of embedded one.
 // If we enable/disable libraries declaration during install, we must also check they are 
-// not removed from package (see in rules file),
-// declared into dependencies (see in control file)
-$force_dolibarr_lib_TCPDF_PATH='';
-$force_dolibarr_lib_FPDF_PATH='/usr/share/php/fpdf';
-$force_dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi';
-$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
-$force_dolibarr_lib_GEOIP_PATH='';
-$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
-$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
-$force_dolibarr_lib_PHPEXCEL_PATH='';
-$force_dolibarr_js_CKEDITOR='/javascript/ckeditor';
-$force_dolibarr_js_JQUERY='/javascript/jquery';
-$force_dolibarr_js_JQUERY_UI='/javascript/jquery-ui';
-$force_dolibarr_js_JQUERY_FLOT='/javascript/flot';
-$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf';
+// - not removed from package (see rm in rules file),
+// - declared into dependencies (see Depends in control file)
+//$force_dolibarr_lib_TCPDF_PATH='';
+//$force_dolibarr_lib_FPDF_PATH='/usr/share/php/fpdf';
+//$force_dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi';
+//$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
+//$force_dolibarr_lib_GEOIP_PATH='';
+//$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
+//$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
+//$force_dolibarr_lib_PHPEXCEL_PATH='';
+//$force_dolibarr_js_CKEDITOR='/javascript/ckeditor';
+//$force_dolibarr_js_JQUERY='/javascript/jquery';
+//$force_dolibarr_js_JQUERY_UI='/javascript/jquery-ui';
+//$force_dolibarr_js_JQUERY_FLOT='/javascript/flot';
+//$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf';

 ?>
--- a/build/debian/rules
+++ b/build/debian/rules
@ -90,32 +90,33 @@ clean:
 	rm -fr build/rpm
 	rm -fr build/zip
 	
-	# clean from all embedded libraries (we use package dependencies instead)
-	rm -fr htdocs/includes/adodbtime
-	rm -fr htdocs/includes/ckeditor
+	# clean from all PHP embedded libraries (we use package dependencies instead)
+#	rm -fr htdocs/includes/adodbtime
 #	rm -fr htdocs/includes/fpdfi
-	rm -fr htdocs/includes/fonts
-	rm -fr htdocs/includes/geoip
-	rm -fr htdocs/includes/nusoap
-	rm -fr htdocs/includes/odtphp/zip/pclzip
-	rm -fr htdocs/includes/phpmailer
-	rm -fr htdocs/includes/jquery/css
-	rm -fr htdocs/includes/jquery/js
-	rm -fr htdocs/includes/jquery/plugins/flot
-	rm -fr htdocs/includes/jquery/plugins/jstree
-	rm -fr htdocs/includes/jquery/plugins/lightbox
+#	rm -fr htdocs/includes/geoip
+#	rm -fr htdocs/includes/nusoap
+#	rm -fr htdocs/includes/odtphp/zip/pclzip
+	# clean from all JS-CSS embedded libraries (we use package dependencies instead)
+#	rm -fr htdocs/includes/ckeditor
+#	rm -fr htdocs/includes/jquery/js
+#	rm -fr htdocs/includes/jquery/css
+#	rm -fr htdocs/includes/jquery/plugins/flot
+	# clean from all embedded fonts (we use package dependencies instead)
+#	rm -fr htdocs/includes/fonts
+
+	# clean from useless files
 	rm -fr htdocs/includes/jquery/plugins/multiselect
 	rm -fr htdocs/includes/phpexcel/PHPExcel/Shared/PDF
 	rm -fr htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip
 	rm -fr htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33
 	rm -fr htdocs/includes/tcpdf/fonts/freefont-20100919
 	rm -fr htdocs/includes/tcpdf/fonts/utils
-
 	# clean from files to avoid warning of missing dependencies
 	rm -fr htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.py

-	# Licence files are included into copyright file.
-	rm -fr htdocs/includes/phpexcel/license.txt
+	# Licence files are already included into copyright file.
+	rm -f  htdocs/includes/jquery/plugins/flot/LICENSE.txt
+	rm -f  htdocs/includes/phpexcel/license.txt
 	rm -f  htdocs/includes/tcpdf/LICENSE.TXT

 	dh $@
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@ -46,7 +46,7 @@ $FILENAMETGZ="$PROJECT-$MAJOR.$MINOR.$BUILD";
 $FILENAMEZIP="$PROJECT-$MAJOR.$MINOR.$BUILD";
 $FILENAMEXZ="$PROJECT-$MAJOR.$MINOR.$BUILD";
 $FILENAMERPM="$PROJECT-$MAJOR.$MINOR.$BUILD-$RPMSUBVERSION";
-$FILENAMEDEB="${PROJECT}_${MAJOR}.${MINOR}.${BUILD}";
+$FILENAMEDEB="see later";
 $FILENAMEAPS="$PROJECT-$MAJOR.$MINOR.$BUILD.app";
 $FILENAMEEXEDOLIWAMP="DoliWamp-$MAJOR.$MINOR.$BUILD";
 if (-d "/usr/src/redhat")   { $RPMDIR="/usr/src/redhat"; } # redhat
@ -365,6 +365,8 @@ if ($nboftargetok) {
        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.pl`;    # Avoid errors into rpmlint
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/template`;  # Package not valid for most linux distributions (errors reported into compile.js). Package should be embed by modules to avoid problems.
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpmailer`;                # Package not valid for most linux distributions (errors reported into file LICENSE). Package should be embed by modules to avoid problems.
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`;		# Keep this removal in case we embed libraries
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/adapters`;	# Keep this removal in case we embed libraries
   	    
 	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
@ -613,15 +615,17 @@ if ($nboftargetok) {
            $newbuild =~ s/(dev|alpha)/1/gi;                # dev
            $newbuild =~ s/beta/2/gi;                       # beta
            $newbuild =~ s/rc./3/gi;                        # rc
-            if ($newbuild !~ /-/) { $newbuild.='-4'; }      # finale
-            # now newbuild is 0-1 or 0-4 for example
+            if ($newbuild !~ /-/) { $newbuild.='-3'; }      # finale is same than rc
+            # now newbuild is 0-1 or 0-3 for example
            print "Version is $MAJOR.$MINOR.$newbuild\n";
            $build = $newbuild;
            $build =~ s/-.*$//g;
 			# now build is 0 for example
 			# $build .= '+nmu1';
 			# now build is 0+nmu1 for example
-			
+
+			$FILENAMEDEB="${PROJECT}_${MAJOR}.${MINOR}.${newbuild}";
+
    		print "Remove target ${FILENAMEDEB}_all.deb...\n";
    		unlink("$NEWDESTI/${FILENAMEDEB}_all.deb");
    		print "Remove target ${FILENAMEDEB}.dsc...\n";
@ -676,12 +680,14 @@ if ($nboftargetok) {
            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/rpm`;
            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/zip`;
            # We remove embedded libraries or fonts (this is also inside rules file, target clean)
-	   	    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/fonts`,
-	   	    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/geoip`;
-	   	    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/nusoap`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/odtphp/zip/pclzip`;
-
+	   	    #$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor`;
+			#$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/fonts`,
+	   	    #$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/geoip`;
+	   	    #$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/nusoap`;
+            #$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/odtphp/zip/pclzip`;
+            # Rename upstream changelog to match debian rules
+			$ret=`mv $BUILDROOT/$PROJECT.tmp/ChangeLog $BUILDROOT/$PROJECT.tmp/changelog`;
+			
            # Prepare source package (init debian dir)
            print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n";
            $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`;
@ -753,6 +759,8 @@ if ($nboftargetok) {

            chdir("$olddir");
    		
+    		print "You can check package with lintian --pedantic -E -I \"$NEWDESTI/${FILENAMEDEB}_all.deb\"\n";
+    		
    		# Move to final dir
            print "Move *_all.deb to $NEWDESTI\n";
            $ret=`mv $BUILDROOT/*_all.deb "$NEWDESTI/"`;
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@ -88,7 +88,7 @@ print '<br>';

 // Show info setup module
 print img_picto('','puce').' '.$langs->trans("SetupDescription4",DOL_URL_ROOT.'/admin/modules.php?mainmenu=home');
-if (count($conf->modules) <= (empty($conf->global->MAIN_MINNB_MODULE)?1:$conf->global->MAIN_MINNB_MODULE))	// If only user module enabled
+if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING)?1:$conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING))	// If only user module enabled
 {
 	$langs->load("errors");
 	$warnpicto=img_warning($langs->trans("WarningMandatorySetupNotComplete"));
@ -97,6 +97,7 @@ if (count($conf->modules) <= (empty($conf->global->MAIN_MINNB_MODULE)?1:$conf->g
 print '<br>';
 print '<br>';
 print '<br>';
+print '<br>';

 // Add hook to add information
 $reshook=$hookmanager->executeHooks('addHomeSetup',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@ -132,7 +132,7 @@ function invoice_admin_prepare_head($object)
 	$head[$h][2] = 'attributes';
 	$h++;

-    if ($conf->global->FEATURES_LEVEL >= 2)	// FIXME This feature will works when form for predefined and free product will be merged, otherwise there is duplicate fields with same name
+    if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// FIXME This feature will works when form for predefined and free product will be merged, otherwise there is duplicate fields with same name
    {
 	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/admin/facturedet_cust_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFieldsLines");
--- a/htdocs/core/lib/order.lib.php
+++ b/htdocs/core/lib/order.lib.php
@ -138,7 +138,7 @@ function order_admin_prepare_head($object)
 	$head[$h][2] = 'attributes';
 	$h++;

-    if ($conf->global->FEATURES_LEVEL >= 2)	// FIXME This feature will works when form for predefined and free product will be merged, otherwise there is duplicate fields with same name
+    if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// FIXME This feature will works when form for predefined and free product will be merged, otherwise there is duplicate fields with same name
    {
 	$head[$h][0] = DOL_URL_ROOT.'/admin/orderdet_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFieldsLines");
--- a/htdocs/core/lib/propal.lib.php
+++ b/htdocs/core/lib/propal.lib.php
@ -136,7 +136,7 @@ function propal_admin_prepare_head($object)
    $head[$h][2] = 'attributes';
    $h++;

-    if ($conf->global->FEATURES_LEVEL >= 2)	// FIXME This feature will works when form for predefined and free product will be merged, otherwise there is duplicate fields with same name
+    if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// FIXME This feature will works when form for predefined and free product will be merged, otherwise there is duplicate fields with same name
    {
    $head[$h][0] = DOL_URL_ROOT.'/comm/admin/propaldet_extrafields.php';
    $head[$h][1] = $langs->trans("ExtraFieldsLines");
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@ -155,7 +155,7 @@ if ($id > 0 || ! empty($ref))

 		// Third party
 		print "<tr><td>".$langs->trans("Supplier")."</td>";
-		print '<td colspan="3">'.$object->client->getNomUrl(1,'compta').'</td></tr>';
+		print '<td colspan="3">'.$object->thirdparty->getNomUrl(1,'supplier').'</td></tr>';
 		print "</table>";

 		print '</div>';
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@ -120,7 +120,7 @@ if ($object->id > 0)
 	print "</tr>\n";

 	// Thirdparty
-	print '<tr><td>'.$langs->trans('Supplier').'</td><td colspan="3">'.$object->thirdparty->getNomUrl(1).'</td></tr>';
+	print '<tr><td>'.$langs->trans('Supplier').'</td><td colspan="3">'.$object->thirdparty->getNomUrl(1,'supplier').'</td></tr>';

 	// Type
 	print '<tr><td>'.$langs->trans('Type').'</td><td colspan="4">';
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@ -1511,7 +1511,7 @@ else
        print '</td></tr>';

        // Third party
-        print '<tr><td>'.$langs->trans('Supplier').'</td><td colspan="4">'.$societe->getNomUrl(1);
+        print '<tr><td>'.$langs->trans('Supplier').'</td><td colspan="4">'.$societe->getNomUrl(1,'supplier');
        print ' &nbsp; (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->socid.'">'.$langs->trans('OtherBills').'</a>)</td>';
        print '</tr>';

--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@ -93,7 +93,7 @@ if ($object->id > 0)
 	print "</tr>\n";

 	// Company
-	print '<tr><td>'.$langs->trans('Supplier').'</td><td colspan="3">'.$object->thirdparty->getNomUrl(1).'</td></tr>';
+	print '<tr><td>'.$langs->trans('Supplier').'</td><td colspan="3">'.$object->thirdparty->getNomUrl(1,'supplier').'</td></tr>';

 	// Type
 	print '<tr><td>'.$langs->trans('Type').'</td><td colspan="4">';
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@ -162,9 +162,9 @@ if ($action == 'add_paiement')
 if ($action == 'confirm_paiement' && $confirm == 'yes')
 {
    $error=0;
-	
+
    $datepaye = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-    
+
    if (! $error)
    {
        $db->begin();
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@ -68,33 +68,36 @@ if ($action == 'setcodecompta')
 	}
 }

-if ($action == 'COMPANY_USE_SEARCH_TO_SELECT')
+if ($action == 'updateoptions')
 {
-	$companysearch = GETPOST('activate_COMPANY_USE_SEARCH_TO_SELECT','alpha');
-	$res = dolibarr_set_const($db, "COMPANY_USE_SEARCH_TO_SELECT", $companysearch,'chaine',0,'',$conf->entity);
-	if (! $res > 0) $error++;
-	if (! $error)
-    {
-        $mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
-    }
-    else
-    {
-        $mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
-	}
-}
-
-if ($action == 'CONTACT_USE_SEARCH_TO_SELECT')
-{
-	$contactsearch = GETPOST('activate_CONTACT_USE_SEARCH_TO_SELECT','alpha');
-	$res = dolibarr_set_const($db, "CONTACT_USE_SEARCH_TO_SELECT", $contactsearch,'chaine',0,'',$conf->entity);
-	if (! $res > 0) $error++;
-	if (! $error)
+	if (GETPOST('COMPANY_USE_SEARCH_TO_SELECT'))
 	{
-		$mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+		$companysearch = GETPOST('activate_COMPANY_USE_SEARCH_TO_SELECT','alpha');
+		$res = dolibarr_set_const($db, "COMPANY_USE_SEARCH_TO_SELECT", $companysearch,'chaine',0,'',$conf->entity);
+		if (! $res > 0) $error++;
+		if (! $error)
+	    {
+	        $mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+	    }
+	    else
+	    {
+	        $mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+		}
 	}
-	else
+	
+	if (GETPOST('CONTACT_USE_SEARCH_TO_SELECT'))
 	{
-		$mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+		$contactsearch = GETPOST('activate_CONTACT_USE_SEARCH_TO_SELECT','alpha');
+		$res = dolibarr_set_const($db, "CONTACT_USE_SEARCH_TO_SELECT", $contactsearch,'chaine',0,'',$conf->entity);
+		if (! $res > 0) $error++;
+		if (! $error)
+		{
+			$mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+		}
+		else
+		{
+			$mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+		}
 	}
 }

@ -698,6 +701,11 @@ print_titre($langs->trans("Other"));
 // Autres options
 $form=new Form($db);
 $var=true;
+
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="updateoptions">';
+
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print "<td>".$langs->trans("Parameters")."</td>\n";
@ -706,9 +714,6 @@ print '<td width="80">&nbsp;</td></tr>'."\n";

 // Utilisation formulaire Ajax sur choix societe
 $var=!$var;
-print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="COMPANY_USE_SEARCH_TO_SELECT">';
 print "<tr ".$bc[$var].">";
 print '<td width="80%">'.$langs->trans("UseSearchToSelectCompany").'</td>';
 if (! $conf->use_javascript_ajax)
@ -727,35 +732,13 @@ else
 	);
 	print $form->selectarray("activate_COMPANY_USE_SEARCH_TO_SELECT",$arrval,$conf->global->COMPANY_USE_SEARCH_TO_SELECT);
 	print '</td><td align="right">';
-	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print '<input type="submit" class="button" name="COMPANY_USE_SEARCH_TO_SELECT" value="'.$langs->trans("Modify").'">';
 	print "</td>";
 }
 print '</tr>';
-print '</form>';

 $var=!$var;
 print "<tr ".$bc[$var].">";
-print '<td width="80%">'.$langs->trans("AddRefInList").'</td>';
-if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST))
-{
-	print '<td align="center" colspan="2"><a href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=0">';
-	print img_picto($langs->trans("Activated"),'switch_on');
-	print '</a></td>';
-}
-else
-{
-	print '<td align="center" colspan="2"><a href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=1">';
-	print img_picto($langs->trans("Disabled"),'switch_off');
-	print '</a></td>';
-}
-print '</tr>';
-
-
-$var=!$var;
-print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="CONTACT_USE_SEARCH_TO_SELECT">';
-print "<tr ".$bc[$var].">";
 print '<td width="80%">'.$langs->trans("UseSearchToSelectContact").'</td>';
 if (! $conf->use_javascript_ajax)
 {
@ -773,11 +756,30 @@ else
 	);
 	print $form->selectarray("activate_CONTACT_USE_SEARCH_TO_SELECT",$arrval,$conf->global->CONTACT_USE_SEARCH_TO_SELECT);
 	print '</td><td align="right">';
-	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print '<input type="submit" class="button" name="CONTACT_USE_SEARCH_TO_SELECT" value="'.$langs->trans("Modify").'">';
 	print "</td>";
 }
 print '</tr>';

+
+$var=!$var;
+print "<tr ".$bc[$var].">";
+print '<td width="80%">'.$langs->trans("AddRefInList").'</td>';
+if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST))
+{
+	print '<td align="center" colspan="2"><a href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=0">';
+	print img_picto($langs->trans("Activated"),'switch_on');
+	print '</a></td>';
+}
+else
+{
+	print '<td align="center" colspan="2"><a href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=1">';
+	print img_picto($langs->trans("Disabled"),'switch_off');
+	print '</a></td>';
+}
+print '</tr>';
+
+
 /*
 // COMPANY_USE_SEARCH_TO_SELECT
 $var=!$var;
@ -800,6 +802,7 @@ print '</tr>';

 print '</table>';

+print '</form>';


 dol_fiche_end();