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

// MERGE with 1.4 r7770

Browse Source
This commit is contained in:
rMalie
2011-07-28 09:20:57 +00:00
parent 60b07cacb9
commit c17e7c236d
968 changed files with 26082 additions and 3937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/mondialrelay/classes/MRCreateTickets.php
+2 -2
View File
@@ -412,7 +412,7 @@ class MRCreateTickets implements IMondialRelayWSMethod
$history = new OrderHistory();
$history->id_order = (int)($params['NDossier']);
$history->changeIdOrderState(_PS_OS_SHIPPING_, (int)($params['NDossier']));
$history->changeIdOrderState(Configuration::get('PS_OS_SHIPPING'), (int)($params['NDossier']));
$history->id_employee = (int)($cookie->id_employee);
$history->addWithemail(true, $templateVars);
@@ -519,7 +519,7 @@ class MRCreateTickets implements IMondialRelayWSMethod
/*
* Return which number order of the list is currently managed
*/
static public function getCurrentRequestUnderTraitment()
public static function getCurrentRequestUnderTraitment()
{
// TODO: Build a SQL Query to know how many request have been executed
}