// Merge -> 10309

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10333 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 11:05:10 +00:00
parent 2537c72189
commit 9d10de0848
365 changed files with 11185 additions and 1571 deletions
@@ -122,7 +122,8 @@ class OrderHistoryCore extends ObjectModel

 			if ($newOS->invoice AND !$order->invoice_number)
 				$order->setInvoice();
-			if ($newOS->delivery AND !$order->delivery_number)
+			// Update delivery date even if it was already set by another state change
+			if ($newOS->delivery)
 				$order->setDelivery();
 			Hook::postUpdateOrderStatus((int)($new_order_state), (int)($id_order));
 		}