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 "\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 = '
'."\n"; $formMarkup.= ''."\n"; - $formMarkup.= ''."\n"; - $formMarkup.= ''."\n"; - $formMarkup.= ''."\n"; + if ($objp->fk_product > 0) + { + $formMarkup.= ''."\n"; + $formMarkup.= ''."\n"; + $formMarkup.= ''."\n"; + } $formMarkup.= ''."\n"; $formMarkup.= ''."\n"; $formMarkup.= ''."\n"; @@ -1179,6 +1182,11 @@ if ($_GET['propalid'] > 0) print '
 
 '.$langs->trans('SupplierPrice').''.$html->select_product_fourn_price($objp->fk_product,'productfournpriceid').'
 
 '.$langs->trans('SupplierPrice').''.$html->select_product_fourn_price($objp->fk_product,'productfournpriceid').'
 
 '.$langs->trans('PurchasePrice').' '.$langs->trans('HT').'
'; print ''; } + else + { + print ' '; + } + print ''.vatrate($objp->tva_tx).'%'; print ''.price($objp->subprice)."\n";