Index: branches/5.2.x/units/orders/order_calculator.php
===================================================================
diff -u -N -r14436 -r14641
--- branches/5.2.x/units/orders/order_calculator.php	(.../order_calculator.php)	(revision 14436)
+++ branches/5.2.x/units/orders/order_calculator.php	(.../order_calculator.php)	(revision 14641)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version   $Id: order_calculator.php 14436 2011-07-07 16:03:27Z alex $
+* @version   $Id: order_calculator.php 14641 2011-10-05 15:31:23Z alex $
 * @package   In-Commerce
 * @copyright   Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license   Commercial License
@@ -72,13 +72,17 @@
 		}
 
 		/**
-		 * Sets error from last operation
+		 * Sets checkout error
 		 *
+		 * @param int $error_type = {product,coupon,gc}
 		 * @param int $error_code
+		 * @param int $product_id - {ProductId}:{OptionsSalt}:{BackOrderFlag}:{FieldName}
+		 * @return void
+		 * @access protected
 		 */
-		protected function setError($error_code)
+		protected function setError($error_type, $error_code, $product_id = null)
 		{
-			$this->manager->setError($error_code);
+			$this->manager->setError($error_type, $error_code, $product_id);
 		}
 
 		/**
@@ -228,7 +232,12 @@
 
 					if ($to_order < $item['Quantity']) {
 						// ordered less, then requested -> inform user
-						$this->setError($to_order > 0 ? 2 : 3);
+						if ( $to_order > 0 ) {
+							$this->setError(OrderCheckoutErrorType::PRODUCT, OrderCheckoutError::QTY_UNAVAILABLE, $item['ProductId'] . ':' . $item['OptionsSalt'] . ':0:Quantity');
+						}
+						else {
+							$this->setError(OrderCheckoutErrorType::PRODUCT, OrderCheckoutError::QTY_OUT_OF_STOCK, $item['ProductId'] . ':' . $item['OptionsSalt'] . ':0:Quantity');
+						}
 					}
 				}
 			}
@@ -364,7 +373,8 @@
 
 			if ($qty > 0 && $qty < $min_qty) {
 				// qty in cart increased to meat minimal qry requirements of given product
-				$this->setError(6);
+				$this->setError(OrderCheckoutErrorType::PRODUCT, OrderCheckoutError::QTY_CHANGED_TO_MINIMAL, $item['ProductId'] . ':' . $item['OptionsSalt'] . ':0:Quantity');
+
 				$item['Quantity'] = $min_qty;
 			}
 		}