From 8223419d95025f5ba0149b8f8bc6b6b597d6ec60 Mon Sep 17 00:00:00 2001
From: mEsteban <mathieu.esteban@prestashop.com>
Date: Fri, 19 Feb 2016 17:08:26 +0100
Subject: [PATCH 1/4] New contact email adresse and new version

---
 chronopost.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chronopost.php b/chronopost.php
index a62a501..f279860 100755
--- a/chronopost.php
+++ b/chronopost.php
@@ -150,7 +150,7 @@ public function __construct()
 		$this->name = 'chronopost';
 		$this->tab = 'shipping_logistics';
 
-		$this->version = '3.6.9';
+		$this->version = '3.6.10';
 
 		$this->author = $this->l('Oxileo for Chronopost');
 		$this->module_key = '16ae9609f724c8d72cf3de62c060210c';
@@ -1039,7 +1039,7 @@ public function displayForm()
 			.'<br/>'.$this->l('Your customers will also have the Predict service :  They are notified by email or SMS the day before the delivery and can reschedule the delivery or ask to be delivered at a pickup point among more than 17 000 points (post offices, Pickup relay or Chronopost agencies).').'<br/><br/>'.
 			$this->l('Expand your business internationally with Chronopost international delivery service which is included in this module.').'<br/>'.
 			$this->l('Find all these services in the Chronopost e-commerce pack : MyChrono.').'<br/>'.
-			$this->l('To activate the module on your site, contact us at ').'<a href="mailto:demandez-a-chronopost@chronopost.fr">demandez-a-chronopost@chronopost.fr</a>');
+			$this->l('To activate the module on your site, contact us at ').'<a href="mailto:contact.prestashop@chronopost.fr">contact.prestashop@chronopost.fr</a>');
 
 		// smarty-chain !
 		$this->context->smarty->assign(

From d136a379c58045e29d06bfd83e8f75e6c2528f7b Mon Sep 17 00:00:00 2001
From: mEsteban <mathieu.esteban@prestashop.com>
Date: Fri, 4 Mar 2016 15:47:38 +0100
Subject: [PATCH 2/4] Version Change

---
 config.xml    |  2 +-
 config_fr.xml | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 config_fr.xml

diff --git a/config.xml b/config.xml
index 62afb62..f938218 100644
--- a/config.xml
+++ b/config.xml
@@ -2,7 +2,7 @@
 <module>
 	<name>chronopost</name>
 	<displayName><![CDATA[Chronopost]]></displayName>
-	<version><![CDATA[3.6.9]]></version>
+	<version><![CDATA[3.6.10]]></version>
 	<description><![CDATA[Manage Chronopost and Chronopost Pickup relay]]></description>
 	<author><![CDATA[Oxileo for Chronopost]]></author>
 	<tab><![CDATA[shipping_logistics]]></tab>
diff --git a/config_fr.xml b/config_fr.xml
deleted file mode 100644
index 442b1ad..0000000
--- a/config_fr.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<module>
-	<name>chronopost</name>
-	<displayName><![CDATA[Chronopost et ChronoRelais]]></displayName>
-	<version><![CDATA[3.6.7]]></version>
-	<description><![CDATA[Prise en charge du transporteur Chronopost et des points relais Chrono Relais]]></description>
-	<author><![CDATA[Oxileo pour Chronopost]]></author>
-	<tab><![CDATA[shipping_logistics]]></tab>
-	<confirmUninstall><![CDATA[Attention, une fois ce module désinstallé, vous ne pourrez plus éditer d'étiquettes de transport Chronopost ni proposer la livraison en point relais à vos clients. Etes-vous sûr de vouloir continuer ?]]></confirmUninstall>
-	<is_configurable>1</is_configurable>
-	<need_instance>1</need_instance>
-	<limited_countries></limited_countries>
-</module>
\ No newline at end of file

From 644388b22f6b5af49f3dd49ca9df99f1f3688d31 Mon Sep 17 00:00:00 2001
From: mEsteban <mathieu.esteban@prestashop.com>
Date: Fri, 4 Mar 2016 15:53:15 +0100
Subject: [PATCH 3/4] no message

---
 config_fr.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 config_fr.xml

diff --git a/config_fr.xml b/config_fr.xml
new file mode 100644
index 0000000..c22f106
--- /dev/null
+++ b/config_fr.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<module>
+	<name>chronopost</name>
+	<displayName><![CDATA[Chronopost et ChronoRelais]]></displayName>
+	<version><![CDATA[3.6.9]]></version>
+	<description><![CDATA[Prise en charge du transporteur Chronopost et des points relais Chrono Relais]]></description>
+	<author><![CDATA[Oxileo pour Chronopost]]></author>
+	<tab><![CDATA[shipping_logistics]]></tab>
+	<confirmUninstall><![CDATA[Attention, une fois ce module désinstallé, vous ne pourrez plus éditer d'étiquettes de transport Chronopost ni proposer la livraison en point relais à vos clients. Etes-vous sûr de vouloir continuer ?]]></confirmUninstall>
+	<is_configurable>1</is_configurable>
+	<need_instance>1</need_instance>
+	<limited_countries></limited_countries>
+</module>
\ No newline at end of file

From 159de147b87cb1fa7bce2557a051a6e863e70e68 Mon Sep 17 00:00:00 2001
From: mEsteban <mathieu.esteban@prestashop.com>
Date: Fri, 4 Mar 2016 15:56:54 +0100
Subject: [PATCH 4/4] version change

---
 config_fr.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config_fr.xml b/config_fr.xml
index c22f106..f83087c 100644
--- a/config_fr.xml
+++ b/config_fr.xml
@@ -2,7 +2,7 @@
 <module>
 	<name>chronopost</name>
 	<displayName><![CDATA[Chronopost et ChronoRelais]]></displayName>
-	<version><![CDATA[3.6.9]]></version>
+	<version><![CDATA[3.6.10]]></version>
 	<description><![CDATA[Prise en charge du transporteur Chronopost et des points relais Chrono Relais]]></description>
 	<author><![CDATA[Oxileo pour Chronopost]]></author>
 	<tab><![CDATA[shipping_logistics]]></tab>