From 26d1ad0668bdcf573d84f2ff267951239c462c19 Mon Sep 17 00:00:00 2001
From: Mikael Blotin <mikael@studio-kiwik.fr>
Date: Wed, 13 Nov 2013 10:12:31 +0100
Subject: [PATCH 1/2] [-] FO : fix contact-form id_order input when customer is
 not logged

---
 themes/default/contact-form.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/default/contact-form.tpl b/themes/default/contact-form.tpl
index 682989d7f..6fb91cf25 100644
--- a/themes/default/contact-form.tpl
+++ b/themes/default/contact-form.tpl
@@ -88,7 +88,7 @@
 							<option value="{$order.value|intval}" {if $order.selected|intval}selected="selected"{/if}>{$order.label|escape:'htmlall':'UTF-8'}</option>
 						{/foreach}
 					</select>
-				{elseif !isset($customerThread.id_order) && !isset($isLogged)}
+				{elseif !isset($customerThread.id_order) && empty($isLogged)}
 					<input type="text" name="id_order" id="id_order" value="{if isset($customerThread.id_order) && $customerThread.id_order|intval > 0}{$customerThread.id_order|intval}{else}{if isset($smarty.post.id_order) && !empty($smarty.post.id_order)}{$smarty.post.id_order|intval}{/if}{/if}" />
 				{elseif $customerThread.id_order|intval > 0}
 					<input type="text" name="id_order" id="id_order" value="{$customerThread.id_order|intval}" readonly="readonly" />

From c69688cc1107e053aa2297fdcb40c70c08fa135f Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Wed, 13 Nov 2013 10:14:21 +0100
Subject: [PATCH 2/2] [-] BO : Fix bug #PSCFV-10990 bad version comparison for
 ps_versions_compliancy

---
 classes/module/Module.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/module/Module.php b/classes/module/Module.php
index f6e3c6473..65f0b07c5 100644
--- a/classes/module/Module.php
+++ b/classes/module/Module.php
@@ -203,7 +203,7 @@ abstract class ModuleCore
 		}
 
 		// Check PS version compliancy
-		if (version_compare(_PS_VERSION_, $this->ps_versions_compliancy['min']) < 0 || version_compare(_PS_VERSION_, $this->ps_versions_compliancy['max']) >= 0)
+		if (version_compare(_PS_VERSION_, $this->ps_versions_compliancy['min']) < 0 || version_compare(_PS_VERSION_, $this->ps_versions_compliancy['max']) > 0)
 		{
 			$this->_errors[] = $this->l('The version of your module is not compliant with your PrestaShop version.');
 			return false;