diff --git a/htdocs/commande/commande.class.php b/htdocs/commande/commande.class.php
index 924fe36d470..d4897ff72d9 100644
--- a/htdocs/commande/commande.class.php
+++ b/htdocs/commande/commande.class.php
@@ -175,6 +175,9 @@ class Commande extends CommonObject
 					$objMod = new $modName($this->db);
 					$soc = new Societe($this->db);
 					$soc->fetch($this->socidp);
+					
+					// Classe la société rattachée comme client
+          $result=$soc->set_as_client();
 		
 					// on vérifie si la commande est en numérotation provisoire
 					$comref = substr($this->ref, 1, 4);
diff --git a/htdocs/facture.class.php b/htdocs/facture.class.php
index d5f1172a1df..3ec7735ee56 100644
--- a/htdocs/facture.class.php
+++ b/htdocs/facture.class.php
@@ -977,6 +977,12 @@ class Facture extends CommonObject
 
             if ($error == 0)
             {
+                
+                // Classe la société rattachée comme client
+                $soc=new Societe($this->db);
+                $soc->id = $this->socidp;
+                $result=$soc->set_as_client();
+                
                 $this->ref = $numfa;
 
                 $this->use_webcal=($conf->global->PHPWEBCALENDAR_BILLSTATUS=='always'?1:0);