From 0bf64107734af8c9aef96974cae5d99a14541225 Mon Sep 17 00:00:00 2001
From: Jerome Nadaud <jerome.nadaud@prestashop.com>
Date: Wed, 23 Oct 2013 12:10:36 +0200
Subject: [PATCH] //Fix save and stay combinations problem

---
 .../combination/helpers/list/list_footer.tpl  |  4 ++-
 .../combination/helpers/list/list_header.tpl  | 29 +++++++++++++++++++
 .../template/helpers/list/list_footer.tpl     |  2 ++
 .../template/helpers/list/list_header.tpl     |  3 +-
 4 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 admin-dev/themes/default/template/controllers/products/combination/helpers/list/list_header.tpl

diff --git a/admin-dev/themes/default/template/controllers/products/combination/helpers/list/list_footer.tpl b/admin-dev/themes/default/template/controllers/products/combination/helpers/list/list_footer.tpl
index cc54e5cb8..4e14bc847 100644
--- a/admin-dev/themes/default/template/controllers/products/combination/helpers/list/list_footer.tpl
+++ b/admin-dev/themes/default/template/controllers/products/combination/helpers/list/list_footer.tpl
@@ -26,7 +26,6 @@
 {extends file="helpers/list/list_footer.tpl"}
 
 {block name="after"}
-
 	<div class="alert alert-info" style="display:block">
 		<ul>
 			<li>{l s='The row in blue is the default combination.'}</li>
@@ -34,3 +33,6 @@
 		</ul>
 	</div>
 {/block}
+
+{block name="endForm"}
+{/block}
diff --git a/admin-dev/themes/default/template/controllers/products/combination/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/products/combination/helpers/list/list_header.tpl
new file mode 100644
index 000000000..d7aea4f1e
--- /dev/null
+++ b/admin-dev/themes/default/template/controllers/products/combination/helpers/list/list_header.tpl
@@ -0,0 +1,29 @@
+{*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+{extends file="helpers/list/list_header.tpl"}
+
+{block name="startForm"}
+{/block}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/helpers/list/list_footer.tpl b/admin-dev/themes/default/template/helpers/list/list_footer.tpl
index 82f9bac78..339419335 100644
--- a/admin-dev/themes/default/template/helpers/list/list_footer.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_footer.tpl
@@ -152,7 +152,9 @@
 {else}
 	</div>
 {/if}
+{block name="endForm"}
 </form>
+{/block}
 
 {hook h='displayAdminListAfter'}
 {if isset($name_controller)}
diff --git a/admin-dev/themes/default/template/helpers/list/list_header.tpl b/admin-dev/themes/default/template/helpers/list/list_header.tpl
index cb2043bde..04a93196b 100644
--- a/admin-dev/themes/default/template/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_header.tpl
@@ -73,8 +73,9 @@
 {/if}
 
 <div class="alert alert-warning" id="{$list_id}-empty-filters-alert" style="display:none;">{l s='Please fill at least one field to perform a search in this list.'}</div>
-
+{block name="startForm"}
 <form method="post" action="{$action}" class="form-horizontal">
+{/block}
 {if !$simple_header}
 	<input type="hidden" id="submitFilter{$list_id}" name="submitFilter{$list_id}" value="0"/>
 	{block name="override_form_extra"}{/block}