lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: rgression sur l'affichage des references fournisseurs, ncessite plus de modification que prvu, ceci se fera aprs la sortie de la 2.1

Browse Source
This commit is contained in:
Regis Houssin 2007-04-25 14:50:59 +00:00
parent 3816beaf60
commit 6c46ad93cd
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/fourn/commande/fiche.php
View File

@ -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 "<tr $bc[$var]>";
print '<td>';
print '<a href="'.DOL_URL_ROOT.'/product/fournisseurs.php?id='.$objp->fk_product.'">'.img_object($langs->trans("ShowProduct"),'product').' '.$objp->ref.'</a>';
print ' ('.$objp->ref_fourn.') - '.$objp->label;
//print ' ('.$objp->ref_fourn.') - '.$objp->label;
print ' - '.$objp->label;
if ($objp->description) print '<br>'.nl2br($objp->description);
print "</td>";
print '<td align="center">'.$objp->tva_tx.'%</td>';

6
htdocs/fourn/facture/fiche.php
View File

@ -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
{

12
htdocs/fourn/fournisseur.facture.class.php
View File

@ -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;

11
htdocs/html.form.class.php
View File

@ -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 = '<option value="'.$objp->rowid.'"';
if ($selected == $objp->rowid) $opt.= ' selected="true"';
$opt.= '>'.$objp->ref.' ('.$objp->ref_fourn.') - ';
//$opt.= '>'.$objp->ref.' ('.$objp->ref_fourn.') - ';
$opt.= '>'.$objp->ref.' - ';
$opt.= dolibarr_trunc($objp->label,24).' - ';
$opt.= $objp->fprice.$langs->trans("Currency".$conf->monnaie)."/".$objp->quantity.$langs->trans("Units");
if ($objp->quantity > 1)