diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index bff890a09b7..024cc4922d1 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -59,6 +59,8 @@ class Contact extends CommonObject
var $country_code; // Code of country
var $country; // Label of country
+ var $poste; // Position
+
var $socid; // fk_soc
var $statut; // 0=inactif, 1=actif
diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php
index a932a2fb67f..1671d7d976e 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/etape1.php
@@ -812,7 +812,7 @@ function write_conf_file($conffile)
fputs($fp, '$dolibarr_main_document_root=\''.str_replace("'","\'",($main_dir)).'\';');
fputs($fp,"\n");
- fputs($fp, $main_use_alt_dir.'$dolibarr_main_url_root_alt=\''.str_replace("'","\'",($main_url."/".$main_alt_dir_name)).'\';');
+ fputs($fp, $main_use_alt_dir.'$dolibarr_main_url_root_alt=\''.str_replace("'","\'",("/".$main_alt_dir_name)).'\';');
fputs($fp,"\n");
fputs($fp, $main_use_alt_dir.'$dolibarr_main_document_root_alt=\''.str_replace("'","\'",($main_dir."/".$main_alt_dir_name)).'\';');
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 161cb4aa30e..da7642e8df4 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -78,9 +78,14 @@ if (! empty($dolibarr_main_document_root_alt))
{
if (preg_match('/^http(s)?:/',$value))
{
- print 'Error: values for $dolibarr_main_url_root_alt into conf.php file must contains relative path added to $dolibarr_main_url_root to get alternative URLs.
'."\n";
- print "Found: \"".$value."\"
\n";
- print "Should found something like following examples:
\n";
+ // TODO: Make this a warning rather than an error since the correct value can be derived in most cases
+ $correct_value = str_replace($dolibarr_main_url_root, '', $value);
+ print 'Error:
'."\n";
+ print 'Wrong $dolibarr_main_url_root_alt value in conf.php file.
'."\n";
+ print 'We now use a relative path to $dolibarr_main_url_root to build alternate URLs.
'."\n";
+ print 'Value found: '.$value.'
'."\n";
+ print 'Should be replaced by: '.$correct_value.'
'."\n";
+ print "Or something like following examples:
\n";
print "\"/extensions\"
\n";
print "\"/extensions1,/extensions2,...\"
\n";
print "\"/../extensions\"
\n";