Skip to content

Commit

Permalink
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into d…
Browse files Browse the repository at this point in the history
…evelop
  • Loading branch information
eldy committed Jul 31, 2013
2 parents 012228a + 6e28987 commit eccfd33
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions htdocs/core/class/html.form.class.php
Expand Up @@ -1400,7 +1400,7 @@ function select_produits_list($selected='',$htmlname='productid',$filtertype='',
$objp->remise = $objp2->remise;
$objp->price_by_qty_rowid = $objp2->rowid;

$this->_construct_product_list_option($objp, $opt, $optJson, 0, $selected);
$this->constructProductListOption($objp, $opt, $optJson, 0, $selected);

$j++;

Expand All @@ -1414,7 +1414,7 @@ function select_produits_list($selected='',$htmlname='productid',$filtertype='',
}
else
{
$this->_construct_product_list_option($objp, $opt, $optJson, $price_level, $selected);
$this->constructProductListOption($objp, $opt, $optJson, $price_level, $selected);
// Add new entry
// "key" value of json key array is used by jQuery automatically as selected value
// "label" value of json key array is used by jQuery automatically as text for combo box
Expand Down

0 comments on commit eccfd33

Please sign in to comment.