From 86c8731a613c283b9a20e8eb3f2b25e6d039d878 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 17 Sep 2007 12:38:27 +0000
Subject: [PATCH] =?UTF-8?q?D=E9but=20ajout=20calcul=20des=20marges?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/comm/propal.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index e99d3ba4a49..15e6572527c 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -1129,14 +1129,17 @@ if ($_GET['propalid'] > 0)
 					}
 					print "</td>\n";
 				}
-				if ($conf->global->PRODUIT_USE_MARKUP && $conf->use_ajax)
+				if ($objp->fk_product_type==0 && $conf->global->PRODUIT_USE_MARKUP && $conf->use_ajax)
 				{
 					
 					$formMarkup = '<form id="formMarkup" action="'.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'" method="post">'."\n";
 					$formMarkup.= '<table class="border" width="100%">'."\n";
-					$formMarkup.= '<tr><td align="left" colspan="2">&nbsp;</td></tr>'."\n";
-					$formMarkup.= '<tr><td align="left" width="25%" height="19">&nbsp;'.$langs->trans('SupplierPrice').'</td>'."\n";
-					$formMarkup.= '<td align="left">'.$html->select_product_fourn_price($objp->fk_product,'productfournpriceid').'</td></tr>'."\n";
+					if ($objp->fk_product > 0)
+					{
+						$formMarkup.= '<tr><td align="left" colspan="2">&nbsp;</td></tr>'."\n";
+						$formMarkup.= '<tr><td align="left" width="25%" height="19">&nbsp;'.$langs->trans('SupplierPrice').'</td>'."\n";
+						$formMarkup.= '<td align="left">'.$html->select_product_fourn_price($objp->fk_product,'productfournpriceid').'</td></tr>'."\n";
+					}
 					$formMarkup.= '<tr><td align="left" colspan="2">&nbsp;</td></tr>'."\n";
 					$formMarkup.= '<tr><td align="left" width="25%" height="19">&nbsp;'.$langs->trans('PurchasePrice').' '.$langs->trans('HT').'</td>'."\n";
 					$formMarkup.= '<td align="left"><input size="10" type="text" class="flat" name="purchaseprice_ht" value=""></td></tr>'."\n";
@@ -1179,6 +1182,11 @@ if ($_GET['propalid'] > 0)
           print '</tr></table>';
           print '</td>';
         }
+        else
+        {
+        	print '<td>&nbsp;</td>';
+        }
+
 				print '<td align="right">'.vatrate($objp->tva_tx).'%</td>';
 				print '<td align="right">'.price($objp->subprice)."</td>\n";