diff --git a/htdocs/comm/propal.php3 b/htdocs/comm/propal.php3 index 6c872cdbe21..7f69bc8e501 100644 --- a/htdocs/comm/propal.php3 +++ b/htdocs/comm/propal.php3 @@ -277,11 +277,6 @@ if ($propalid) * */ - - /* - * - */ - print ""; if ($action == 'statut') @@ -306,14 +301,14 @@ if ($propalid) print '
| Réf | Produit | "; - print 'Prix | Qté. | '; + print 'Prix | Tva | Qté. | '; if ($obj->statut == 0) { print ""; } print " | [$objp->ref] | \n"; print ''.$objp->product.' | '; print "".price($objp->price)." | "; - print ''; + print ' | '.$objp->tva_tx.' % | '; print "".$objp->qty." | \n"; if ($obj->statut == 0 && $user->rights->propale->creer) { @@ -348,7 +343,7 @@ if ($propalid) } } - $sql = "SELECT pt.rowid, pt.description, pt.price, pt.qty"; + $sql = "SELECT pt.rowid, pt.description, pt.price, pt.qty, pt.tva_tx"; $sql .= " FROM llx_propaldet as pt WHERE pt.fk_propal = $propalid AND pt.fk_product = 0"; $result = $db->query($sql); @@ -363,7 +358,8 @@ if ($propalid) print "
| \n"; print ' | '.$objp->description.' | '; print "".price($objp->price)." | "; - print "".$objp->qty." | \n"; + print ''.$objp->tva_tx.' % | '; + print "".$objp->qty." | \n"; if ($obj->statut == 0 && $user->rights->propale->creer) { print 'Supprimer | ';