From 126d03a68b606466d27dac58a14a598aa5789b86 Mon Sep 17 00:00:00 2001 From: Rodolphe Quiedeville Date: Fri, 27 Jun 2003 16:11:55 +0000 Subject: [PATCH] Ajout lien vers les produits et gestion du code produit par ligne de facture --- htdocs/compta/facture.php3 | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/htdocs/compta/facture.php3 b/htdocs/compta/facture.php3 index dd71a0ff645..60d65ef9541 100644 --- a/htdocs/compta/facture.php3 +++ b/htdocs/compta/facture.php3 @@ -162,7 +162,8 @@ if ($action == 'add') $prop->lignes[$i]->desc, $prop->lignes[$i]->price, $prop->lignes[$i]->qty, - $prop->lignes[$i]->tva_tx); + $prop->lignes[$i]->tva_tx, + $prop->lignes[$i]->product_id); } } else @@ -464,7 +465,7 @@ else * */ - $sql = "SELECT l.description, l.price, l.qty, l.rowid, l.tva_taux"; + $sql = "SELECT l.fk_product, l.description, l.price, l.qty, l.rowid, l.tva_taux"; $sql .= " FROM llx_facturedet as l WHERE l.fk_facture = $facid"; $result = $db->query($sql); @@ -490,7 +491,14 @@ else $objp = $db->fetch_object( $i); $var=!$var; print ""; - print "".stripslashes(nl2br($objp->description))."\n"; + if ($objp->fk_product) + { + print ''.stripslashes(nl2br($objp->description)).''; + } + else + { + print "".stripslashes(nl2br($objp->description))."\n"; + } print ''.$objp->tva_taux.' %'; print ''.$objp->qty.''; print ''.price($objp->price)."\n";