//fix for 1.5.2.0

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17903 b9a71923-0436-4b27-9f14-aed3839534dd
2012-10-22 12:41:28 +00:00
parent 20ac37e6bb
commit 25f317e157
20 changed files with 266 additions and 187 deletions
@@ -1172,8 +1172,12 @@ class OrderCore extends ObjectModel
 		{
 			$number = (int)Configuration::get('PS_DELIVERY_NUMBER');
 			if (!$number)
-				throw new PrestaShopException('Invalid delivery number');
-
+			{
+				//if delivery number is not set or wrong, we set a default one.
+				Configuration::updateValue('PS_DELIVERY_NUMBER', 1);
+				$number = 1;
+			}
+				
 			// Set delivery number on invoice
 			$order_invoice->delivery_number = $number;
 			$order_invoice->delivery_date = date('Y-m-d H:i:s');