diff --git a/templates/backOffice/default/admin-layout.tpl b/templates/backOffice/default/admin-layout.tpl
index da4cdc3e6..6876b5dd5 100755
--- a/templates/backOffice/default/admin-layout.tpl
+++ b/templates/backOffice/default/admin-layout.tpl
@@ -267,6 +267,6 @@
 
 	{* Modules scripts are included now *}
 	{module_include location='footer_js'}
-
+    {block name="javascript-last-call"}{/block}
 </body>
 </html>
diff --git a/templates/backOffice/default/admin-logs.html b/templates/backOffice/default/admin-logs.html
index 80eadbbe5..5ca9f9399 100755
--- a/templates/backOffice/default/admin-logs.html
+++ b/templates/backOffice/default/admin-logs.html
@@ -231,4 +231,8 @@
         });
 
     </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='admin-logs-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/administrators.html b/templates/backOffice/default/administrators.html
index a02846c0f..73fd9724d 100755
--- a/templates/backOffice/default/administrators.html
+++ b/templates/backOffice/default/administrators.html
@@ -355,4 +355,8 @@ jQuery(function($) {
 })
 </script>
 
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='administrators-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/attribute-edit.html b/templates/backOffice/default/attribute-edit.html
index 5952f8b8f..7c82d8b9d 100755
--- a/templates/backOffice/default/attribute-edit.html
+++ b/templates/backOffice/default/attribute-edit.html
@@ -317,4 +317,8 @@
 
         });
     </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='attribute-edit-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/attributes.html b/templates/backOffice/default/attributes.html
index ae86c74f6..2fcb8b0ed 100755
--- a/templates/backOffice/default/attributes.html
+++ b/templates/backOffice/default/attributes.html
@@ -327,4 +327,8 @@
 
         });
     </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='attributes-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/categories.html b/templates/backOffice/default/categories.html
index e25b79f1e..ecf8c52ec 100755
--- a/templates/backOffice/default/categories.html
+++ b/templates/backOffice/default/categories.html
@@ -709,4 +709,8 @@
 
         });
     </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='categories-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/category-edit.html b/templates/backOffice/default/category-edit.html
index 5003824c1..4bd5d81ad 100755
--- a/templates/backOffice/default/category-edit.html
+++ b/templates/backOffice/default/category-edit.html
@@ -393,4 +393,8 @@ $(function() {
 
 });
 </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='category-edit-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/config-store.html b/templates/backOffice/default/config-store.html
index 2355f3b66..14f4bef81 100755
--- a/templates/backOffice/default/config-store.html
+++ b/templates/backOffice/default/config-store.html
@@ -168,3 +168,7 @@
     </div>
 </div>
 {/block}
+
+{block name="javascript-last-call"}
+    {module_include location='config-store-js'}
+{/block}
diff --git a/templates/backOffice/default/configuration.html b/templates/backOffice/default/configuration.html
index debaaa6fb..ae6ce634c 100755
--- a/templates/backOffice/default/configuration.html
+++ b/templates/backOffice/default/configuration.html
@@ -189,4 +189,8 @@
             </div>
         </div>
     </div>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='configuration-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/content-edit.html b/templates/backOffice/default/content-edit.html
index 92b59b533..1014d512c 100755
--- a/templates/backOffice/default/content-edit.html
+++ b/templates/backOffice/default/content-edit.html
@@ -264,4 +264,8 @@ form_content    = {$smarty.capture.delete_folder_dialog nofilter}
 
         });
     </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='content-edit-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/countries.html b/templates/backOffice/default/countries.html
index 5f820956a..6682097b0 100755
--- a/templates/backOffice/default/countries.html
+++ b/templates/backOffice/default/countries.html
@@ -261,4 +261,8 @@
         </script>
     {/javascripts}
 
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='countries-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/country-edit.html b/templates/backOffice/default/country-edit.html
index fa4f756ad..0eaa7fd4c 100755
--- a/templates/backOffice/default/country-edit.html
+++ b/templates/backOffice/default/country-edit.html
@@ -124,4 +124,8 @@
 
         </div>
     </div>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='country-edit-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/coupon-create.html b/templates/backOffice/default/coupon-create.html
index 66636df47..691067be2 100755
--- a/templates/backOffice/default/coupon-create.html
+++ b/templates/backOffice/default/coupon-create.html
@@ -62,3 +62,7 @@
     </script>
 
 {/block}
