Fix: Pb in price level management
This commit is contained in:
parent
f93474f152
commit
ba97f78108
@ -731,12 +731,12 @@ class Form
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Retourne la liste des produits en Ajax si ajax activé ou renvoie à select_produits_do
|
* \brief Return list of products for customer in Ajax if Ajax activated or go to select_produits_do
|
||||||
* \param selected Produit pré-sélectionné
|
* \param selected Preselected products
|
||||||
* \param htmlname Nom de la zone select
|
* \param htmlname Name of HTML select
|
||||||
* \param filtertype Filter on product type (''=nofilter, 0=product, 1=service)
|
* \param filtertype Filter on product type (''=nofilter, 0=product, 1=service)
|
||||||
* \param limit Limite sur le nombre de lignes retournées
|
* \param limit Limit sur le nombre de lignes retournées
|
||||||
* \param price_level Niveau de prix en fonction du client
|
* \param price_level Level of price to show
|
||||||
* \param status -1=Return all products, 0=Products not on sell, 1=Products on sell
|
* \param status -1=Return all products, 0=Products not on sell, 1=Products on sell
|
||||||
* \param finished 2=all, 1=finished, 0=raw material
|
* \param finished 2=all, 1=finished, 0=raw material
|
||||||
*/
|
*/
|
||||||
@ -768,13 +768,13 @@ class Form
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Retourne la liste des produits
|
* \brief Return list of products for a customer
|
||||||
* \param selected Produit pré-sélectionné
|
* \param selected Preselected product
|
||||||
* \param htmlname Nom de la zone select
|
* \param htmlname Name of select html
|
||||||
* \param filtertype Filter on product type (''=nofilter, 0=product, 1=service)
|
* \param filtertype Filter on product type (''=nofilter, 0=product, 1=service)
|
||||||
* \param limit Limite sur le nombre de lignes retournées
|
* \param limit Limite sur le nombre de lignes retournées
|
||||||
* \param price_level Niveau de prix en fonction du client
|
* \param price_level Level of price to show
|
||||||
* \param ajaxkeysearch Filtre des produits si ajax est utilisé
|
* \param ajaxkeysearch Filter on product if ajax is used
|
||||||
* \param status -1=Return all products, 0=Products not on sell, 1=Products on sell
|
* \param status -1=Return all products, 0=Products not on sell, 1=Products on sell
|
||||||
*/
|
*/
|
||||||
function select_produits_do($selected='',$htmlname='productid',$filtertype='',$limit=20,$price_level=0,$ajaxkeysearch='',$status=1,$finished=2)
|
function select_produits_do($selected='',$htmlname='productid',$filtertype='',$limit=20,$price_level=0,$ajaxkeysearch='',$status=1,$finished=2)
|
||||||
@ -875,8 +875,8 @@ class Form
|
|||||||
$opt = '<option value="'.$objp->rowid.'">'.$objp->ref.' - ';
|
$opt = '<option value="'.$objp->rowid.'">'.$objp->ref.' - ';
|
||||||
$opt.= dol_trunc($objp->label,32).' - ';
|
$opt.= dol_trunc($objp->label,32).' - ';
|
||||||
|
|
||||||
// Multiprix
|
// Multiprice
|
||||||
if ($price_level > 1)
|
if ($price_level > 0)
|
||||||
{
|
{
|
||||||
$sql= "SELECT price, price_ttc, price_base_type ";
|
$sql= "SELECT price, price_ttc, price_base_type ";
|
||||||
$sql.= "FROM ".MAIN_DB_PREFIX."product_price ";
|
$sql.= "FROM ".MAIN_DB_PREFIX."product_price ";
|
||||||
@ -941,12 +941,12 @@ class Form
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Retourne la liste des produits fournisseurs en Ajax si ajax activé ou renvoie à select_produits_fournisseurs_do
|
* \brief Return list of products for customer in Ajax if Ajax activated or go to select_produits_fournisseurs_do
|
||||||
* \param socid Id third party
|
* \param socid Id third party
|
||||||
* \param selected Produit pré-sélectionné
|
* \param selected Preselected product
|
||||||
* \param htmlname Nom de la zone select
|
* \param htmlname Name of HTML Select
|
||||||
* \param filtertype Filter on product type (''=nofilter, 0=product, 1=service)
|
* \param filtertype Filter on product type (''=nofilter, 0=product, 1=service)
|
||||||
* \param filtre Pour filtre sql
|
* \param filtre For a SQL filter
|
||||||
*/
|
*/
|
||||||
function select_produits_fournisseurs($socid,$selected='',$htmlname='productid',$filtertype='',$filtre)
|
function select_produits_fournisseurs($socid,$selected='',$htmlname='productid',$filtertype='',$filtre)
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user