Merge branch 'master' of https://github.com/thelia/thelia

Conflicts: core/lib/Thelia/Controller/Admin/ProductController.php core/lib/Thelia/Model/Product.php
2013-09-18 00:35:48 +02:00
parent de4767ef56 c659bc0e66
commit d02f13f021
45 changed files with 887 additions and 274 deletions
--- a/templates/admin/default/categories.html
+++ b/templates/admin/default/categories.html
@@ -517,6 +517,7 @@

 {capture "product_delete_dialog"}
    <input type="hidden" name="product_id" id="product_delete_id" value="" />
+    <input type="hidden" name="category_id" value="{$category_id}" />

    {module_include location='product_delete_form'}