Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into

dev_fix5353

Conflicts:
	htdocs/core/modules/mailings/advthirdparties.modules.php

build/exe/doliwamp/dolibarr.conf.install

@@ -1,6 +1,6 @@
 Alias /dolibarr "WAMPROOT/www/dolibarr/htdocs/" 
 
-# NOTE:
+# NOTE FOR APACHE 2.2:
 # To restrict access to dolibarr from outside set lines
 #
 #	Order Deny,Allow
@@ -12,10 +12,21 @@ Alias /dolibarr "WAMPROOT/www/dolibarr/htdocs/"
 #	Order Allow,Deny 
 #	Allow from all
 #
+# NOTE FOR APACHE 2.3:
+# To restrict access to dolibarr from outside set lines
+#
+#	<RequireAny>
+#	Require ip 127.0.0.1
+#	Require host localhost
+#   <RequireAny>
+#
+# instead of
+#
+#	Require all granted
+#
 
 <Directory "WAMPROOT/www/dolibarr/htdocs/">
 	Options Indexes FollowSymLinks MultiViews
 	AllowOverride all
-	Order Allow,Deny 
+	Require all granted
-	Allow from all
 </Directory>

build/exe/doliwamp/doliwamp.iss

@@ -101,7 +101,7 @@ Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversi
 ; Put here path of Wampserver applications
 ; Value OK: apache 2.2.6, php 5.2.5 (5.2.11, 5.3.0 and 5.3.1 fails if php_exif, php_pgsql, php_zip is on), mysql 5.0.45 or 5.1.36
 ; Value OK: apache 2.2.11, php 5.3.0 (if no php_exif, php_pgsql, php_zip), mysql 5.0.45 or 5.1.36
-; Value ???: apache 2.4.19, php 5.5.12, mysql 5.6.17
+; Value ???: apache 2.4.19, php 5.5.12, mysql 5.6.17 (wampserver2.5-Apache-2.4.9-Mysql-5.6.17-php5.5.12-32b.exe)
 Source: "C:\Program Files\Wamp\apps\phpmyadmin4.1.14\*.*"; DestDir: "{app}\apps\phpmyadmin4.1.14"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log,darkblue_orange"
 Source: "C:\Program Files\Wamp\bin\apache\apache2.4.9\*.*"; DestDir: "{app}\bin\apache\apache2.4.9"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
 Source: "C:\Program Files\Wamp\bin\php\php5.5.12\*.*"; DestDir: "{app}\bin\php\php5.5.12"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
@@ -119,8 +119,8 @@ Source: "build\exe\doliwamp\phpmyadmin.conf.install"; DestDir: "{app}\alias"; Fl
 Source: "build\exe\doliwamp\dolibarr.conf.install"; DestDir: "{app}\alias"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\config.inc.php.install"; DestDir: "{app}\apps\phpmyadmin4.1.14"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.4.9\conf"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mysql\mysql5.5.12"; Flags: ignoreversion;
+Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mysql\mysql5.6.17"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php5.6.17"; Flags: ignoreversion;
+Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php5.5.12"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\index.php.install"; DestDir: "{app}\www"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\install.forced.php.install"; DestDir: "{app}\www\dolibarr\htdocs\install"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\openssl.conf"; DestDir: "{app}"; Flags: ignoreversion;
@@ -338,11 +338,11 @@ begin
     // Test if VC11Redist has been installed
     //----------------------------------------------
 	
-    if not FileExists ('c:/windows/system32/msvcr70.dll') and not FileExists ('c:/windows/sysWOW64/msvcr70.dll') and not FileExists ('c:/winnt/system32/msvcr70.dll') and not FileExists ('c:/winnt/sysWOW64/msvcr70.dll') then
+    if not FileExists ('c:/windows/system32/msvcr110.dll') and not FileExists ('c:/windows/sysWOW64/msvcr110.dll') and not FileExists ('c:/winnt/system32/msvcr110.dll') and not FileExists ('c:/winnt/sysWOW64/msvcr110.dll') then
     begin
       // TODO Copy file or ask to install package ?
       //CustomMessage('YouWillInstallDoliWamp')+#13#13
-      MsgBox('The package vcredist_x64.exe or vcredist_86.exe must have been installed first. It seems it is not. Please install it first from <a href="http://ccc">http://www.microsoft.com/en-us/download/details.aspx?id=30679</a> then restart DoliWamp installation/upgrade.',mbInformation,MB_OK);
+      MsgBox('The package vcredist_x86.exe must have been installed first. It seems it is not. Please install it first from <a href="http://ccc">http://www.microsoft.com/en-us/download/details.aspx?id=30679</a> then restart DoliWamp installation/upgrade.',mbInformation,MB_OK);
     end;
 
 
@@ -675,7 +675,7 @@ begin
 		      //installDir et version de php
 		      StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
 		      StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
-		      StringChangeEx (srcContents, 'WAMPMYSQLVERSION', myport, True);
+		      StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
 		    end
@@ -749,6 +749,7 @@ begin
 		      LoadStringFromFile (srcFile, srcContents);
 		
 		      //version de apache et mysql
+		      StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
 		      StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True);
 		      StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True);
 		
@@ -757,27 +758,6 @@ begin
 		
 		
 		
-		    //----------------------------------------------
-		    // Create file install_services_auto.bat (always)
-		    //----------------------------------------------
-		
-		    destFile := pathWithSlashes+'/install_services_auto.bat';
-		    srcFile := pathWithSlashes+'/install_services_auto.bat.install';
-		
-		    if FileExists (srcFile) then
-		    begin
-		      LoadStringFromFile (srcFile, srcContents);
-		
-		      //version de apache et mysql
-		      StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True);
-		      StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True);
-		
-		      SaveStringToFile(destFile,srcContents, False);
-		    end
-		
-		
-		
-		
 		    //----------------------------------------------
 		    // Create file uninstall_services.bat (always)
 		    //----------------------------------------------
@@ -790,6 +770,7 @@ begin
 		      LoadStringFromFile (srcFile, srcContents);
 		
 		      //version de apache et mysql
+		      StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
 		      StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True);
 		      StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True);
 		
@@ -978,7 +959,6 @@ end;
 procedure DeinitializeSetup();
 begin
 //  DeleteFile(path+'\install_services.bat');
-//  DeleteFile(path+'\install_services_auto.bat');
 end;
 
 

build/exe/doliwamp/httpd.conf.install

@@ -66,19 +66,23 @@ Listen WAMPAPACHEPORT
 #
 LoadModule actions_module modules/mod_actions.so
 LoadModule alias_module modules/mod_alias.so
+LoadModule allowmethods_module modules/mod_allowmethods.so
 LoadModule asis_module modules/mod_asis.so
 LoadModule auth_basic_module modules/mod_auth_basic.so
 #LoadModule auth_digest_module modules/mod_auth_digest.so
 #LoadModule authn_anon_module modules/mod_authn_anon.so
 #LoadModule authn_dbm_module modules/mod_authn_dbm.so
-LoadModule authn_default_module modules/mod_authn_default.so
 LoadModule authn_file_module modules/mod_authn_file.so
+LoadModule authz_core_module modules/mod_authz_core.so
 #LoadModule authz_dbm_module modules/mod_authz_dbm.so
-LoadModule authz_default_module modules/mod_authz_default.so
+#LoadModule authz_default_module modules/mod_authz_default.so
 LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
 LoadModule authz_host_module modules/mod_authz_host.so
 LoadModule authz_user_module modules/mod_authz_user.so
 LoadModule autoindex_module modules/mod_autoindex.so
+LoadModule buffer_module modules/mod_buffer.so
+LoadModule cache_module modules/mod_cache.so
+LoadModule cache_disk_module modules/mod_cache_disk.so
 #LoadModule cern_meta_module modules/mod_cern_meta.so
 LoadModule cgi_module modules/mod_cgi.so
 #LoadModule dav_module modules/mod_dav.so
@@ -96,23 +100,23 @@ LoadModule isapi_module modules/mod_isapi.so
 LoadModule log_config_module modules/mod_log_config.so
 LoadModule mime_module modules/mod_mime.so
 #LoadModule mime_magic_module modules/mod_mime_magic.so
