From 81fa5a291c8223a08384d2cdcfb4495957f46d8e Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Thu, 28 Nov 2013 15:31:09 +0100 Subject: [PATCH] fix tax rules issue --- core/lib/Thelia/Controller/Admin/ProductController.php | 2 +- core/lib/Thelia/Model/TaxRuleQuery.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/lib/Thelia/Controller/Admin/ProductController.php b/core/lib/Thelia/Controller/Admin/ProductController.php index 9aa2d279e..67f2d1597 100644 --- a/core/lib/Thelia/Controller/Admin/ProductController.php +++ b/core/lib/Thelia/Controller/Admin/ProductController.php @@ -1110,7 +1110,7 @@ class ProductController extends AbstractCrudController $this->dispatch(TheliaEvents::PRODUCT_COMBINATION_GENERATION, $event); // Log object modification - $this->adminLogAppend(sprintf("Combination generation for product reference %s", $event->getProduct()->getRef())); + $this->adminLogAppend($this->resourceCode, AccessManager::CREATE, sprintf("Combination generation for product reference %s", $event->getProduct()->getRef())); // Redirect to the success URL $this->redirect($changeForm->getSuccessUrl()); diff --git a/core/lib/Thelia/Model/TaxRuleQuery.php b/core/lib/Thelia/Model/TaxRuleQuery.php index 572500003..d68ad7ef2 100755 --- a/core/lib/Thelia/Model/TaxRuleQuery.php +++ b/core/lib/Thelia/Model/TaxRuleQuery.php @@ -38,6 +38,7 @@ class TaxRuleQuery extends BaseTaxRuleQuery ->find() ) ->withColumn(TaxRuleCountryTableMap::POSITION, self::ALIAS_FOR_TAX_RULE_COUNTRY_POSITION) + ->orderBy(self::ALIAS_FOR_TAX_RULE_COUNTRY_POSITION, Criteria::ASC); ; return $search->find();