// MERGE with trunk revision 7754

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7759 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-07-27 12:48:42 +00:00
parent 4ade3a0ea0
commit e159c925d8
182 changed files with 6179 additions and 1333 deletions
@@ -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);