// REVERT MERGE

This commit is contained in:
rMalie
2011-07-27 13:35:06 +00:00
parent 233c0076b7
commit 5f6f018885
182 changed files with 1335 additions and 6181 deletions
@@ -412,7 +412,7 @@ class MRCreateTickets implements IMondialRelayWSMethod
$history = new OrderHistory();
$history->id_order = (int)($params['NDossier']);
$history->changeIdOrderState(Configuration::get('PS_OS_SHIPPING'), (int)($params['NDossier']));
$history->changeIdOrderState(_PS_OS_SHIPPING_, (int)($params['NDossier']));
$history->id_employee = (int)($cookie->id_employee);
$history->addWithemail(true, $templateVars);