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

Fix list of supplier price must show price compared to quantity.

Browse Source
This commit is contained in:
Laurent Destailleur 2016-09-11 14:04:03 +02:00
parent 9709c8bbbf
commit 08dc7ade3b
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/fourn/card.php
View File

@ -298,21 +298,21 @@ if ($object->id > 0)
$langs->load("products"); $langs->load("products");
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td colspan="2">'.$langs->trans("ProductsAndServices").'</td><td align="right">'; print '<td colspan="3">'.$langs->trans("ProductsAndServices").'</td><td align="right">';
print '<a href="'.DOL_URL_ROOT.'/fourn/product/list.php?fourn_id='.$object->id.'">'.$langs->trans("All").' <span class="badge">'.$object->nbOfProductRefs().'</span>'; print '<a href="'.DOL_URL_ROOT.'/fourn/product/list.php?fourn_id='.$object->id.'">'.$langs->trans("All").' <span class="badge">'.$object->nbOfProductRefs().'</span>';
print '</a></td></tr>'; print '</a></td></tr>';
//Query from product/liste.php //Query from product/liste.php
$sql = 'SELECT p.rowid, p.ref, p.label, pfp.tms,'; $sql = 'SELECT p.rowid, p.ref, p.label, p.fk_product_type, p.entity,';
$sql.= ' p.fk_product_type, p.entity'; $sql.= ' pfp.tms, pfp.ref_fourn as supplier_ref, pfp.price, pfp.quantity, pfp.unitprice';
$sql.= ' FROM '.MAIN_DB_PREFIX.'product_fournisseur_price as pfp'; $sql.= ' FROM '.MAIN_DB_PREFIX.'product_fournisseur_price as pfp';
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = pfp.fk_product"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = pfp.fk_product";
$sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')'; $sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
$sql.= ' AND pfp.fk_soc = '.$object->id; $sql.= ' AND pfp.fk_soc = '.$object->id;
$sql .= $db->order('pfp.tms', 'desc'); $sql .= $db->order('pfp.tms', 'desc');
$sql.= $db->plimit($MAXLIST); $sql.= $db->plimit($MAXLIST);
$query = $db->query($sql); $query = $db->query($sql);
if (! $query) dol_print_error($db);
$return = array(); $return = array();
@ -335,12 +335,24 @@ if ($object->id > 0)
print $productstatic->getNomUrl(1); print $productstatic->getNomUrl(1);
print '</td>'; print '</td>';
print '<td>'; print '<td>';
print $productstatic->ref; print $objp->supplier_ref;
print '</td>'; print '</td>';
print '<td>'; print '<td class="maxwidthonsmartphone">';
print dol_trunc(dol_htmlentities($objp->label), 30); print dol_trunc(dol_htmlentities($objp->label), 30);
print '</td>'; print '</td>';
print '<td align="right" class="nowrap">'.dol_print_date($objp->tms).'</td>'; //print '<td align="right" class="nowrap">'.dol_print_date($objp->tms, 'day').'</td>';
print '<td align="right">';
//print (isset($objp->unitprice) ? price($objp->unitprice) : '');
if (isset($objp->price))
{
print price($objp->price);
if ($objp->quantity > 1)
{
print ' / ';
print $objp->quantity;
}
}
print '</td>';
print '</tr>'; print '</tr>';
} }
} }

2
htdocs/fourn/product/list.php
View File

@ -23,7 +23,7 @@
/** /**
* \file htdocs/fourn/product/list.php * \file htdocs/fourn/product/list.php
* \ingroup produit * \ingroup produit
* \brief Page liste des produits ou services * \brief Page to list supplier products and services
*/ */
require '../../main.inc.php'; require '../../main.inc.php';