diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index e6ee24a02b7..67381f9e70d 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1497,10 +1497,10 @@ if ($_GET['action'] == 'create')
 		$ref_client=$propal->ref_client;
 
 		$soc=$propal->client;
-		$cond_reglement_id = $propal->cond_reglement_id;
-		$mode_reglement_id = $propal->mode_reglement_id;
-		$remise_percent = $propal->remise_percent;
-		$remise_absolue = $propal->remise_absolue;
+		$cond_reglement_id 	= $propal->cond_reglement_id;
+		$mode_reglement_id 	= $propal->mode_reglement_id;
+		$remise_percent 	= $propal->remise_percent;
+		$remise_absolue 	= $propal->remise_absolue;
 	}
 	elseif ($_GET['commandeid'])
 	{
@@ -1512,10 +1512,10 @@ if ($_GET['action'] == 'create')
 		$ref_client=$commande->ref_client;
 
 		$soc=$commande->client;
-		$cond_reglement_id = $commande->cond_reglement_id;
-		$mode_reglement_id = $commande->mode_reglement_id;
-		$remise_percent = $commande->remise_percent;
-		$remise_absolue = $commande->remise_absolue;
+		$cond_reglement_id 	= $commande->cond_reglement_id;
+		$mode_reglement_id 	= $commande->mode_reglement_id;
+		$remise_percent 	= $commande->remise_percent;
+		$remise_absolue 	= $commande->remise_absolue;
 	}
 	elseif ($_GET['contratid'])
 	{
@@ -1526,10 +1526,10 @@ if ($_GET['action'] == 'create')
 		$projectid=$contrat->fk_project;
 
 		$soc=$contrat->client;
-		$cond_reglement_id = $soc->cond_reglement;
-		$mode_reglement_id = $soc->mod_reglement;
-		$remise_percent = $soc->remise_client;
-		$remise_absolue = 0;
+		$cond_reglement_id 	= $soc->cond_reglement_id;
+		$mode_reglement_id 	= $soc->mode_reglement_id;
+		$remise_percent 	= $soc->remise_percent;
+		$remise_absolue 	= 0;
 		$dateinvoice=empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0;
 	}
 	// TODO a mutualiser
@@ -1549,19 +1549,19 @@ if ($_GET['action'] == 'create')
 		$object->fetch_client();
 		
 		$soc = $object->client;
-		$cond_reglement_id = $soc->cond_reglement;
-		$mode_reglement_id = $soc->mode_reglement;
-		$remise_percent = $soc->remise_client;
-		$remise_absolue = 0;
-		$dateinvoice=empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0;
+		$cond_reglement_id 	= $soc->cond_reglement_id;
+		$mode_reglement_id 	= $soc->mode_reglement_id;
+		$remise_percent 	= $soc->remise_percent;
+		$remise_absolue 	= 0;
+		//$dateinvoice=empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0;
 	}
 	else
 	{
 		$res=$soc->fetch($socid);
-		$cond_reglement_id = $soc->cond_reglement;
-		$mode_reglement_id = $soc->mode_reglement;
-		$remise_percent = $soc->remise_client;
-		$remise_absolue = 0;
+		$cond_reglement_id 	= $soc->cond_reglement_id;
+		$mode_reglement_id 	= $soc->mode_reglement_id;
+		$remise_percent 	= $soc->remise_percent;
+		$remise_absolue 	= 0;
 		$dateinvoice=empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0;
 	}
 	$absolute_discount=$soc->getAvailableDiscounts();
diff --git a/htdocs/societe/societe.class.php b/htdocs/societe/societe.class.php
index 2dfe5bff7f5..a2d4e19e30f 100644
--- a/htdocs/societe/societe.class.php
+++ b/htdocs/societe/societe.class.php
@@ -88,9 +88,12 @@ class Societe extends CommonObject
 	var $forme_juridique_code;
 	var $forme_juridique;
 
-	var $remise_client;
-	var $mode_reglement;
-	var $cond_reglement;
+	var $remise_percent;
+	var $mode_reglement_id;
+	var $cond_reglement_id;
+	var $remise_client;  // TODO obsolete
+	var $mode_reglement; // TODO obsolete
+	var $cond_reglement; // TODO obsolete
 
 	var $client;					// 0=no customer, 1=customer, 2=prospect
 	var $prospect;					// 0=no prospect, 1=prospect
@@ -675,9 +678,13 @@ class Societe extends CommonObject
 
 				$this->prefix_comm = $obj->prefix_comm;
 
-				$this->remise_client  = $obj->remise_client;
-				$this->mode_reglement = $obj->mode_reglement;
-				$this->cond_reglement = $obj->cond_reglement;
+				$this->remise_percent		= $obj->remise_client;
+				$this->mode_reglement_id 	= $obj->mode_reglement;
+				$this->cond_reglement_id 	= $obj->cond_reglement;
+				$this->remise_client  		= $obj->remise_client;  // TODO obsolete
+				$this->mode_reglement 		= $obj->mode_reglement; // TODO obsolete
+				$this->cond_reglement 		= $obj->cond_reglement; // TODO obsolete
+				
 				$this->client      = $obj->client;
 				$this->fournisseur = $obj->fournisseur;