+
+{block name="javascript-last-call"}
+    {module_include location='coupon-create-js'}
+{/block}
diff --git a/templates/backOffice/default/coupon-list.html b/templates/backOffice/default/coupon-list.html
index fb4005fb1..5ed255cb1 100755
--- a/templates/backOffice/default/coupon-list.html
+++ b/templates/backOffice/default/coupon-list.html
@@ -162,3 +162,7 @@
         <script src="{$asset_url}"></script>
     {/javascripts}
 {/block}
+
+{block name="javascript-last-call"}
+    {module_include location='coupon-list-js'}
+{/block}
diff --git a/templates/backOffice/default/coupon-read.html b/templates/backOffice/default/coupon-read.html
index 8bc91f67e..a4f67c9f2 100755
--- a/templates/backOffice/default/coupon-read.html
+++ b/templates/backOffice/default/coupon-read.html
@@ -165,3 +165,7 @@
     {/javascripts}
 
 {/block}
+
+{block name="javascript-last-call"}
+    {module_include location='coupon-read-js'}
+{/block}
diff --git a/templates/backOffice/default/coupon-update.html b/templates/backOffice/default/coupon-update.html
index 138ed28aa..68cfb6a90 100755
--- a/templates/backOffice/default/coupon-update.html
+++ b/templates/backOffice/default/coupon-update.html
@@ -147,3 +147,7 @@
         });
     </script>
 {/block}
+
+{block name="javascript-last-call"}
+    {module_include location='coupon-update-js'}
+{/block}
diff --git a/templates/backOffice/default/currencies.html b/templates/backOffice/default/currencies.html
index c35b1a39f..21784fd3b 100755
--- a/templates/backOffice/default/currencies.html
+++ b/templates/backOffice/default/currencies.html
@@ -358,4 +358,8 @@
 
         });
     </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='currencies-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/currency-edit.html b/templates/backOffice/default/currency-edit.html
index 51dcea985..92ff36649 100755
--- a/templates/backOffice/default/currency-edit.html
+++ b/templates/backOffice/default/currency-edit.html
@@ -123,4 +123,8 @@
 
         </div>
     </div>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='currency-edit-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/customer-edit.html b/templates/backOffice/default/customer-edit.html
index 24087a756..d5b48f3d6 100755
--- a/templates/backOffice/default/customer-edit.html
+++ b/templates/backOffice/default/customer-edit.html
@@ -423,4 +423,8 @@
                 {/if}
             });
     </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='customer-edit-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/customers.html b/templates/backOffice/default/customers.html
index 9dff5e9c3..eccb6e63e 100755
--- a/templates/backOffice/default/customers.html
+++ b/templates/backOffice/default/customers.html
@@ -371,4 +371,8 @@
             });
         </script>
 
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='customers-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/document-edit.html b/templates/backOffice/default/document-edit.html
index bc556da31..f8f6fd17d 100755
--- a/templates/backOffice/default/document-edit.html
+++ b/templates/backOffice/default/document-edit.html
@@ -160,4 +160,8 @@
          });
     </script>
 
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='document-edit-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/feature-edit.html b/templates/backOffice/default/feature-edit.html
index cc8b3788e..0f9d2d652 100755
--- a/templates/backOffice/default/feature-edit.html
+++ b/templates/backOffice/default/feature-edit.html
@@ -317,4 +317,8 @@
 
         });
     </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='feature-edit-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/features.html b/templates/backOffice/default/features.html
index 04a4d7c2a..281b06eb1 100755
--- a/templates/backOffice/default/features.html
+++ b/templates/backOffice/default/features.html
@@ -327,4 +327,8 @@
 
         });
     </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='features-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/folder-edit.html b/templates/backOffice/default/folder-edit.html
index 29e4bb165..88f7f42ba 100755
--- a/templates/backOffice/default/folder-edit.html
+++ b/templates/backOffice/default/folder-edit.html
@@ -347,4 +347,8 @@
 
         });
     </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='folder-edit-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/folders.html b/templates/backOffice/default/folders.html
index d1689608b..264bab81f 100755
--- a/templates/backOffice/default/folders.html
+++ b/templates/backOffice/default/folders.html
@@ -627,4 +627,8 @@
 
         });
     </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='folders-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/home.html b/templates/backOffice/default/home.html
index dcfe59a92..e943e05c8 100755
--- a/templates/backOffice/default/home.html
+++ b/templates/backOffice/default/home.html
@@ -408,4 +408,8 @@ jQuery(function($){
 });
 
 </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='home-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/image-edit.html b/templates/backOffice/default/image-edit.html
