diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index a4b0852c7c6..b84121a601b 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -610,10 +610,10 @@ else $sql = "SELECT l.ref, l.fk_product, l.description, l.price, l.qty"; $sql.= ", l.rowid, l.tva_tx, l.remise_percent, l.subprice"; $sql.= ", p.label"; - $sql.= ", pf.ref_fourn"; + //$sql.= ", pf.ref_fourn"; $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as l"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON l.fk_product = p.rowid"; - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur as pf ON l.fk_product = pf.fk_product"; + //$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur as pf ON l.fk_product = pf.fk_product"; $sql.= " WHERE l.fk_commande = ".$commande->id; $sql.= " ORDER BY l.rowid"; @@ -641,7 +641,8 @@ else print ""; print ''; print ''.img_object($langs->trans("ShowProduct"),'product').' '.$objp->ref.''; - print ' ('.$objp->ref_fourn.') - '.$objp->label; + //print ' ('.$objp->ref_fourn.') - '.$objp->label; + print ' - '.$objp->label; if ($objp->description) print '
'.nl2br($objp->description); print ""; print ''.$objp->tva_tx.'%'; diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 837b055023d..161ef98dd10 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -735,8 +735,10 @@ else { $productstatic->id=$fac->lignes[$i]->fk_product; $productstatic->type=1; - $productstatic->ref=$fac->lignes[$i]->ref; - print $productstatic->getNomUrl(1).' ('.$fac->lignes[$i]->ref_fourn.') - '.$fac->lignes[$i]->libelle; + //$productstatic->ref=$fac->lignes[$i]->ref; + //print $productstatic->getNomUrl(1).' ('.$fac->lignes[$i]->ref_fourn.') - '.$fac->lignes[$i]->libelle; + $productstatic->ref=$fac->lignes[$i]->libelle; + print $productstatic->getNomUrl(1); } else { diff --git a/htdocs/fourn/fournisseur.facture.class.php b/htdocs/fourn/fournisseur.facture.class.php index 1e1d765653e..15253231801 100644 --- a/htdocs/fourn/fournisseur.facture.class.php +++ b/htdocs/fourn/fournisseur.facture.class.php @@ -209,13 +209,13 @@ class FactureFournisseur extends Facture /* * Lignes */ - $sql = 'SELECT f.rowid, f.description, f.pu_ht, f.qty, f.tva_taux, f.tva,'; - $sql.= ' f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_product,'; - $sql.= ' p.ref, p.label as label, p.description as product_desc,'; - $sql.= ' pf.ref_fourn'; + $sql = 'SELECT f.rowid, f.description, f.pu_ht, f.qty, f.tva_taux, f.tva'; + $sql.= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_product'; + $sql.= ', p.ref, p.label as label, p.description as product_desc'; + //$sql.= ', pf.ref_fourn'; $sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det as f'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON f.fk_product = p.rowid'; - $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur as pf ON f.fk_product = pf.fk_product'; + //$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur as pf ON f.fk_product = pf.fk_product'; $sql.= ' WHERE fk_facture_fourn='.$this->id; dolibarr_syslog("FactureFourn::Fetch search lines sql=".$sql, LOG_DEBUG); @@ -232,7 +232,7 @@ class FactureFournisseur extends Facture $this->lignes[$i]->rowid = $obj->rowid; $this->lignes[$i]->description = $obj->description; $this->lignes[$i]->ref = $obj->ref; // Reference interne du produit - $this->lignes[$i]->ref_fourn = $obj->ref_fourn; // Reference fournisseur du produit + //$this->lignes[$i]->ref_fourn = $obj->ref_fourn; // Reference fournisseur du produit $this->lignes[$i]->libelle = $obj->label; // Label du produit $this->lignes[$i]->product_desc = $obj->product_desc; // Description du produit $this->lignes[$i]->pu_ht = $obj->pu_ht; diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php index d3ad76565ea..d87acd9d083 100644 --- a/htdocs/html.form.class.php +++ b/htdocs/html.form.class.php @@ -939,11 +939,11 @@ class Form { global $langs,$conf; - $sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration,"; - $sql.= " pf.ref_fourn,"; - $sql.= " pfp.price as fprice, pfp.quantity"; + $sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration"; + //$sql.= ", pf.ref_fourn"; + $sql.= ", pfp.price as fprice, pfp.quantity"; $sql.= " FROM ".MAIN_DB_PREFIX."product as p"; - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur as pf ON p.rowid = pf.fk_product"; + //$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur as pf ON p.rowid = pf.fk_product"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product"; $sql.= " WHERE p.envente = 1"; if ($socid) $sql.= " AND pfp.fk_soc = ".$socid; @@ -968,7 +968,8 @@ class Form $opt = '