Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git …

…into develop
Dolibarr · Mar 4, 2012 · b8036d8 · b8036d8
2 parents e4b697f + cbbe00e
commit b8036d8
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
@@ -97,7 +97,7 @@
     }
 
     // Barcode type
-    if ($action ==	'setbarcodetype' && $user->rights->barcode->creer)
+    if ($action ==	'setfk_barcode_type' && $user->rights->barcode->creer)
     {
     	$object->fetch($id);
     	$result = $object->setValueFrom('fk_barcode_type', $_POST['fk_barcode_type']);
@@ -129,8 +129,6 @@
     if ($action == 'setaccountancy_code_buy')
     {
         $object->fetch($id,$ref);
-        $product->accountancy_code_sell=$_POST["productaccountancycodesell"];
-        $result=$product->update($product->id,$user,1,0,1);
         $result = $object->setValueFrom('accountancy_code_sell', $_POST['accountancy_code_sell']);
         if ($result < 0)
         {