index 362d10adb..316c8c4ff 100755
--- a/templates/backOffice/default/image-edit.html
+++ b/templates/backOffice/default/image-edit.html
@@ -165,4 +165,8 @@
          });
     </script>
 
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='image-edit-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/languages.html b/templates/backOffice/default/languages.html
index dc337efe2..5d14da4a8 100755
--- a/templates/backOffice/default/languages.html
+++ b/templates/backOffice/default/languages.html
@@ -306,4 +306,8 @@
             });
         });
     </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='languages-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/mailing-system.html b/templates/backOffice/default/mailing-system.html
index 92d205289..0162dc8e6 100755
--- a/templates/backOffice/default/mailing-system.html
+++ b/templates/backOffice/default/mailing-system.html
@@ -140,4 +140,8 @@ jQuery(function($) {
 });
 
 </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='mainling-system-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/message-edit.html b/templates/backOffice/default/message-edit.html
index 9033c2432..6de72a897 100755
--- a/templates/backOffice/default/message-edit.html
+++ b/templates/backOffice/default/message-edit.html
@@ -234,3 +234,7 @@
 	 })(jQuery);
 </script>
 {/block}
+
+{block name="javascript-last-call"}
+    {module_include location='message-edit-js'}
+{/block}
diff --git a/templates/backOffice/default/messages.html b/templates/backOffice/default/messages.html
index ea4b0371a..e64f81d87 100755
--- a/templates/backOffice/default/messages.html
+++ b/templates/backOffice/default/messages.html
@@ -213,4 +213,8 @@
         }
     });
 </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='messages-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/module-configure.html b/templates/backOffice/default/module-configure.html
index 4074b00fc..9ed9fa924 100755
--- a/templates/backOffice/default/module-configure.html
+++ b/templates/backOffice/default/module-configure.html
@@ -22,4 +22,8 @@
     </div>
 </div>
 
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='module-config-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/module-edit.html b/templates/backOffice/default/module-edit.html
index 755a50826..ab1edc9d0 100755
--- a/templates/backOffice/default/module-edit.html
+++ b/templates/backOffice/default/module-edit.html
@@ -75,8 +75,6 @@
 
 {/block}
 
-{block name="javascript-initialization"}
-
-
-
+{block name="javascript-last-call"}
+    {module_include location='module-edit-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/modules.html b/templates/backOffice/default/modules.html
index 12d918efc..43db83c4a 100755
--- a/templates/backOffice/default/modules.html
+++ b/templates/backOffice/default/modules.html
@@ -103,4 +103,8 @@
            });
         });
     </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='modules-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/order-edit.html b/templates/backOffice/default/order-edit.html
index 1d5abf358..96f92464b 100755
--- a/templates/backOffice/default/order-edit.html
+++ b/templates/backOffice/default/order-edit.html
@@ -509,4 +509,8 @@
         });
     </script>
 
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='order-edit-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/orders.html b/templates/backOffice/default/orders.html
index 6299341a7..808bd8c8d 100755
--- a/templates/backOffice/default/orders.html
+++ b/templates/backOffice/default/orders.html
@@ -164,4 +164,8 @@
         });
     </script>
 
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='orders-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/product-edit.html b/templates/backOffice/default/product-edit.html
index 617ba3b2d..a75bdcb0f 100755
--- a/templates/backOffice/default/product-edit.html
+++ b/templates/backOffice/default/product-edit.html
@@ -416,4 +416,8 @@ $(function() {
 </script>
 
 
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='product-edit-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/profile-edit.html b/templates/backOffice/default/profile-edit.html
index 8eb104cd0..7e4d57a27 100755
--- a/templates/backOffice/default/profile-edit.html
+++ b/templates/backOffice/default/profile-edit.html
@@ -303,4 +303,8 @@
         <script src='{$asset_url}'></script>
     {/javascripts}
 
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='profile-edit-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/profiles.html b/templates/backOffice/default/profiles.html
index 418037cc1..0cbc2b123 100755
--- a/templates/backOffice/default/profiles.html
+++ b/templates/backOffice/default/profiles.html
@@ -208,4 +208,8 @@ jQuery(function($) {
 })
 </script>
 
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='profiles-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/search.html b/templates/backOffice/default/search.html
index d96558ea9..af3ec743d 100755
--- a/templates/backOffice/default/search.html
+++ b/templates/backOffice/default/search.html
@@ -235,4 +235,8 @@
 
     <script>
     </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='search-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/shipping-configuration-edit.html b/templates/backOffice/default/shipping-configuration-edit.html
index 8c24d2ff7..1cb53d4c7 100755
--- a/templates/backOffice/default/shipping-configuration-edit.html
+++ b/templates/backOffice/default/shipping-configuration-edit.html
@@ -165,4 +165,8 @@
             });
         });
     </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='shipping-configuration-edit-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/shipping-configuration.html b/templates/backOffice/default/shipping-configuration.html
