dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] BO : fixed bug #PSCFV-5743 - modify status Preparation in progress and remove the delivery flag

Browse Source
This commit is contained in:
vAugagneur
2012-11-28 18:52:01 +01:00
parent b35e0fd519
commit 72464dc9b7
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/data/xml/order_state.xml
+1 -1
View File
@@ -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"/>
install-dev/upgrade/sql/1.5.2.1.sql
+3 -1
View File
@@ -4,4 +4,6 @@ ALTER TABLE `PREFIX_address` CHANGE `outstanding_allow_amount` `outstanding_all
/* PHP:blocknewsletter1530(); */;
/* PHP:block_category_1521(); */;
/* PHP:block_category_1521(); */;
UPDATE `PREFIX_order_state` SET `delivery` = 0 WHERE `id_order_state` = 3 ;