+LoadModule negotiation_module modules/mod_negotiation.so
 #LoadModule proxy_module modules/mod_proxy.so
 #LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
 #LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
 #LoadModule proxy_connect_module modules/mod_proxy_connect.so
 #LoadModule proxy_http_module modules/mod_proxy_http.so
 #LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
-LoadModule negotiation_module modules/mod_negotiation.so
 LoadModule rewrite_module modules/mod_rewrite.so
 LoadModule setenvif_module modules/mod_setenvif.so
 #LoadModule speling_module modules/mod_speling.so
+#LoadModule ssl_module modules/mod_ssl.so
 LoadModule status_module modules/mod_status.so
 #LoadModule unique_id_module modules/mod_unique_id.so
 LoadModule userdir_module modules/mod_userdir.so
 #LoadModule usertrack_module modules/mod_usertrack.so
 LoadModule vhost_alias_module modules/mod_vhost_alias.so
-#LoadModule ssl_module modules/mod_ssl.so
+LoadModule php5_module "WAMPROOT/bin/php/phpWAMPPHPVERSION/php5apache2_4.dll"
-LoadModule php5_module "WAMPROOT/bin/php/phpWAMPPHPVERSION/php5apache2_2.dll"
 
 #
 # ExtendedStatus controls whether Apache will generate "full" status
@@ -123,9 +127,9 @@ ExtendedStatus On
 
 <Location /server-status>
 SetHandler server-status
-Order Deny,Allow
+Require local
-Deny from all
+#Require ip 1.2.3.4
-Allow from localhost, 127.0.0.1
+#Require host 1.2.3.4
 </Location>
 
 
@@ -211,9 +215,7 @@ KeepAliveTimeout 30
 <Directory />
     Options FollowSymLinks
     AllowOverride None
-    Order deny,allow
+    Require all denied
-    Deny from all
-    Satisfy all
 </Directory>
 
 #
@@ -253,9 +255,10 @@ KeepAliveTimeout 30
     # Controls who can get stuff from this server.
     #
 #   onlineoffline tag - don't remove
-    Order Deny,Allow
+    <RequireAny>
-    Deny from all
+		Require ip 127.0.0.1
-    Allow from 127.0.0.1
+		Require host localhost
+	</RequireAny>
 
 </Directory>
 
@@ -272,8 +275,7 @@ KeepAliveTimeout 30
 # viewed by Web clients. 
 #
 <FilesMatch "^\.ht">
-    Order allow,deny
+    Require all denied
-    Deny from all
 </FilesMatch>
 
 #
@@ -359,8 +361,7 @@ LogLevel warn
 <Directory "cgi-bin">
     AllowOverride None
     Options None
-    Order allow,deny
+    Require all granted
-    Allow from all
 </Directory>
 
 # 
@@ -410,7 +411,7 @@ LogLevel warn
 # keep browsers from trying to display binary files as though they are
 # text.
 #
-DefaultType text/plain
+#DefaultType text/plain
 
 <IfModule mime_module>
     #

build/exe/doliwamp/install_services.bat.install

@@ -8,14 +8,18 @@ echo ---- Execute install_services.bat >> doliwamp.log 2>>&1
 REM NET STOP doliwampapache
 REM NET STOP doliwampmysqld 
 
+cd "WAMPROOT"
+
 REM Apache x.x
 .\bin\apache\apacheWAMPAPACHEVERSION\bin\httpd.exe -k install -n doliwampapache
 REM reg add HKLM\SYSTEM\CurrentControlSet\Services\doliwampapache /V Start /t REG_DWORD /d 3 /f
 
 REM Mysql 5.0-
 REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --install-manual doliwampmysqld
-.\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --install doliwampmysqld
+REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --install doliwampmysqld
 REM Mysql 5.1+
-REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --install doliwampmysqld
+.\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --install doliwampmysqld
 
 echo ---- End script >> doliwamp.log 2>>&1
+
+REM pause

build/exe/doliwamp/my.ini.install

@@ -77,10 +77,6 @@ log-error=WAMPROOT/logs/mysql.log
 #Path to the database root
 datadir=WAMPROOT/bin/mysql/data
 
-# The default character set that will be used when a new schema or table is
-# created and no character set is defined
-default-character-set=latin1
-
 # The default storage engine that will be used when create new tables when
 default-storage-engine=INNODB
 
@@ -101,13 +97,6 @@ max_connections=255
 # slowdown instead of a performance improvement.
 query_cache_size=8M
 
-# The number of open tables for all threads. Increasing this value
-# increases the number of file descriptors that mysqld requires.
-# Therefore you have to make sure to set the amount of open files
-# allowed to at least 4096 in the variable "open-files-limit" in
-# section [mysqld_safe]
-table_cache=510
-
 # Maximum size for internal (in-memory) temporary tables. If a table
 # grows larger than this value, it is automatically converted to disk
 # based table This limitation is for a single table. There can be many
@@ -125,18 +114,6 @@ thread_cache_size=12
 
 #*** MyISAM Specific options
 
-# The maximum size of the temporary file MySQL is allowed to use while
-# recreating the index (during REPAIR, ALTER TABLE or LOAD DATA INFILE.
-# If the file-size would be bigger than this, the index will be created
-# through the key cache (which is slower).
-myisam_max_sort_file_size=100G
-
-# If the temporary file used for fast index creation would be bigger
-# than using the key cache by the amount specified here, then prefer the
-# key cache method.  This is mainly used to force long character keys in
-# large tables to use the slower key cache method to create the index.
-myisam_max_extra_sort_file_size=100G
-
 # If the temporary file used for fast index creation would be bigger
 # than using the key cache by the amount specified here, then prefer the
 # key cache method.  This is mainly used to force long character keys in
@@ -170,13 +147,6 @@ sort_buffer_size=203K
 # and speed up some things.
 #skip-innodb
 
-# Additional memory pool that is used by InnoDB to store metadata
-# information.  If InnoDB requires more memory for this purpose it will
-# start to allocate it from the OS.  As this is fast enough on most
-# recent operating systems, you normally do not need to change this
-# value. SHOW INNODB STATUS will display the current amount used.
-innodb_additional_mem_pool_size=2M
-
 # If set to 1, InnoDB will flush (fsync) the transaction logs to the
 # disk at each commit, which offers full ACID behavior. If you are
 # willing to compromise this safety, and you are running small
@@ -234,10 +204,6 @@ log-error=WAMPROOT/logs/mysql.log
 #Path to the database root
 datadir=WAMPROOT/bin/mysql/data
 
-# The default character set that will be used when a new schema or table is
-# created and no character set is defined
-default-character-set=latin1
-
 # The default storage engine that will be used when create new tables when
 default-storage-engine=INNODB
 
@@ -258,13 +224,6 @@ max_connections=255
 # slowdown instead of a performance improvement.
 query_cache_size=8M
 
-# The number of open tables for all threads. Increasing this value
-# increases the number of file descriptors that mysqld requires.
-# Therefore you have to make sure to set the amount of open files
-# allowed to at least 4096 in the variable "open-files-limit" in
-# section [mysqld_safe]
-table_cache=510
-
 # Maximum size for internal (in-memory) temporary tables. If a table
 # grows larger than this value, it is automatically converted to disk
 # based table This limitation is for a single table. There can be many
@@ -282,18 +241,6 @@ thread_cache_size=12
 
 #*** MyISAM Specific options
 
-# The maximum size of the temporary file MySQL is allowed to use while
-# recreating the index (during REPAIR, ALTER TABLE or LOAD DATA INFILE.
-# If the file-size would be bigger than this, the index will be created
-# through the key cache (which is slower).
-myisam_max_sort_file_size=100G
-
-# If the temporary file used for fast index creation would be bigger
-# than using the key cache by the amount specified here, then prefer the
-# key cache method.  This is mainly used to force long character keys in
-# large tables to use the slower key cache method to create the index.
-myisam_max_extra_sort_file_size=100G
-
 # If the temporary file used for fast index creation would be bigger
 # than using the key cache by the amount specified here, then prefer the
 # key cache method.  This is mainly used to force long character keys in
