From 1ab6955494849e57cad898585082f7be18b3f021 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Sat, 27 Dec 2014 11:27:41 +0100
Subject: [PATCH] FIX: dont remove price ht if it is forced (ie: calculated by
 margin rate and cost price, or by external module)

---
 htdocs/comm/propal.php    | 3 +--
 htdocs/commande/fiche.php | 3 +--
 htdocs/compta/facture.php | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index e3be3ac8361..4929ee9c70e 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -545,16 +545,15 @@ else if ($action == 'addline' && $user->rights->propal->creer) {
 	// Set if we used free entry or predefined product
 	$predef='';
 	$product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
+	$price_ht = GETPOST('price_ht');
 	if (GETPOST('prod_entry_mode') == 'free')
 	{
 		$idprod=0;
-		$price_ht = GETPOST('price_ht');
 		$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 	}
 	else
 	{
 		$idprod=GETPOST('idprod', 'int');
-		$price_ht = '';
 		$tva_tx = '';
 	}
 
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index e0950bdccc7..1c01b975a3b 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -511,16 +511,15 @@ else if ($action == 'addline' && $user->rights->commande->creer) {
 	// Set if we used free entry or predefined product
 	$predef='';
 	$product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
+	$price_ht = GETPOST('price_ht');
 	if (GETPOST('prod_entry_mode') == 'free')
 	{
 		$idprod=0;
-		$price_ht = GETPOST('price_ht');
 		$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 	}
 	else
 	{
 		$idprod=GETPOST('idprod', 'int');
-		$price_ht = '';
 		$tva_tx = '';
 	}
 
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 25330ba548b..d9582e957e2 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1064,16 +1064,15 @@ else if ($action == 'addline' && $user->rights->facture->creer)
 	// Set if we used free entry or predefined product
 	$predef='';
 	$product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
+	$price_ht = GETPOST('price_ht');
 	if (GETPOST('prod_entry_mode') == 'free')
 	{
 		$idprod=0;
-		$price_ht = GETPOST('price_ht');
 		$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 	}
 	else
 	{
 		$idprod=GETPOST('idprod', 'int');
-		$price_ht = '';
 		$tva_tx = '';
 	}