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

// MERGE with 1.4 r7770

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-07-28 09:20:57 +00:00
parent df255f66c1
commit a875fecb20
968 changed files with 26082 additions and 3937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/defines.inc.php
+1 -12
View File
@@ -105,18 +105,7 @@ if (!defined('_PS_MAGIC_QUOTES_GPC_'))
define('_CAN_LOAD_FILES_', 1);
/* Order states */
define('_PS_OS_CHEQUE_', 1);
define('_PS_OS_PAYMENT_', 2);
define('_PS_OS_PREPARATION_', 3);
define('_PS_OS_SHIPPING_', 4);
define('_PS_OS_DELIVERED_', 5);
define('_PS_OS_CANCELED_', 6);
define('_PS_OS_REFUND_', 7);
define('_PS_OS_ERROR_', 8);
define('_PS_OS_OUTOFSTOCK_', 9);
define('_PS_OS_BANKWIRE_', 10);
define('_PS_OS_PAYPAL_', 11);
define('_PS_OS_WS_PAYEMENT_', 12);
// Order states has been moved in config.inc.php file for backward compatibility reasons
/* Tax behavior */
define('PS_PRODUCT_TAX', 0);