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

Fix: remove deprecated code

Browse Source
This commit is contained in:
Regis Houssin 2011-02-05 08:12:11 +00:00
parent 507c7bd930
commit d86b86d881
1 changed files with 45 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
htdocs/core/class/html.form.class.php
View File

@ -837,14 +837,15 @@ class Form
/** /**
* \brief Return list of products for customer in Ajax if Ajax activated or go to select_produits_do * Return list of products for customer in Ajax if Ajax activated or go to select_produits_do
* \param selected Preselected products *
* \param htmlname Name of HTML seletc field (must be unique in page) * @param selected Preselected products
* \param filtertype Filter on product type (''=nofilter, 0=product, 1=service) * @param htmlname Name of HTML seletc field (must be unique in page)
* \param limit Limit on number of returned lines * @param filtertype Filter on product type (''=nofilter, 0=product, 1=service)
* \param price_level Level of price to show * @param limit Limit on number of returned lines
* \param status -1=Return all products, 0=Products not on sell, 1=Products on sell * @param price_level Level of price to show
* \param finished 2=all, 1=finished, 0=raw material * @param status -1=Return all products, 0=Products not on sell, 1=Products on sell
* @param finished 2=all, 1=finished, 0=raw material
*/ */
function select_produits($selected='',$htmlname='productid',$filtertype='',$limit=20,$price_level=0,$status=1,$finished=2) function select_produits($selected='',$htmlname='productid',$filtertype='',$limit=20,$price_level=0,$status=1,$finished=2)
{ {
@ -864,17 +865,18 @@ class Form
} }
/** /**
* \brief Return list of products for a customer * Return list of products for a customer
* \param selected Preselected product *
* \param htmlname Name of select html * @param selected Preselected product
* \param filtertype Filter on product type (''=nofilter, 0=product, 1=service) * @param htmlname Name of select html
* \param limit Limite sur le nombre de lignes retournees * @param filtertype Filter on product type (''=nofilter, 0=product, 1=service)
* \param price_level Level of price to show * @param limit Limite sur le nombre de lignes retournees
* \param filterkey Filter on product * @param price_level Level of price to show
* \param status -1=Return all products, 0=Products not on sell, 1=Products on sell * @param filterkey Filter on product
* \param finished Filter on finished field: 2=No filter * @param status -1=Return all products, 0=Products not on sell, 1=Products on sell
* \param disableout Disable print output * @param finished Filter on finished field: 2=No filter
* \return array Array of keys for json * @param disableout Disable print output
* @return array Array of keys for json
*/ */
function select_produits_do($selected='',$htmlname='productid',$filtertype='',$limit=20,$price_level=0,$filterkey='',$status=1,$finished=2,$disableout=0) function select_produits_do($selected='',$htmlname='productid',$filtertype='',$limit=20,$price_level=0,$filterkey='',$status=1,$finished=2,$disableout=0)
{ {
@ -947,25 +949,8 @@ class Form
{ {
$num = $this->db->num_rows($result); $num = $this->db->num_rows($result);
$outselect.='<select class="flat" name="'.$htmlname.'"'; $outselect.='<select class="flat" name="'.$htmlname.'">';
//if ($conf->use_javascript_ajax && $num && $conf->global->PRODUIT_USE_SEARCH_TO_SELECT) $outselect.=' onchange="publish_selvalue(this);"'; $outselect.='<option value="0" selected="selected">&nbsp;</option>';
$outselect.='>';
if ($conf->use_javascript_ajax)
{
if (! $num)
{
$outselect.='<option value="0">-- '.$langs->trans("NoProductMatching").' --</option>';
}
else
{
$outselect.='<option value="0" selected="selected">-- '.$langs->trans("MatchingProducts").' --</option>';
}
}
else
{
$outselect.='<option value="0" selected="selected">&nbsp;</option>';
}
$i = 0; $i = 0;
while ($num && $i < $num) while ($num && $i < $num)
@ -1107,12 +1092,13 @@ class Form
} }
/** /**
* \brief Return list of products for customer in Ajax if Ajax activated or go to select_produits_fournisseurs_do * Return list of products for customer in Ajax if Ajax activated or go to select_produits_fournisseurs_do
* \param socid Id third party *
* \param selected Preselected product * @param socid Id third party
* \param htmlname Name of HTML Select * @param selected Preselected product
* \param filtertype Filter on product type (''=nofilter, 0=product, 1=service) * @param htmlname Name of HTML Select
* \param filtre For a SQL filter * @param filtertype Filter on product type (''=nofilter, 0=product, 1=service)
* @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)
{ {
@ -1131,16 +1117,17 @@ class Form
} }
/** /**
* \brief Retourne la liste des produits de fournisseurs * Retourne la liste des produits de fournisseurs
* \param socid Id societe fournisseur (0 pour aucun filtre) *
* \param selected Produit pre-selectionne * @param socid Id societe fournisseur (0 pour aucun filtre)
* \param htmlname Nom de la zone select * @param selected Produit pre-selectionne
* \param filtertype Filter on product type (''=nofilter, 0=product, 1=service) * @param htmlname Nom de la zone select
* \param filtre Pour filtre sql * @param filtertype Filter on product type (''=nofilter, 0=product, 1=service)
* \param filterkey Filtre des produits * @param filtre Pour filtre sql
* \param status -1=Return all products, 0=Products not on sell, 1=Products on sell * @param filterkey Filtre des produits
* \param disableout Disable print output * @param status -1=Return all products, 0=Products not on sell, 1=Products on sell
* \return array Array of keys for json * @param disableout Disable print output
* @return array Array of keys for json
*/ */
function select_produits_fournisseurs_do($socid,$selected='',$htmlname='productid',$filtertype='',$filtre='',$filterkey='',$statut=-1,$disableout=0) function select_produits_fournisseurs_do($socid,$selected='',$htmlname='productid',$filtertype='',$filtre='',$filterkey='',$statut=-1,$disableout=0)
{ {
@ -1183,26 +1170,9 @@ class Form
$num = $this->db->num_rows($result); $num = $this->db->num_rows($result);
$outselect.='<select class="flat" id="select'.$htmlname.'" name="'.$htmlname.'"'; $outselect.='<select class="flat" id="select'.$htmlname.'" name="'.$htmlname.'">';
//if ($conf->use_javascript_ajax && $num) $outselect.=' onchange="publish_selvalue(this);"'; if (! $selected) $outselect.='<option value="0" selected="selected">&nbsp;</option>';
$outselect.='>'; else $outselect.='<option value="0">&nbsp;</option>';
if ($conf->use_javascript_ajax)
{
if (! $num)
{
$outselect.='<option value="0">-- '.$langs->trans("NoProductMatching").' --</option>';
}
else
{
$outselect.='<option value="0" selected="selected">-- '.$langs->trans("MatchingProducts").' --</option>';
}
}
else
{
if (! $selected) $outselect.='<option value="0" selected="selected">&nbsp;</option>';
else $outselect.='<option value="0">&nbsp;</option>';
}
$i = 0; $i = 0;
while ($i < $num) while ($i < $num)