Merge pull request #6132 from simnandez/3.9

Fix #5646 Error editing Sell Price on products/services
Dolibarr · Dec 11, 2016 · 5c4ab99 · 5c4ab99
2 parents 7fd75c7 + 56aafa4
commit 5c4ab99
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2005-2015	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2006		Andre Cianfarani		<acianfa@free.fr>
  * Copyright (C) 2014		Florian Henry			<florian.henry@open-concept.pro>
- * Copyright (C) 2014		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2014-2016	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2014-2015 	Philippe Grand 		    <philippe.grand@atoo-net.com>
  * Copyright (C) 2014		Ion agorria				<ion@agorria.com>
  * Copyright (C) 2015		Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
@@ -246,8 +246,8 @@
 		        {
 		            $obj = $db->fetch_object($resql);
 		            $npr = $obj->recuperableonly;
-		            $localtax1 = $obj->localtax1;
-		            $localtax2 = $obj->localtax2;
+		            $localtax1 = get_localtax($tva_tx,1);
+		            $localtax2 = get_localtax($tva_tx,2);
 		            $localtax1_type = $obj->localtax1_type;
 		            $localtax2_type = $obj->localtax2_type;
 		        }