@@ -327,13 +274,6 @@ sort_buffer_size=203K
 # and speed up some things.
 #skip-innodb
 
-# Additional memory pool that is used by InnoDB to store metadata
-# information.  If InnoDB requires more memory for this purpose it will
-# start to allocate it from the OS.  As this is fast enough on most
-# recent operating systems, you normally do not need to change this
-# value. SHOW INNODB STATUS will display the current amount used.
-innodb_additional_mem_pool_size=2M
-
 # If set to 1, InnoDB will flush (fsync) the transaction logs to the
 # disk at each commit, which offers full ACID behavior. If you are
 # willing to compromise this safety, and you are running small

build/exe/doliwamp/phpmyadmin.conf.install

@@ -1,22 +1,35 @@
 Alias /phpmyadmin "WAMPROOT/apps/phpmyadminWAMPPHPMYADMINVERSION/" 
 
-# to give access to phpmyadmin from outside 
+# NOTE FOR APACHE 2.2:
-# replace the lines
+# To grant access to dolibarr from outside set lines
 #
-#        Order Deny,Allow
+#	Order Allow,Deny 
+#	Allow from all
+#
+# instead of
+#
+#	Order Deny,Allow
 #	Deny from all
 #	Allow from 127.0.0.1
 #
-# by
+# NOTE FOR APACHE 2.3:
+# To grant access to dolibarr from outside set lines
 #
-#        Order Allow,Deny 
+#	Require all granted
-#   Allow from all
+#
+# instead of
+#
+#	<RequireAny>
+#	Require ip 127.0.0.1
+#	Require host localhost
+#   <RequireAny>
 #
 
 <Directory "WAMPROOT/apps/phpmyadminWAMPPHPMYADMINVERSION/">
     Options Indexes FollowSymLinks MultiViews
     AllowOverride all
-        Order Deny,Allow
+	<RequireAny>
-	Deny from all
+	Require ip 127.0.0.1
-	Allow from 127.0.0.1
+	Require host localhost
+    </RequireAny>
 </Directory>

build/exe/doliwamp/startdoliwamp.bat

@@ -10,9 +10,11 @@ NET START doliwampapache >> doliwamp.log 2>>&1
 echo NET START doliwampmysqld >> doliwamp.log 2>>&1
 NET START doliwampmysqld >> doliwamp.log 2>>&1
 
+REM You can also check logs into c:/dolibarr/logs if start fails
+
 echo Please wait...
 echo ---- End script >> doliwamp.log 2>>&1
 
 REM sleep is not a Windows commande
-REM sleep 1
+REM sleep 2
-ping 1.1.1.1 -n 1 -w 1000 > nul
+ping 127.0.0.1 -n 2 -w 1000 > nul

build/exe/doliwamp/startdoliwamp_manual_donotuse.bat.install

@@ -12,6 +12,7 @@ start WAMPROOT\bin\apache\apacheWAMPAPACHEVERSION\bin\httpd.exe -f conf\httpd.co
 echo 
 
 echo Running Mysql as user process (this process does not return so we use "start")
-start WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --defaults-file=WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\my.ini --console
+REM start WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --defaults-file=WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\my.ini --console
+start WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --defaults-file=WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\my.ini --console
 
 pause

build/exe/doliwamp/stopdoliwamp.bat

@@ -16,3 +16,5 @@ echo ---- End script >> doliwamp.log 2>>&1
 REM sleep is not a Windows command
 REM sleep 1
 ping 1.1.1.1 -n 1 -w 1000 > nul
+
+REM pause

build/exe/doliwamp/uninstall_services.bat.install

@@ -3,10 +3,19 @@ REM --------------------------------------------------------
 REM This script install Apache and Mysql DoliWamp services
 REM --------------------------------------------------------
 
+cd "WAMPROOT"
+
 echo ---- Execute uninstall_services.bat >> doliwamp.log 2>>&1
 NET STOP doliwampapache
 .\bin\apache\apacheWAMPAPACHEVERSION\bin\httpd.exe -k uninstall -n doliwampapache
+
 NET STOP doliwampmysqld 
-.\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --remove doliwampmysqld
+REM Mysql 5.0-
+REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --remove doliwampmysqld
+REM Mysql 5.1+
+.\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --remove doliwampmysqld
+
 REM wampmanager.exe -quit -id={doliwampserver}
 echo ---- End script >> doliwamp.log 2>>&1
+
+REM pause

dev/security/htaccess.txt

@@ -1,2 +1 @@
-Order allow,deny
+Require all granted
-Deny from all

htdocs/accountancy/class/accountancycategory.class.php

@@ -297,7 +297,7 @@ class AccountancyCategory
 	 * @param string $year Specific year
 	 * @param int $sens Sens of the account 0: credit - debit 1: debit - credit
 	 *
