From 95beae3939018e90ec0c4e581c07fe851abd9f9a Mon Sep 17 00:00:00 2001 From: rGaillard Date: Thu, 11 Oct 2012 09:12:30 +0000 Subject: [PATCH] // small fix git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17833 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminProductsController.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index e6718bbbe..8e4c93ae5 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -2798,14 +2798,18 @@ class AdminProductsControllerCore extends AdminController } else $this->displayWarning($this->l('You must save this product before adding specific prices')); + // prices part - $data->assign('link', $this->context->link); - $data->assign('currency', $currency = $this->context->currency); - $data->assign('tax_rules_groups', TaxRulesGroup::getTaxRulesGroups(true)); - $data->assign('taxesRatesByGroup', TaxRulesGroup::getAssociatedTaxRatesByIdCountry($this->context->country->id)); - $data->assign('ecotaxTaxRate', Tax::getProductEcotaxRate()); - $data->assign('tax_exclude_taxe_option', Tax::excludeTaxeOption()); - $data->assign('ps_use_ecotax', Configuration::get('PS_USE_ECOTAX')); + $data->assign(array( + 'link' => $this->context->link, + 'currency' => $currency = $this->context->currency, + 'tax_rules_groups' => TaxRulesGroup::getTaxRulesGroups(true), + 'taxesRatesByGroup' => TaxRulesGroup::getAssociatedTaxRatesByIdCountry($this->context->country->id), + 'ecotaxTaxRate' => Tax::getProductEcotaxRate(), + 'tax_exclude_taxe_option' => Tax::excludeTaxeOption(), + 'ps_use_ecotax' => Configuration::get('PS_USE_ECOTAX'), + 'ecotax_tax_excl' => 0 + )); $product->price = Tools::convertPrice($product->price, $this->context->currency, true, $this->context); if ($product->unit_price_ratio != 0)