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
classes/OrderState.php
+2 -2
View File
@@ -99,7 +99,7 @@ class OrderStateCore extends ObjectModel
* @param integer $id_lang Language id for state name
* @return array Order states
*/
static public function getOrderStates($id_lang)
public static function getOrderStates($id_lang)
{
return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
SELECT *
@@ -114,7 +114,7 @@ class OrderStateCore extends ObjectModel
* @param integer $id_order_state State ID
* @return boolean availability
*/
static public function invoiceAvailable($id_order_state)
public static function invoiceAvailable($id_order_state)
{
$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
SELECT `invoice` AS ok