index 2f0892c1f..e65b1ad28 100755
--- a/templates/backOffice/default/shipping-configuration.html
+++ b/templates/backOffice/default/shipping-configuration.html
@@ -139,4 +139,8 @@
             });
         });
     </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='shipping-configuration-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/shipping-zones-edit.html b/templates/backOffice/default/shipping-zones-edit.html
index d18c4eea2..6d76bc5eb 100755
--- a/templates/backOffice/default/shipping-zones-edit.html
+++ b/templates/backOffice/default/shipping-zones-edit.html
@@ -137,4 +137,8 @@
             });
         });
     </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='shipping-zones-edit-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/shipping-zones.html b/templates/backOffice/default/shipping-zones.html
index 29e2ba346..e86dcb0b8 100755
--- a/templates/backOffice/default/shipping-zones.html
+++ b/templates/backOffice/default/shipping-zones.html
@@ -63,4 +63,8 @@
 
     </div>
 </div>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='shipping-zones-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/system-logs.html b/templates/backOffice/default/system-logs.html
index 92e59c730..9cf7f64fe 100755
--- a/templates/backOffice/default/system-logs.html
+++ b/templates/backOffice/default/system-logs.html
@@ -210,4 +210,8 @@ $(function() {
     });
 });
 </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='system-logs-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/tax-edit.html b/templates/backOffice/default/tax-edit.html
index 03c40b0a5..4e77024ac 100755
--- a/templates/backOffice/default/tax-edit.html
+++ b/templates/backOffice/default/tax-edit.html
@@ -157,4 +157,8 @@
 
     </script>
 
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='tax-edit-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/tax-rule-edit.html b/templates/backOffice/default/tax-rule-edit.html
index 0af295e63..9b9d44d20 100755
--- a/templates/backOffice/default/tax-rule-edit.html
+++ b/templates/backOffice/default/tax-rule-edit.html
@@ -422,4 +422,8 @@
 
     </script>
 
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='tax-rule-edit-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/taxes-rules.html b/templates/backOffice/default/taxes-rules.html
index 0ef8ce7f2..e9d80efed 100755
--- a/templates/backOffice/default/taxes-rules.html
+++ b/templates/backOffice/default/taxes-rules.html
@@ -378,4 +378,8 @@ form_content        = {$smarty.capture.tax_rule_delete_dialog nofilter}
         })
     </script>
 
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='taxes-rules-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/template-edit.html b/templates/backOffice/default/template-edit.html
index 265ef2173..5c0fc8114 100755
--- a/templates/backOffice/default/template-edit.html
+++ b/templates/backOffice/default/template-edit.html
@@ -119,4 +119,8 @@
             $('#attribute_list_management').load("{url noamp='1' path='/admin/configuration/templates/attributes/list'  template_id=$template_id}");
        });
     </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='template-edit-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/templates.html b/templates/backOffice/default/templates.html
index a56568920..880c35747 100755
--- a/templates/backOffice/default/templates.html
+++ b/templates/backOffice/default/templates.html
@@ -211,4 +211,8 @@
             }
         });
     </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='templates-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/translations.html b/templates/backOffice/default/translations.html
index 5a48e5277..e209dcfcf 100755
--- a/templates/backOffice/default/translations.html
+++ b/templates/backOffice/default/translations.html
@@ -317,3 +317,7 @@
     });
 </script>
 {/block}
+
+{block name="javascript-last-call"}
+    {module_include location='translations-js'}
+{/block}
diff --git a/templates/backOffice/default/variable-edit.html b/templates/backOffice/default/variable-edit.html
index ca57774dd..e5c801ee5 100755
--- a/templates/backOffice/default/variable-edit.html
+++ b/templates/backOffice/default/variable-edit.html
@@ -114,4 +114,8 @@
 
     </div>
 </div>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='variable-edit-js'}
 {/block}
\ No newline at end of file
diff --git a/templates/backOffice/default/variables.html b/templates/backOffice/default/variables.html
index 8ea90e85e..89f0a423c 100755
--- a/templates/backOffice/default/variables.html
+++ b/templates/backOffice/default/variables.html
@@ -279,4 +279,8 @@
 
     });
 </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='variables-js'}
 {/block}
\ No newline at end of file