[-] BO: Fix ecotax product backoffice management && rounding issue

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17804 b9a71923-0436-4b27-9f14-aed3839534dd
2012-10-09 12:58:08 +00:00
parent 08ecd0d8ce
commit 01cd9ce3dd
6 changed files with 62 additions and 39 deletions
@@ -2781,6 +2781,9 @@ class AdminProductsControllerCore extends AdminController
 				$this->context->currency, $shops, $currencies, $countries, $groups)
 			);

+			$data->assign('ecotax_tax_excl', $obj->ecotax);
+			$this->_applyTaxToEcotax($obj);
+
 			$data->assign(array(
 				'shops' => $shops,
 				'admin_one_shop' => count($this->context->employee->getAssociatedShops()) == 1,
@@ -3288,7 +3291,7 @@ class AdminProductsControllerCore extends AdminController
 		$data->assign('currency', $currency);
 		$this->object = $product;
 		$this->display = 'edit';
-		$this->_applyTaxToEcotax($product);
+

 		/*
 		* Form for adding a virtual product like software, mp3, etc...