From 6e3f24a562520c503d63199d40d7deae4310c9b6 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Wed, 28 Apr 2010 10:24:38 +0000
Subject: [PATCH] Fix: uniformize code

---
 htdocs/comm/propal/propal.class.php | 4 ++--
 htdocs/compta/facture.php           | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/comm/propal/propal.class.php b/htdocs/comm/propal/propal.class.php
index 2654cb8038e..46150f6912b 100644
--- a/htdocs/comm/propal/propal.class.php
+++ b/htdocs/comm/propal/propal.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004      Eric Seigne           <eric.seigne@ryxeo.com>
  * Copyright (C) 2004-2009 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
- * Copyright (C) 2005-2009 Regis Houssin         <regis@dolibarr.fr>
+ * Copyright (C) 2005-2010 Regis Houssin         <regis@dolibarr.fr>
  * Copyright (C) 2006      Andre Cianfarani      <acianfa@free.fr>
  * Copyright (C) 2008      Raphael Bertrand (Resultic)   <raphael.bertrand@resultic.fr>
  * Copyright (C) 2010      Juanjo Menent         <jmenent@2byte.es>
@@ -839,7 +839,7 @@ class Propal extends CommonObject
 				$this->remise               = $obj->remise;
 				$this->remise_percent       = $obj->remise_percent;
 				$this->remise_absolue       = $obj->remise_absolue;
-				$this->total                = $obj->total;
+				$this->total                = $obj->total; // TODO obsolete
 				$this->total_ht             = $obj->total_ht;
 				$this->total_tva            = $obj->tva;
 				$this->total_ttc            = $obj->total;
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index bb0ac2870d5..3815e157444 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1846,8 +1846,8 @@ if ($_GET['action'] == 'create')
 	{
 		print "\n<!-- Propal info -->";
 		print '<input type="hidden" name="amount"         value="'.$propal->total_ht.'">'."\n";
-		print '<input type="hidden" name="total"          value="'.$propal->total.'">'."\n";
-		print '<input type="hidden" name="tva"            value="'.$propal->tva.'">'."\n";
+		print '<input type="hidden" name="total"          value="'.$propal->total_ttc.'">'."\n";
+		print '<input type="hidden" name="tva"            value="'.$propal->total_tva.'">'."\n";
 		//print '<input type="hidden" name="remise_absolue" value="'.$propal->remise_absolue.'">'."\n";
 		//print '<input type="hidden" name="remise_percent" value="'.$propal->remise_percent.'">'."\n";
 		print '<input type="hidden" name="propalid"       value="'.$propal->id.'">';
@@ -1855,7 +1855,7 @@ if ($_GET['action'] == 'create')
 		print '<tr><td>'.$langs->trans('Proposal').'</td><td colspan="2"><a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id.'">'.img_object($langs->trans("ShowPropal"),'propal').' '.$propal->ref.'</a></td></tr>';
 		print '<tr><td>'.$langs->trans('TotalHT').'</td><td colspan="2">'.price($propal->total_ht).'</td></tr>';
 		print '<tr><td>'.$langs->trans('TotalVAT').'</td><td colspan="2">'.price($propal->total_tva)."</td></tr>";
-		print '<tr><td>'.$langs->trans('TotalTTC').'</td><td colspan="2">'.price($propal->total)."</td></tr>";
+		print '<tr><td>'.$langs->trans('TotalTTC').'</td><td colspan="2">'.price($propal->total_ttc)."</td></tr>";
 	}
 	elseif ($_GET['commandeid'] > 0)
 	{