Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6

2015-06-05 09:38:10 +02:00 · 2015-06-05 09:38:10 +02:00 · d0a1d2c3a5
commit d0a1d2c3a5
parent fb29fa486a 15060d973c
1 changed files with 1 additions and 1 deletions
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@ -156,7 +156,7 @@ class ProductFournisseur extends Product
     */
    function update_buyprice($qty, $buyprice, $user, $price_base_type, $fourn, $availability, $ref_fourn, $tva_tx, $charges=0, $remise_percent=0, $remise=0, $newnpr=0)
    {
-        global $conf,$mysoc;
+        global $conf,$mysoc, $langs;

        // Clean parameter
        if (empty($qty)) $qty=0;