Index: branches/5.2.x/units/orders/orders_config.php
===================================================================
diff -u -N -r14846 -r14884
--- branches/5.2.x/units/orders/orders_config.php	(.../orders_config.php)	(revision 14846)
+++ branches/5.2.x/units/orders/orders_config.php	(.../orders_config.php)	(revision 14884)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_config.php 14846 2011-12-08 10:25:33Z alex $
+* @version	$Id: orders_config.php 14884 2011-12-19 11:26:05Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -255,8 +255,8 @@
 							'OrderNumber'			=>	'CONCAT(LPAD(Number,6,"0"),\'-\',LPAD(SubNumber,3,"0") )',
 							'SubtotalWithoutDiscount'	=>	'(SubTotal + DiscountTotal)',
 							'SubtotalWithDiscount'	=>	'(SubTotal)',
-							'AmountWithoutVAT'		=>	'(SubTotal+IF(ShippingTaxable=1, ShippingCost, 0)+IF(ProcessingTaxable=1, ProcessingFee, 0))',
-							'TotalAmount'			=>	'SubTotal+ShippingCost+VAT+ProcessingFee+InsuranceFee-GiftCertificateDiscount',
+							'AmountWithoutVAT'		=>	'(SubTotal+IF(ShippingTaxable=1, ShippingCost, 0)+IF(ProcessingTaxable=1, ProcessingFee, 0)-IF(VATIncluded=1,VAT,0))',
+							'TotalAmount'			=>	'SubTotal+ShippingCost+IF(VATIncluded=1,0,VAT)+ProcessingFee+InsuranceFee-GiftCertificateDiscount',
 							'CouponCode'			=>	'pc.Code',
 							'CouponName'			=>	'pc.Name',
 							'AffiliateUser'			=>	'IF( LENGTH(au.Username),au.Username,\'!la_None!\')',
@@ -270,8 +270,8 @@
 							'OrderNumber'			=>	'CONCAT(LPAD(Number,6,"0"),\'-\',LPAD(SubNumber,3,"0") )',
 							'SubtotalWithoutDiscount'	=>	'(SubTotal + DiscountTotal)',
 							'SubtotalWithDiscount'	=>	'(SubTotal)',
-							'AmountWithoutVAT'		=>	'(SubTotal+IF(ShippingTaxable=1, ShippingCost, 0)+IF(ProcessingTaxable=1, ProcessingFee, 0))',
-							'TotalAmount'			=>	'SubTotal+ShippingCost+VAT+ProcessingFee+InsuranceFee-GiftCertificateDiscount',
+							'AmountWithoutVAT'		=>	'(SubTotal+IF(ShippingTaxable=1, ShippingCost, 0)+IF(ProcessingTaxable=1, ProcessingFee, 0)-IF(VATIncluded=1,VAT,0))',
+							'TotalAmount'			=>	'SubTotal+ShippingCost+IF(VATIncluded=1,0,VAT)+ProcessingFee+InsuranceFee-GiftCertificateDiscount',
 							/*'ItemsCount'			=>	'COUNT(%1$s.OrderId)',*/
 							'ShippingSubTotal'		=>	'%1$s.ShippingCost + %1$s.InsuranceFee',
 						),
@@ -359,6 +359,12 @@
 						),
 			            'VAT' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'not_null' =>1, 'default' => '0', 'format' => '%01.2f'),
 			            'VATPercent' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'not_null' =>1, 'default' => '0', 'format' => '%01.3f'),
+			            'VATIncluded' => Array (
+							'type' => 'int',
+							'formatter' => 'kOptionsFormatter',
+							'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1,
+							'not_null' => 1, 'default' => 0,
+						),
 			            'PaymentType' => Array (
 			            	'type' => 'int',
 			            	'formatter' => 'kOptionsFormatter',