// REVERT MERGE

2011-07-27 13:35:06 +00:00
parent 233c0076b7
commit 5f6f018885
182 changed files with 1335 additions and 6181 deletions
@@ -105,7 +105,7 @@ abstract class PaymentModuleCore extends Module
 			$order->id_customer = (int)($cart->id_customer);
 			$order->id_address_invoice = (int)($cart->id_address_invoice);
 			$order->id_address_delivery = (int)($cart->id_address_delivery);
-			$vat_address = new Address((int)($order->{Configuration::get('PS_TAX_ADDRESS_TYPE')}));
+			$vat_address = new Address((int)($order->id_address_delivery));
 			$order->id_currency = ($currency_special ? (int)($currency_special) : (int)($cart->id_currency));
 			$order->id_lang = (int)($cart->id_lang);
 			$order->id_cart = (int)($cart->id);