From 72464dc9b7bec2458bea7df260f15ae4023ebf83 Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Wed, 28 Nov 2012 18:52:01 +0100
Subject: [PATCH] [-] BO : fixed bug #PSCFV-5743 - modify status Preparation in
 progress and remove the delivery flag

---
 install-dev/data/xml/order_state.xml | 2 +-
 install-dev/upgrade/sql/1.5.2.1.sql  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/install-dev/data/xml/order_state.xml b/install-dev/data/xml/order_state.xml
index 770e9178e..c4fb9deb2 100644
--- a/install-dev/data/xml/order_state.xml
+++ b/install-dev/data/xml/order_state.xml
@@ -15,7 +15,7 @@
   <entities>
     <order_state id="Awaiting_cheque_payment" invoice="0" send_email="1" module_name="cheque" color="RoyalBlue" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" paid="0"/>
     <order_state id="Payment_accepted" invoice="1" send_email="1" color="LimeGreen" unremovable="1" hidden="0" logable="1" delivery="0" shipped="0" paid="1"/>
-    <order_state id="Preparation_in_progress" invoice="1" send_email="1" color="DarkOrange" unremovable="1" hidden="0" logable="1" delivery="1" shipped="0" paid="1"/>
+    <order_state id="Preparation_in_progress" invoice="1" send_email="1" color="DarkOrange" unremovable="1" hidden="0" logable="1" delivery="0" shipped="0" paid="1"/>
     <order_state id="Shipped" invoice="1" send_email="1" color="BlueViolet" unremovable="1" hidden="0" logable="1" delivery="1" shipped="1" paid="1"/>
     <order_state id="Delivered" invoice="1" send_email="0" color="#108510" unremovable="1" hidden="0" logable="1" delivery="1" shipped="1" paid="1"/>
     <order_state id="Canceled" invoice="0" send_email="1" color="Crimson" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" paid="0"/>
diff --git a/install-dev/upgrade/sql/1.5.2.1.sql b/install-dev/upgrade/sql/1.5.2.1.sql
index 83d45dc16..7725a0b4a 100644
--- a/install-dev/upgrade/sql/1.5.2.1.sql
+++ b/install-dev/upgrade/sql/1.5.2.1.sql
@@ -4,4 +4,6 @@ ALTER TABLE `PREFIX_address` CHANGE  `outstanding_allow_amount` `outstanding_all
 
 /* PHP:blocknewsletter1530(); */;
 
-/* PHP:block_category_1521(); */;
\ No newline at end of file
+/* PHP:block_category_1521(); */;
+
+UPDATE `PREFIX_order_state` SET `delivery` = 0 WHERE `id_order_state` = 3 ;
\ No newline at end of file