diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index 6eb94d3ce07..47dda3d629b 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -50,9 +50,11 @@ if (!empty($conf->projet->enabled)) {
$langs->load('bills');
+$langs->load('compta');
$langs->load('suppliers');
$langs->load('companies');
$langs->load('products');
+$langs->load('banks');
$mesg='';
$errors=array();
diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php
index 87c3c7e6dc8..f7d62f8692e 100644
--- a/htdocs/fourn/facture/impayees.php
+++ b/htdocs/fourn/facture/impayees.php
@@ -217,7 +217,7 @@ if ($user->rights->fournisseur->facture->lire)
print '
';
print '';
print ' | ';
- print '';
+ print '';
print ' | ';
print "\n";
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 6f535821abe..69265f73b67 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -680,8 +680,8 @@ if (! defined('NOLOGIN'))
if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT)) $conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT; // Can be 0
if (isset($user->conf->PRODUIT_LIMIT_SIZE)) $conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE; // Can be 0
- // Replace conf->css by personalized value
- if (isset($user->conf->MAIN_THEME) && $user->conf->MAIN_THEME)
+ // Replace conf->css by personalized value if theme not forced
+ if (empty($conf->global->MAIN_FORCETHEME) && ! empty($user->conf->MAIN_THEME))
{
$conf->theme=$user->conf->MAIN_THEME;
$conf->css = "/theme/".$conf->theme."/style.css.php";
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 065b3191bec..367d5bcd6d6 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2973,7 +2973,7 @@ class Product extends CommonObject
// Objet
$obj=array();
$obj['photo']=$photo;
- if ($photo_vignette && dol_is_file($dirthumb.$photo_vignette)) $obj['photo_vignette']=$dirthumb . $photo_vignette;
+ if ($photo_vignette && dol_is_file($dirthumb.$photo_vignette)) $obj['photo_vignette']='thumbs/' . $photo_vignette;
else $obj['photo_vignette']="";
$tabobj[$nbphoto-1]=$obj;
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 664be4b9a05..941a5445ff1 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -306,6 +306,12 @@ class Societe extends CommonObject
$contact->socid = $this->id; // fk_soc
$contact->statut = 1;
$contact->priv = 0;
+ $contact->country_id = $this->country_id;
+ $contact->address = $this->address;
+ $contact->email = $this->email;
+ $contact->zip = $this->zip;
+ $contact->town = $this->town;
+ $contact->phone_pro = $this->phone;
$result = $contact->create($user);
if ($result < 0) {
$this->error = $contact->error;