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

2015-03-20 20:51:50 +01:00 · 2015-03-20 20:51:50 +01:00 · 33d98b52b5
commit 33d98b52b5
parent eeb09b83a1 9e0aa22a04
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
@ -154,7 +154,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;
+        global $conf, $langs;

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