Merge branch 'master' of github.com:thelia/thelia into cleanmaster

2013-12-18 17:47:23 +01:00
parent 1ba60103f3 a6a2c43345
commit c981102d3a
167 changed files with 644 additions and 537 deletions
--- a/templates/backOffice/default/order-edit.html
+++ b/templates/backOffice/default/order-edit.html
@@ -520,4 +520,8 @@
        });
    </script>

+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='order-edit-js'}
 {/block}