-	 * @return array Result in table
+	 * @return integer Result in table
 	 */
 	public function getResult($cpt, $month, $year, $sens) {
 		$sql = "SELECT SUM(t.debit) as debit, SUM(t.credit) as credit";

htdocs/admin/company.php

@@ -823,7 +823,8 @@ else
 		if (! empty($conf->global->MAIN_INFO_SIREN))
 		{
 			print $conf->global->MAIN_INFO_SIREN;
-			if ($mysoc->country_code == 'FR') print ' &nbsp; <a href="http://avis-situation-sirene.insee.fr/avisitu/jsp/avis.jsp" target="_blank">'.$langs->trans("Check").'</a>';
+			$s = $mysoc->id_prof_url(1,$mysoc);
+			if ($s) print ' - '.$s;
 		} else {
 			print '&nbsp;';
 		}
@@ -838,6 +839,8 @@ else
 		if (! empty($conf->global->MAIN_INFO_SIRET))
 		{
 			print $conf->global->MAIN_INFO_SIRET;
+			$s = $mysoc->id_prof_url(2,$mysoc);
+			if ($s) print ' - '.$s;
 		} else {
 			print '&nbsp;';
 		}
@@ -852,6 +855,8 @@ else
 		if (! empty($conf->global->MAIN_INFO_APE))
 		{
 			print $conf->global->MAIN_INFO_APE;
+			$s = $mysoc->id_prof_url(3,$mysoc);
+			if ($s) print ' - '.$s;
 		} else {
 			print '&nbsp;';
 		}
@@ -866,6 +871,8 @@ else
 		if (! empty($conf->global->MAIN_INFO_RCS))
 		{
 			print $conf->global->MAIN_INFO_RCS;
+			$s = $mysoc->id_prof_url(4,$mysoc);
+			if ($s) print ' - '.$s;
 		} else {
 			print '&nbsp;';
 		}
@@ -880,6 +887,8 @@ else
 		if (! empty($conf->global->MAIN_INFO_PROFID5))
 		{
 			print $conf->global->MAIN_INFO_PROFID5;
+			$s = $mysoc->id_prof_url(5,$mysoc);
+			if ($s) print ' - '.$s;
 		} else {
 			print '&nbsp;';
 		}
@@ -894,6 +903,8 @@ else
 		if (! empty($conf->global->MAIN_INFO_PROFID6))
 		{
 			print $conf->global->MAIN_INFO_PROFID6;
+			$s = $mysoc->id_prof_url(6,$mysoc);
+			if ($s) print ' - '.$s;
 		} else {
 			print '&nbsp;';
 		}
@@ -909,9 +920,9 @@ else
 		$s='';
 		$s.=$conf->global->MAIN_INFO_TVAINTRA;
 		$s.='<input type="hidden" name="tva_intra" size="12" maxlength="20" value="'.$conf->global->MAIN_INFO_TVAINTRA.'">';
-		if (empty($conf->global->MAIN_DISABLEVATCHECK))
+		if (empty($conf->global->MAIN_DISABLEVATCHECK) && $mysoc->isInEEC())
 		{
-			$s.=' &nbsp; ';
+			$s.=' - ';
 			if (! empty($conf->use_javascript_ajax))
 			{
 				print "\n";

htdocs/admin/prelevement.php

@@ -45,14 +45,6 @@ $action = GETPOST('action','alpha');
 if ($action == "set")
 {
     $db->begin();
-    for ($i = 0 ; $i < 2 ; $i++)
-    {
-    	$res = dolibarr_set_const($db, GETPOST("nom$i",'alpha'), GETPOST("value$i",'alpha'),'chaine',0,'',$conf->entity);
-        if (! $res > 0) $error++;
-    }
-
-    $res = dolibarr_set_const($db, "PRELEVEMENT_ICS", GETPOST("PRELEVEMENT_ICS"),'chaine',0,'',$conf->entity);
-    if (! $res > 0) $error++;
 
     $id=GETPOST('PRELEVEMENT_ID_BANKACCOUNT','int');
     $account = new Account($db);
@@ -78,6 +70,15 @@ if ($action == "set")
     }
     else $error++;
 
+    $res = dolibarr_set_const($db, "PRELEVEMENT_ICS", GETPOST("PRELEVEMENT_ICS"),'chaine',0,'',$conf->entity);
+    if (! $res > 0) $error++;
+    
+    if (GETPOST("PRELEVEMENT_USER") > 0)
+    {
+        $res = dolibarr_set_const($db, "PRELEVEMENT_USER", GETPOST("PRELEVEMENT_USER"),'chaine',0,'',$conf->entity);
+        if (! $res > 0) $error++;
+    }
+    
     if (! $error)
 	{
 		$db->commit();
@@ -131,33 +132,25 @@ print '<td width="30%">'.$langs->trans("Parameter").'</td>';
 print '<td width="40%">'.$langs->trans("Value").'</td>';
 print "</tr>";
 
-//User
-print '<tr class="impair"><td>'.$langs->trans("ResponsibleUser").'</td>';
-print '<td align="left">';
-print '<input type="hidden" name="nom0" value="PRELEVEMENT_USER">';
-print $form->select_dolusers($conf->global->PRELEVEMENT_USER, 'value0', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
-print '</td>';
-print '</tr>';
-
-//Profid1 of Transmitter
-print '<tr class="pair"><td>'.$langs->trans("NumeroNationalEmetter").' - '.$langs->transcountry('ProfId1',$mysoc->country_code).'</td>';
-print '<td align="left">';
-print '<input type="hidden" name="nom1" value="PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR">';
-print '<input type="text"   name="value1" value="'.$conf->global->PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR.'" size="9" ></td>';
-print '</tr>';
-
 // Bank account (from Banks module)
-print '<tr class="impair"><td>'.$langs->trans("BankToReceiveWithdraw").'</td>';
+print '<tr class="impair"><td class="fieldrequired">'.$langs->trans("BankToReceiveWithdraw").'</td>';
 print '<td align="left">';
 $form->select_comptes($conf->global->PRELEVEMENT_ID_BANKACCOUNT,'PRELEVEMENT_ID_BANKACCOUNT',0,"courant=1",1);
 print '</td></tr>';
 
 // ICS
-print '<tr class="pair"><td>'.$langs->trans("ICS").'</td>';
+print '<tr class="pair"><td class="fieldrequired">'.$langs->trans("ICS").'</td>';
 print '<td align="left">';
 print '<input type="text" name="PRELEVEMENT_ICS" value="'.$conf->global->PRELEVEMENT_ICS.'" size="9" ></td>';
 print '</td></tr>';
 
+//User
+print '<tr class="impair"><td class="fieldrequired">'.$langs->trans("ResponsibleUser").'</td>';
+print '<td align="left">';
+print $form->select_dolusers($conf->global->PRELEVEMENT_USER, 'PRELEVEMENT_USER', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+print '</td>';
+print '</tr>';
+
 print '</table>';
 print '<br>';
 

htdocs/commande/card.php

@@ -1195,9 +1195,9 @@ if (empty($reshook))
 			$file = $upload_dir . '/' . GETPOST('file');
 			$ret = dol_delete_file($file, 0, 0, 0, $object);
 			if ($ret)
-				setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
+				setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
 			else
-				setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+				setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
 			$action = '';
 		}
 	}

htdocs/compta/prelevement/class/bonprelevement.class.php

@@ -87,8 +87,6 @@ class BonPrelevement extends CommonObject
 
         $this->factures = array();
 
-        $this->numero_national_emetteur = "";
-
         $this->methodes_trans = array();
 
         $this->methodes_trans[0] = "Internet";
@@ -1017,7 +1015,6 @@ class BonPrelevement extends CommonObject
                     $this->date_echeance = $datetimeprev;
                     $this->reference_remise = $ref;
 
-                    $this->numero_national_emetteur    = $conf->global->PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR;
                     $this->raison_sociale              = $conf->global->PRELEVEMENT_RAISON_SOCIALE;
 
                     $this->emetteur_code_banque 		  = $conf->global->PRELEVEMENT_CODE_BANQUE;
@@ -1026,7 +1023,7 @@ class BonPrelevement extends CommonObject
                     $this->emetteur_number_key		  = $conf->global->PRELEVEMENT_NUMBER_KEY;
                     $this->emetteur_iban               = $conf->global->PRELEVEMENT_IBAN;
                     $this->emetteur_bic                = $conf->global->PRELEVEMENT_BIC;
-                    $this->emetteur_ics                = $conf->global->PRELEVEMENT_ICS;		// TODO Add this into setup of admin/prelevement.php. Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
+                    $this->emetteur_ics                = $conf->global->PRELEVEMENT_ICS;		// Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
 
                     $this->factures = $factures_prev_id;
 
@@ -1461,7 +1458,7 @@ class BonPrelevement extends CommonObject
 
         fputs($this->file, "        "); // Zone Reservee B2
 
-        fputs($this->file, $this->numero_national_emetteur); // Numero National d'emmetteur B3
+        fputs($this->file, $this->emetteur_ics); // ICS
 
         // Date d'echeance C1
 
@@ -1610,7 +1607,7 @@ class BonPrelevement extends CommonObject
 
         fputs($this->file, "        "); // Zone Reservee B2
 
-        fputs($this->file, $this->numero_national_emetteur); // Numero National d'emmetteur B3
+        fputs($this->file, $this->emetteur_ics); // ICS
 
         // Date d'echeance C1
 
@@ -1777,7 +1774,7 @@ class BonPrelevement extends CommonObject
 
         fputs($this->file, "        "); // Zone Reservee B2
 
-        fputs($this->file, $this->numero_national_emetteur); // Numero National d'emmetteur B3
+        fputs($this->file, $this->emetteur_ics); // ICS
 
         // Reserve C1
 

htdocs/core/ajax/selectsearchbox.php

@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2015-2016 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
@@ -62,13 +62,17 @@ if (! empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_PROJ
 {
 	$arrayresult['searchintoprojects']=array('text'=>img_picto('','object_projectpub').' '.$langs->trans("SearchIntoProjects", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/list.php?search_all='.urlencode($search_boxvalue));
 }
+if (! empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_TASK_DISABLED) && $user->rights->projet->lire)
+{
+	$arrayresult['searchintotasks']=array('text'=>img_picto('','object_task').' '.$langs->trans("SearchIntoTasks", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/tasks/list.php?search_all='.urlencode($search_boxvalue));
+}
 
 if (! empty($conf->adherent->enabled) && empty($conf->global->MAIN_SEARCHFORM_ADHERENT_DISABLED) && $user->rights->adherent->lire)
 {
 	$arrayresult['searchintomember']=array('text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoMembers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/adherents/list.php?sall='.urlencode($search_boxvalue));
 }
 
-if (! empty($conf->user->enabled) && empty($conf->global->MAIN_SEARCHFORM_PROJECT_DISABLED) && $user->rights->user->user->lire)
+if (! empty($conf->user->enabled) && empty($conf->global->MAIN_SEARCHFORM_USER_DISABLED) && $user->rights->user->user->lire)
 {
 	$arrayresult['searchintouser']=array('text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoUsers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/user/index.php?sall='.urlencode($search_boxvalue));
 }
@@ -114,11 +118,11 @@ if (! empty($conf->ficheinter->enabled) && empty($conf->global->MAIN_SEARCHFORM_
 // HR
 if (! empty($conf->expensereport->enabled) && empty($conf->global->MAIN_SEARCHFORM_EXPENSEREPORT_DISABLED) && $user->rights->expensereport->lire)
 {
-	$arrayresult['searchintoexpensereport']=array('text'=>img_picto('','object_trip').' '.$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expensereport/list.php?sall='.urlencode($search_boxvalue));
+	$arrayresult['searchintoexpensereport']=array('text'=>img_picto('','object_trip').' '.$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&sall='.urlencode($search_boxvalue));
 }
 if (! empty($conf->holiday->enabled) && empty($conf->global->MAIN_SEARCHFORM_HOLIDAY_DISABLED) && $user->rights->holiday->read)
 {
-    $arrayresult['searchintoleaves']=array('text'=>img_picto('','object_holiday').' '.$langs->trans("SearchIntoLeaves", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/holiday/list.php?sall='.urlencode($search_boxvalue));
+    $arrayresult['searchintoleaves']=array('text'=>img_picto('','object_holiday').' '.$langs->trans("SearchIntoLeaves", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/holiday/list.php?mainmenu=hrm&sall='.urlencode($search_boxvalue));
 }
 
 

htdocs/core/boxes/box_actions.php

@@ -168,7 +168,7 @@ class box_actions extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {

htdocs/core/class/html.formcontract.class.php

@@ -50,7 +50,7 @@ class FormContract
 	 *	@param  string	$htmlname   Nom de la zone html
 	 *	@param	int		$maxlength	Maximum length of label
 	 *	@param	int		$showempty	Show empty line
-	 *	@return int         		Nbre of project if OK, <0 if KO
+	 *	@return int         		Nbr of project if OK, <0 if KO
 	 */
 	function select_contract($socid=-1, $selected='', $htmlname='contrattid', $maxlength=16, $showempty=1)
 	{
@@ -137,4 +137,32 @@ class FormContract
 			return -1;
 		}
 	}
+	
+	/**
+	 *	Show a form to select a contract
+	 *
+	 *  @param	int		$page       Page
+	 *	@param	int		$socid      Id third party (-1=all, 0=only contracts not linked to a third party, id=contracts not linked or linked to third party id)
+	 *	@param  int		$selected   Id contract preselected
+	 *	@param  string	$htmlname   Nom de la zone html
+	 *	@param	int		$maxlength	Maximum length of label
+	 *	@param	int		$showempty	Show empty line
+	 *	@return int         		Nbr of project if OK, <0 if KO
+	 */
+	function formSelectContract($page, $socid=-1, $selected='', $htmlname='contrattid', $maxlength=16, $showempty=1)
+	{
+	    global $langs;
+	
+        print "\n";
+        print '<form method="post" action="'.$page.'">';
+        print '<input type="hidden" name="action" value="setcontract">';
+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
+        print '<tr><td>';
+        $this->select_contract($socid, $selected, $htmlname, $maxlength, $showempty);
+        print '</td>';
+        print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+        print '</tr></table></form>';
+	}	
+	
 }

htdocs/core/class/html.formprojet.class.php

@@ -464,12 +464,14 @@ class FormProjets
 				$sql = "SELECT t.id as rowid, t.label as ref";
 				$projectkey="fk_project";
 				break;
-			case "expensereport_det":
+			case "expensereport":
 				return '';
+			case "expensereport_det":
 				/*$sql = "SELECT rowid, '' as ref";	// table is llx_expensereport_det
 				$projectkey="fk_projet";
 				break;*/
-		    case "commande":
+				return '';
+			case "commande":
 		    case "contrat":
 			case "fichinter":
 			    $sql = "SELECT t.rowid, t.ref";

htdocs/core/lib/prelevement.lib.php

@@ -78,9 +78,9 @@ function prelevement_prepare_head(BonPrelevement $object)
 function prelevement_check_config()
 {
 	global $conf;
-    if(empty($conf->global->PRELEVEMENT_USER)) return -1;
 	if(empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) return -1;
-	if(empty($conf->global->PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR)) return -1;
+	if(empty($conf->global->PRELEVEMENT_ICS)) return -1;
+    if(empty($conf->global->PRELEVEMENT_USER)) return -1;
 	return 0;
 }
 

htdocs/core/modules/commande/doc/pdf_einstein.modules.php

@@ -239,7 +239,7 @@ class pdf_einstein extends ModelePDFCommandes
 				$pdf->SetSubject($outputlangs->transnoentities("Order"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Order"));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Order")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
 				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right

htdocs/core/modules/contract/doc/pdf_strato.modules.php

@@ -198,7 +198,7 @@ class pdf_strato extends ModelePDFContract
 				$pdf->SetSubject($outputlangs->transnoentities("ContractCard"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("ContractCard"));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("ContractCard")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
 				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right

htdocs/core/modules/facture/doc/pdf_crabe.modules.php

@@ -282,7 +282,7 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->SetSubject($outputlangs->transnoentities("Invoice"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Invoice"));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Invoice")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
 				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right

htdocs/core/modules/mailings/advthirdparties.modules.php

@@ -201,9 +201,10 @@ class mailing_advthirdparties extends MailingTargets
 	 *	emails from a text file, this function must return 500.
 	 *
 	 *  @param	string	$sql 		Not use here
-	 *	@return		int			Nb of recipients
+	 *  @param      string     $sql       Sql request to use
+	 *	@return	    int			          Nb of recipients
 	 */
-	function getNbOfRecipients($sql)
+	function getNbOfRecipients($sql='')
 	{
 		global $conf;
 

htdocs/core/modules/modSupplierProposal.class.php

@@ -141,7 +141,7 @@ class modSupplierProposal extends DolibarrModules
 		$this->menu[$r]=array(
 			'fk_menu'=>'fk_mainmenu=commercial',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 			'type'=>'left',			                // This is a Left menu entry
-			'titre'=>'SupplierProposalShort',
+			'titre'=>'SupplierProposalsShort',
 			'leftmenu'=>'supplier_proposalsubmenu',
 			'url'=>'/supplier_proposal/index.php',
 			'langs'=>'supplier_proposal',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
@@ -156,7 +156,7 @@ class modSupplierProposal extends DolibarrModules
 			'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=supplier_proposalsubmenu',
 			'type'=>'left',
 			'titre'=>'SupplierProposalNew',
-			'url'=>'/supplier_proposal/card.php?action=create&leftmenu=supplier_proposals',
+			'url'=>'/supplier_proposal/card.php?action=create&leftmenu=supplier_proposals',
 			'langs'=>'supplier_proposal',
 			'enabled'=>'$conf->supplier_proposal->enabled',
 			'perms'=>'$user->rights->supplier_proposal->creer',
@@ -182,7 +182,7 @@ class modSupplierProposal extends DolibarrModules
 		    'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=supplier_proposalsubmenu',
 		    'type'=>'left',
 		    'titre'=>'Statistics',
-		    'url'=>'/comm/propal/stats/index.php?leftmenu=supplier_proposals&mode=supplier',
+		    'url'=>'/comm/propal/stats/index.php?leftmenu=supplier_proposals&mode=supplier',
 		    'langs'=>'supplier_proposal',
 		    'enabled'=>'$conf->supplier_proposal->enabled',
 		    'perms'=>'$user->rights->supplier_proposal->lire',

htdocs/core/modules/project/doc/pdf_beluga.modules.php

@@ -294,7 +294,7 @@ class pdf_beluga extends ModelePDFProjects
                         'lang'=>'interventions'),
                     'trip'=>array(
                     	'name'=>"TripsAndExpenses",
-                    	'title'=>"ListTripAssociatedProject",
+                    	'title'=>"ListExpenseReportsAssociatedProject",
                     	'class'=>'Deplacement',
                     	'table'=>'deplacement',
                     	'datefieldname'=>'dated',
@@ -304,7 +304,7 @@ class pdf_beluga extends ModelePDFProjects
                         'lang'=>'trip'),
                     'expensereport'=>array(
                     	'name'=>"ExpensesReports",
-                    	'title'=>"ListTripAssociatedProject",
+                    	'title'=>"ListExpenseReportsAssociatedProject",
                     	'class'=>'ExpenseReport',
                     	'table'=>'expensereport',
                     	'datefieldname'=>'dated',

htdocs/core/modules/propale/doc/pdf_azur.modules.php

@@ -296,7 +296,7 @@ class pdf_azur extends ModelePDFPropales
 				$pdf->SetSubject($outputlangs->transnoentities("CommercialProposal"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("CommercialProposal"));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("CommercialProposal")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
 				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right

htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php

@@ -232,7 +232,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$pdf->SetSubject($outputlangs->transnoentities("Invoice"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Order"));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Order")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
 				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right

htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

@@ -243,7 +243,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$pdf->SetSubject($outputlangs->transnoentities("Order"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Order"));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Order")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
 				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right

htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php

@@ -252,7 +252,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				$pdf->SetSubject($outputlangs->transnoentities("CommercialAsk"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("CommercialAsk"));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("CommercialAsk")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
 				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right

htdocs/expensereport/list.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003     	Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2015	Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2016	Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004     	Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2009	Regis Houssin        <regis@dolibarr.fr>
  * Copyright (C) 2015       Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
@@ -51,22 +51,21 @@ $month_end    = GETPOST("month_end","int");
 $year_end     = GETPOST("year_end","int");
 $optioncss = GETPOST('optioncss','alpha');
 
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter"))		// Both test must be present to be compatible with all browsers
-{
-	$search_ref="";
-	$search_user="";
-	$search_amount_ht="";
-	$search_amount_ttc="";
-	$search_status="";
-	$month_start="";
-	$year_start="";
-	$month_end="";
-	$year_end="";
-}
-
 if ($search_status == '') $search_status=-1;
 if ($search_user == '') $search_user=-1;
 
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$contextpage='expensereportlist';
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('expensereportlist'));
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label('expensereport');
+$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
+
+
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
     'd.ref'=>'Ref',
@@ -75,6 +74,33 @@ $fieldstosearchall = array(
 );
 
 
+
+/*
+ * Actions 
+ */
+
+$parameters=array('socid'=>$socid);
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter"))		// Both test must be present to be compatible with all browsers
+{
+    $search_ref="";
+    $search_user="";
+    $search_amount_ht="";
+    $search_amount_ttc="";
+    $search_status="";
+    $month_start="";
+    $year_start="";
+    $month_end="";
+    $year_end="";
+    $search_array_options=array();
+}
+
+
+
 /*
  * View
  */
@@ -108,7 +134,6 @@ $sql.= " u.rowid as id_user, u.firstname, u.lastname";
 $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as d";
 $sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON d.fk_user_author = u.rowid";
 $sql.= " WHERE d.entity = ".$conf->entity;
-
 // Search all
 if (!empty($sall))
 {
@@ -192,12 +217,21 @@ if ($resql)
 	$i = 0;
 
 	$param="";
+    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 	if ($search_ref)			$param.="&search_ref=".$search_ref;
 	if ($search_user)			$param.="&search_user=".$search_user;
 	if ($search_amount_ht)		$param.="&search_amount_ht=".$search_amount_ht;
 	if ($search_amount_ttc)		$param.="&search_amount_ttc=".$search_amount_ttc;
 	if ($search_status >= 0)  	$param.="&search_status=".$search_status;
-	if ($optioncss != '') $param.='&optioncss='.$optioncss;
+	if ($optioncss != '')       $param.='&optioncss='.$optioncss;
+	// Add $param from extra fields
+	foreach ($search_array_options as $key => $val)
+	{
+	    $crit=$val;
+	    $tmpkey=preg_replace('/search_options_/','',$key);
+	    if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
+	}
 	
 	print_barre_liste($langs->trans("ListTripsAndExpenses"), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
@@ -210,6 +244,7 @@ if ($resql)
     if ($sall)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
+        print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
     }
     
 	print '<table class="noborder" width="100%">';

htdocs/fichinter/card.php

@@ -111,6 +111,36 @@ if (empty($reshook))
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';		// Must be include, not include_once
 
+	// Action clone object
+	if ($action == 'confirm_clone' && $confirm == 'yes' && $user->rights->ficheinter->creer)
+	{
+		if (1==0 && ! GETPOST('clone_content') && ! GETPOST('clone_receivers'))
+		{
+			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
+		}
+		else
+		{
+			if ($object->id > 0)
+			{
+				// Because createFromClone modifies the object, we must clone it so that we can restore it later
+				$orig = clone $object;
+
+				$result=$object->createFromClone($socid);
+				if ($result > 0)
+				{
+					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
+					exit;
+				}
+				else
+				{
+					setEventMessages($object->error, $object->errors, 'errors');
+					$object = $orig;
+					$action='';
+				}
+			}
+		}
+	}
+	
 	if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->ficheinter->creer)
 	{
 		$result = $object->setValid($user);
@@ -447,7 +477,7 @@ if (empty($reshook))
 	}
 
 	// Set into a contract
-	else if ($action == 'setcontrat' && $user->rights->contrat->creer)
+	else if ($action == 'setcontract' && $user->rights->contrat->creer)
 	{
 		$result=$object->set_contrat($user,GETPOST('contratid','int'));
 		if ($result < 0) dol_print_error($db,$object->error);
@@ -1094,6 +1124,20 @@ else if ($id > 0 || ! empty($ref))
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&line_id='.$lineid, $langs->trans('DeleteInterventionLine'), $langs->trans('ConfirmDeleteInterventionLine'), 'confirm_deleteline','',0,1);
 	}
 
+	// Clone confirmation
+	if ($action == 'clone') {
+		// Create an array for form
+		$formquestion = array(
+							// 'text' => $langs->trans("ConfirmClone"),
+							// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' =>
+							// 1),
+							// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value'
+							// => 1),
+							array('type' => 'other','name' => 'socid','label' => $langs->trans("SelectThirdParty"),'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', '', '', 0, 0, null, 0, 'minwidth200')));
+		// Paiement incomplet. On demande si motif = escompte ou autre
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('CloneIntervention'), $langs->trans('ConfirmCloneIntervention', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
+	}
+	
 	if (!$formconfirm)
 	{
 		$parameters=array('lineid'=>$lineid);
@@ -1207,15 +1251,8 @@ else if ($id > 0 || ! empty($ref))
 		print '</td><td colspan="3">';
 		if ($action == 'contrat')
 		{
-			print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
+			$formcontract= new Formcontract($db);
-			print '<tr><td>';
+			$formcontract->formSelectContract($_SERVER["PHP_SELF"].'?id='.$object->id, $object->socid, $object->fk_contrat, 'contratid', 0, 1);
-			$htmlcontract= new Formcontract($db);
-			//print "$socid,$selected,$htmlname";
-			$htmlcontract->select_contract($object->socid,$object->fk_contrat,'contratid');
-
-			print '</td>';
-			print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-			print '</tr></table>';
 		}
 		else
 		{
@@ -1588,6 +1625,11 @@ else if ($id > 0 || ! empty($ref))
 					}
 				}
 
+				// Clone
+				if ($user->rights->ficheinter->creer) {
+					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;socid=' . $object->socid . '&amp;action=clone&amp;object=ficheinter">' . $langs->trans("ToClone") . '</a></div>';
+				}
+				
 				// Delete
 				if (($object->statut == 0 && $user->rights->ficheinter->creer) || $user->rights->ficheinter->supprimer)
 				{
@@ -1600,7 +1642,6 @@ else if ($id > 0 || ! empty($ref))
 	}
 
 	print '</div>';
-	print '<br>';
 
 	if ($action != 'presend')
 	{

htdocs/fichinter/class/fichinter.class.php

@@ -220,7 +220,6 @@ class Fichinter extends CommonObject
 
 			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
             {
-
             	$result=$this->insertExtraFields();
             	if ($result < 0)
             	{
@@ -926,6 +925,103 @@ class Fichinter extends CommonObject
 		return -2;
 	}
 
+	
+
+    /**
+     *	Load an object from its id and create a new one in database
+     *
+     *	@param		int			$socid			Id of thirdparty
+     *	@return		int							New id of clone
+     */
+    function createFromClone($socid=0)
+    {
+        global $user,$hookmanager;
+
+        $error=0;
+
+        $this->context['createfromclone'] = 'createfromclone';
+
+        $this->db->begin();
+
+		// get extrafields so they will be clone
+		foreach($this->lines as $line)
+			$line->fetch_optionals($line->rowid);
+
+        // Load source object
+        $objFrom = clone $this;
+
+        // Change socid if needed
+        if (! empty($socid) && $socid != $this->socid)
+        {
+            $objsoc = new Societe($this->db);
+
+            if ($objsoc->fetch($socid)>0)
+            {
+                $this->socid 				= $objsoc->id;
+                $this->cond_reglement_id	= (! empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
+                $this->mode_reglement_id	= (! empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
+                $this->fk_project			= '';
+                $this->fk_delivery_address	= '';
+            }
+
+            // TODO Change product price if multi-prices
+        }
+
+        $this->id=0;
+		$this->ref = '';
+        $this->statut=0;
+
+        // Clear fields
+        $this->user_author_id     = $user->id;
+        $this->user_valid         = '';
+        $this->date_creation      = '';
+        $this->date_validation    = '';
+        $this->ref_client         = '';
+		
+        // Create clone
+        $result=$this->create($user);
+        if ($result < 0) $error++;
+
+        if (! $error)
+        {
+            // Add lines because it is not included into create function
+            foreach ($this->lines as $line)
+            {
+            	// TODO
+            
+            }
+            
+        	// Hook of thirdparty module
+            if (is_object($hookmanager))
+            {
+                $parameters=array('objFrom'=>$objFrom);
+                $action='';
+                $reshook=$hookmanager->executeHooks('createFrom',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+                if ($reshook < 0) $error++;
+            }
+
+            // Call trigger
+            $result=$this->call_trigger('INTERVENTION_CLONE',$user);
+            if ($result < 0) $error++;
+            // End call triggers
+        }
+
+        unset($this->context['createfromclone']);
+
+        // End
+        if (! $error)
+        {
+            $this->db->commit();
+            return $this->id;
+        }
+        else
+        {
+            $this->db->rollback();
+            return -1;
+        }
+    }
+	
+	
 	/**
 	 *	Adding a line of intervention into data base
 	 *

htdocs/holiday/view_log.php

@@ -50,6 +50,8 @@ $langs->load('users');
 
 $cp = new Holiday($db);
 
+$alltypeleaves=$cp->getTypes(1,-1);    // To have labels
+
 llxHeader('', $langs->trans('CPTitreMenu').' ('.$langs->trans("Year").' '.$year.')');
 
 // Recent changes are more important than old changes
@@ -94,7 +96,10 @@ foreach($cp->logs as $logs_CP)
    	print '<td>'.$user_action->getNomUrl(1).'</td>';
    	print '<td>'.$user_update->getNomUrl(1).'</td>';
    	print '<td>'.$logs_CP['type_action'].'</td>';
-   	print '<td>'.$logs_CP['fk_type'].'</td>';
+   	print '<td>';
+	$label=$alltypeleaves[$logs_CP['fk_type']]['label'];
+	print $label?$label:$logs_CP['fk_type'];
+   	print '</td>';
    	print '<td style="text-align: right;">'.price2num($logs_CP['prev_solde'],5).' '.$langs->trans('days').'</td>';
    	print '<td style="text-align: right;">'.price2num($logs_CP['new_solde'],5).' '.$langs->trans('days').'</td>';
    	print '</tr>'."\n";

htdocs/langs/en_US/interventions.lang

@@ -14,10 +14,12 @@ DeleteIntervention=Delete intervention
 ValidateIntervention=Validate intervention
 ModifyIntervention=Modify intervention
 DeleteInterventionLine=Delete intervention line
+CloneIntervention=Clone intervention
 ConfirmDeleteIntervention=Are you sure you want to delete this intervention ?
 ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b> ?
 ConfirmModifyIntervention=Are you sure you want to modify this intervention ?
 ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ?
+ConfirmCloneIntervention=Are you sure you want to clone this intervention ?
 NameAndSignatureOfInternalContact=Name and signature of intervening :
 NameAndSignatureOfExternalContact=Name and signature of customer :
 DocumentModelStandard=Standard document model for interventions

htdocs/langs/en_US/main.lang

@@ -744,6 +744,7 @@ SearchIntoMembers=Members
 SearchIntoUsers=Users
 SearchIntoProductsOrServices=Products or services
 SearchIntoProjects=Projects
+SearchIntoTasks=Tasks
 SearchIntoCustomerInvoices=Customer invoices
 SearchIntoSupplierInvoices=Supplier invoices
 SearchIntoCustomerOrders=Customer orders

htdocs/langs/en_US/supplier_proposal.lang

@@ -12,6 +12,7 @@ RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Supplier proposals
+SupplierProposalsShort=Supplier proposals
 NewAskPrice=New price request
 ShowSupplierProposal=Show price request
 AddSupplierProposal=Create a price request

htdocs/product/stock/product.php

@@ -50,7 +50,7 @@ $cancel=GETPOST('cancel');
 
 $id=GETPOST('id', 'int');
 $ref=GETPOST('ref', 'alpha');
-$stocklimit = GETPOST('stocklimit');
+$stocklimit = GETPOST('seuil_stock_alerte');
 $desiredstock = GETPOST('desiredstock');
 $cancel = GETPOST('cancel');
 $fieldid = isset($_GET["ref"])?'ref':'rowid';
@@ -70,7 +70,7 @@ $result=restrictedArea($user,'produit&stock',$id,'product&product','','',$fieldi
 if ($cancel) $action='';
 
 // Set stock limit
-if ($action == 'setstocklimit')
+if ($action == 'setseuil_stock_alerte')
 {
     $object = new Product($db);
     $result=$object->fetch($id);
@@ -78,6 +78,8 @@ if ($action == 'setstocklimit')
     $result=$object->update($object->id,$user,0,'update');
     if ($result < 0)
     	setEventMessages($object->error, $object->errors, 'errors');
+    //else
+    //	setEventMessage($lans->trans("SavedRecordSuccessfully"));
     $action='';
 }
 

htdocs/projet/card.php

@@ -307,17 +307,19 @@ if (empty($reshook))
 	// Delete file in doc form
 	if ($action == 'remove_file' && $user->rights->projet->creer)
 	{
-	    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
 	    if ($object->id > 0)
 	    {
-	        $langs->load("other");
+			require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-	        $upload_dir =	$conf->projet->dir_output . "/";
+	    	
-	        $urlfile=GETPOST('urlfile','alpha');
+			$langs->load("other");
-	        $file =	$upload_dir	. '/' .	$filetodelete;
+			$upload_dir = $conf->projet->dir_output;
-	        $ret=dol_delete_file($file);
+			$file = $upload_dir . '/' . GETPOST('file');
-	        if ($ret) setEventMessages($langs->trans("FileWasRemoved", $urlfile), null, 'mesgs');
+			$ret = dol_delete_file($file, 0, 0, 0, $object);
-	        else setEventMessages($langs->trans("ErrorFailToDeleteFile", $urlfile), null, 'errors');
+			if ($ret)
+				setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
+			else
+				setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
+			$action = '';
 	    }
 	}
 

htdocs/projet/tasks/list.php

@@ -38,7 +38,11 @@ $id=GETPOST('id','int');
 
 $search_all=GETPOST('search_all');
 $search_project=GETPOST('search_project');
-if (! isset($_GET['search_projectstatus']) && ! isset($_POST['search_projectstatus'])) $search_projectstatus=1;
+if (! isset($_GET['search_projectstatus']) && ! isset($_POST['search_projectstatus'])) 
+{
+    if ($search_all != '') $search_projectstatus=-1;
+    else $search_projectstatus=1;
+}
 else $search_projectstatus=GETPOST('search_projectstatus');
 $search_project_ref=GETPOST('search_project_ref');
 $search_project_title=GETPOST('search_project_title');

htdocs/societe/class/societe.class.php

@@ -2610,7 +2610,7 @@ class Societe extends CommonObject
      *  @param	int			$idprof         1,2,3,4 (Exemple: 1=siren,2=siret,3=naf,4=rcs/rm)
      *  @param  Societe		$soc            Objet societe
      *  @return int             			<=0 if KO, >0 if OK
-     *  TODO not in business class
+     *  TODO better to have this in a lib than into a business class
      */
     function id_prof_check($idprof,$soc)
     {
@@ -2722,27 +2722,38 @@ class Societe extends CommonObject
     }
 
     /**
-     *   Renvoi url de verification d'un identifiant professionnal
+     *   Return an url to check online a professional id or empty string
      *
-     *   @param		int		$idprof         1,2,3,4 (Exemple: 1=siren,2=siret,3=naf,4=rcs/rm)
+     *   @param		int		$idprof         1,2,3,4 (Example: 1=siren,2=siret,3=naf,4=rcs/rm)
-     *   @param 	Societe	$soc            Objet societe
+     *   @param 	Societe	$thirdparty     Object thirdparty
-     *   @return	string          		url ou chaine vide si aucune url connue
+     *   @return	string          		Url or empty string if no URL known
-     *   TODO not in business class
+     *   TODO better in a lib than into business class
      */
-    function id_prof_url($idprof,$soc)
+    function id_prof_url($idprof,$thirdparty)
     {
-        global $conf,$langs;
+        global $conf,$langs,$hookmanager;
-
-        if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) return '';
 
         $url='';
         
-        if ($idprof == 1 && $soc->country_code == 'FR') $url='http://www.societe.com/cgi-bin/recherche?rncs='.$soc->idprof1;
+        $hookmanager->initHooks(array('idprofurl'));
-        if ($idprof == 1 && ($soc->country_code == 'GB' || $soc->country_code == 'UK')) $url='http://www.companieshouse.gov.uk/WebCHeck/findinfolink/';
+        $parameters=array('idprof'=>$idprof, 'company'=>$thirdparty);
-        if ($idprof == 1 && $soc->country_code == 'ES') $url='http://www.e-informa.es/servlet/app/portal/ENTP/screen/SProducto/prod/ETIQUETA_EMPRESA/nif/'.$soc->idprof1;
+        $reshook=$hookmanager->executeHooks('getIdProfUrl',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-        if ($idprof == 1 && $soc->country_code == 'IN') $url='http://www.tinxsys.com/TinxsysInternetWeb/dealerControllerServlet?tinNumber='.$soc->idprof1.';&searchBy=TIN&backPage=searchByTin_Inter.jsp';
+        if (empty($reshook))
+        {
+            if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) return '';
+
+            if ($idprof == 1 && $thirdparty->country_code == 'FR') $url='http://www.societe.com/cgi-bin/search?champs='.$thirdparty->idprof1;    // See also http://avis-situation-sirene.insee.fr/
+            if ($idprof == 1 && ($thirdparty->country_code == 'GB' || $thirdparty->country_code == 'UK')) $url='http://www.companieshouse.gov.uk/WebCHeck/findinfolink/';
+            if ($idprof == 1 && $thirdparty->country_code == 'ES') $url='http://www.e-informa.es/servlet/app/portal/ENTP/screen/SProducto/prod/ETIQUETA_EMPRESA/nif/'.$thirdparty->idprof1;
+            if ($idprof == 1 && $thirdparty->country_code == 'IN') $url='http://www.tinxsys.com/TinxsysInternetWeb/dealerControllerServlet?tinNumber='.$thirdparty->idprof1.';&searchBy=TIN&backPage=searchByTin_Inter.jsp';
+        
+            if ($url) return '<a target="_blank" href="'.$url.'">'.$langs->trans("Check").'</a>';
+        }
+        else
+        {
+            return $hookmanager->resPrint;
+        }
         
-        if ($url) return '<a target="_blank" href="'.$url.'">['.$langs->trans("Check").']</a>';
         return '';
     }
 

htdocs/viewimage.php

@@ -34,8 +34,9 @@ if (! defined('NOREQUIREMENU'))		define('NOREQUIREMENU','1');
 if (! defined('NOREQUIREHTML'))		define('NOREQUIREHTML','1');
 if (! defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX','1');
 if (! defined('NOREQUIREHOOK'))		define('NOREQUIREHOOK','1');	// Disable "main.inc.php" hooks
-// Pour autre que companylogo, on charge environnement + info issus de logon comme le user
+// Some value of modulepart can be used to get resources that are public so no login are required.
 if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'companylogo') && ! defined("NOLOGIN")) define("NOLOGIN",'1');
+if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias') && ! defined("NOLOGIN")) define("NOLOGIN",'1');
 
 /**
  * Header empty

htdocs/websites/index.php

@@ -137,6 +137,8 @@ $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain
  * Actions
  */
 
+if (GETPOST('refreshsite')) $pageid=0;      // If we change the site, we reset the pageid.
+
 // Add page
 if ($action == 'add')
 {
@@ -321,7 +323,7 @@ if ($action == 'updatemeta')
     $res = $objectpage->fetch($pageid, $object->fk_website);
     if ($res > 0)
     {
-    $objectpage->pageurl = GETPOST('WEBSITE_PAGENAME');
+        $objectpage->pageurl = GETPOST('WEBSITE_PAGENAME');
         $objectpage->title = GETPOST('WEBSITE_TITLE');
         $objectpage->description = GETPOST('WEBSITE_DESCRIPTION');
         $objectpage->keywords = GETPOST('WEBSITE_KEYWORDS');
@@ -476,7 +478,7 @@ if (count($object->records) > 0)
     }
     $out.='</select>';
     print $out;
-    print '<input type="submit" class="button" name="refresh" value="'.$langs->trans("Refresh").'">';
+    print '<input type="submit" class="button" name="refreshsite" value="'.$langs->trans("Refresh").'">';
 
     if ($website)
     {
@@ -529,22 +531,31 @@ if (count($object->records) > 0)
         $out.='<select name="pageid">';
         if ($atleastonepage)
         {
+            if (empty($pageid) && $action != 'create')      // Page id is not defined, we try to take one
+            {
+                $firstpageid=0;$homepageid=0;
+                foreach($array as $key => $valpage)
+                {
+                    if (empty($firstpageid)) $firstpageid=$valpage->id;
+                    if ($object->fk_default_home && $key == $object->fk_default_home) $homepageid=$valpage->id;
+                }
+                $pageid=$homepageid?$homepageid:$firstpageid;   // We choose home page and if not defined yet, we take first page
+            }
+
             foreach($array as $key => $valpage)
             {
-                if (empty($pageid) && $action != 'create') $pageid=$valpage->id;
-    
                 $out.='<option value="'.$key.'"';
                 if ($pageid > 0 && $pageid == $key) $out.=' selected';		// To preselect a value
                 $out.='>';
                 $out.=$valpage->title;
-                    if ($object->fk_default_home && $key == $object->fk_default_home) $out.=' ('.$langs->trans("HomePage").')';
+                if ($object->fk_default_home && $key == $object->fk_default_home) $out.=' ('.$langs->trans("HomePage").')';
                 $out.='</option>';
             }
         }
         else $out.='<option value="-1">&nbsp;</option>';
         $out.='</select>';
         print $out;
-        print '<input type="submit" class="button" name="refresh" value="'.$langs->trans("Refresh").'"'.($atleastonepage?'':' disabled="disabled"').'>';
+        print '<input type="submit" class="button" name="refreshpage" value="'.$langs->trans("Refresh").'"'.($atleastonepage?'':' disabled="disabled"').'>';
         print '<input type="submit" class="buttonDelete" name="delete" value="'.$langs->trans("Delete").'"'.($atleastonepage?'':' disabled="disabled"').'>';
         //print $form->selectarray('page', $array);