diff --git a/admin-dev/themes/default/template/controllers/orders/form.tpl b/admin-dev/themes/default/template/controllers/orders/form.tpl
new file mode 100755
index 000000000..2e27fa066
--- /dev/null
+++ b/admin-dev/themes/default/template/controllers/orders/form.tpl
@@ -0,0 +1,1066 @@
+{*
+* 2007-2011 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision: 8971 $
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+<script type="text/javascript">
+	var id_cart = '';
+	var id_customer = '';
+	var changed_shipping_price = false;
+	var shipping_price_selected_carrier = '';
+	var current_index = '{$current}&token={$token}';
+	var cart_quantity = new Array();
+	var currencies = new Array();
+	var id_currency = '';
+	var id_lang = '';
+	var txt_show_carts = '{l s='Show carts and orders for this customer'}';
+	var txt_hide_carts = '{l s='Hide carts and orders for this customer'}';
+	$(document).ready(function() {
+		$('#customer').typeWatch({
+			captureLength: 1,
+			highlight: true,
+			wait: 100,
+			callback: function(){ searchCustomers(); }
+			});
+		$('#product').typeWatch({
+			captureLength: 1,
+			highlight: true,
+			wait: 100,
+			callback: function(){ searchProducts(); }
+		});
+		$("#id_address_delivery").change(function() {
+			updateAddresses();
+		});
+		$("#id_address_invoice").change(function() {
+			updateAddresses();
+		});
+		$('#id_currency').change(function() {
+			updateCurrency();
+		});
+		$('#id_lang').change(function() {
+			updateLang();
+		});
+		$('#delivery_option,#carrier_recycled_package,#order_gift,#gift_message').change(function() {
+			updateDeliveryOption();
+		});
+		$('#shipping_price').change(function() {
+			if ($(this).val() != shipping_price_selected_carrier)
+				changed_shipping_price = true;
+		});
+		$('#show_old_carts').click(function() {
+			if ($('#old_carts_orders:visible').length == 0)
+			{
+				$(this).html(txt_hide_carts);
+				$('#old_carts_orders').slideDown('slow');
+			}
+			else
+			{
+				$(this).html(txt_show_carts);
+				$('#old_carts_orders').slideUp('slow');
+			}
+		});
+		$('#send_email_to_customer').click(function(){
+			sendMailToCustomer();
+		});
+		$('#show_old_carts').click();
+		$.ajaxSetup({ type:"post" });
+		$("#voucher").autocomplete('{$link->getAdminLink('AdminCartRules')}', {
+					minChars: 3,
+					max: 15,
+					width: 250,
+					selectFirst: false,
+					scroll: false,
+					dataType: "json",
+					formatItem: function(data, i, max, value, term) {
+						return value;
+					},
+					parse: function(data) {
+						if (!data.found)
+							$('#vouchers_err').html('{l s='No voucher found'}').show();
+						else
+							$('#vouchers_err').hide();
+						var mytab = new Array();
+						for (var i = 0; i < data.vouchers.length; i++)
+							mytab[mytab.length] = { data: data.vouchers[i], value: data.vouchers[i].name+' - '+data.vouchers[i].description };
+						return mytab;
+					},
+					extraParams: {
+						ajax: "1",
+						token: "{getAdminToken tab='AdminCartRules'}",
+						tab: "AdminCartRules",
+						action: "searchCartRuleVouchers"
+					}
+				}
+			)
+			.result(function(event, data, formatted) {
+				$('#voucher').val(data.name);
+				$.ajax({
+					type:"POST",
+					url: "{$link->getAdminLink('AdminCarts')}",
+					async: true,
+					dataType: "json",
+					data : {
+						ajax: "1",
+						token: "{getAdminToken tab='AdminCarts'}",
+						tab: "AdminCarts",
+						action: "addVoucher",
+						id_cart_rule: data.id_cart_rule,
+						id_cart: id_cart,
+						id_customer: id_customer
+						},
+					success : function(res)
+					{
+						displaySummary(res);
+						$('#voucher').val('');
+						var errors = '';
+						if (res.errors.length > 0)
+						{
+							$.each(res.errors, function() {
+								errors += this+'<br/>';
+							});
+							$('#vouchers_err').html(errors).show();
+						}
+						else
+							$('#vouchers_err').hide();
+					}
+				});
+			});
+		{if $cart->id}
+			setupCustomer('{$cart->id_customer}');
+			useCart('{$cart->id}');
+		{/if}
+
+		$('.delete_product').live('click', function(e) {
+			e.preventDefault();
+			var to_delete = $(this).attr('rel').split('_');
+			deleteProduct(to_delete[1], to_delete[2]);
+		});
+		$('.delete_discount').live('click', function(e) {
+			e.preventDefault();
+			deleteVoucher($(this).attr('rel'));
+		});
+		$('.use_cart').live('click', function(e) {
+			e.preventDefault();
+			useCart($(this).attr('rel'));
+		});
+
+		$('.duplicate_order').live('click', function(e) {
+			e.preventDefault();
+			duplicateOrder($(this).attr('rel'));
+		});
+		$('.cart_quantity').live('change', function(e) {
+			e.preventDefault();
+			if ($(this).val() != cart_quantity[$(this).attr('rel')])
+			{
+				var product = $(this).attr('rel').split('_');
+				updateQty(product[0], product[1], $(this).val() - cart_quantity[$(this).attr('rel')]);
+			}
+		});
+		$('.increaseqty_product, .decreaseqty_product').live('click', function(e) {
+			e.preventDefault();
+			var product = $(this).attr('rel').split('_');
+			var sign = '';
+			if ($(this).hasClass('decreaseqty_product'))
+				sign = '-';
+			updateQty(product[0], product[1], sign+1);
+		});
+		$('#id_product').live('keydown', function(e) {
+			$(this).click();
+			return true;
+		});
+		$('#id_product, .id_product_attribute').live('change', function(e) {
+			e.preventDefault();
+			displayQtyInStock(this.id);
+		});
+		$('#id_product, .id_product_attribute').live('keydown', function(e) {
+			$(this).change();
+			return true;
+		});
+		$('.product_unit_price').live('change', function(e) {
+			e.preventDefault();
+			var product = $(this).attr('rel').split('_');
+			updateProductPrice(product[0], product[1], $(this).val());
+		});
+		/*$('.fancybox').live('click', function(e) {
+			$(this).fancybox().trigger('click');
+			return false;
+		});*/
+		resetBind();
+	});
+
+	function resetBind()
+	{
+		$('.fancybox').fancybox();
+		/*$("#new_address").fancybox({
+			onClosed: useCart(id_cart)
+		});*/
+	}
+
+	function updateProductPrice(id_product, id_product_attribute, new_price)
+	{
+		$.ajax({
+			type:"POST",
+			url: "{$link->getAdminLink('AdminCarts')}",
+			async: true,
+			dataType: "json",
+			data : {
+				ajax: "1",
+				token: "{getAdminToken tab='AdminCarts'}",
+				tab: "AdminCarts",
+				action: "updateProductPrice",
+				id_cart: id_cart,
+				id_product: id_product,
+				id_product_attribute: id_product_attribute,
+				id_customer: id_customer,
+				price: new_price
+				},
+			success : function(res)
+			{
+				displaySummary(res);
+			}
+		});
+	}
+
+	function displayQtyInStock(id)
+	{
+		var id_product = $('#id_product').val();
+		if ($('#ipa_' + id_product + ' option').length)
+			var id_product_attribute = $('#ipa_' + id_product).val();
+		else
+			var id_product_attribute = 0;
+
+		$('#qty_in_stock').html(stock[id_product][id_product_attribute]);
+	}
+
+	function duplicateOrder(id_order)
+	{
+		$.ajax({
+			type:"POST",
+			url: "{$link->getAdminLink('AdminCarts')}",
+			async: true,
+			dataType: "json",
+			data : {
+				ajax: "1",
+				token: "{getAdminToken tab='AdminCarts'}",
+				tab: "AdminCarts",
+				action: "duplicateOrder",
+				id_order: id_order,
+				id_customer: id_customer
+				},
+			success : function(res)
+			{
+				id_cart = res.cart.id;
+				$('#id_cart').val(id_cart);
+				displaySummary(res);
+			}
+		});
+	}
+
+	function useCart(id_new_cart)
+	{
+		id_cart = id_new_cart;
+		$('#id_cart').val(id_cart);
+		$('#id_cart').val(id_cart);
+		$.ajax({
+			type:"POST",
+			url: "{$link->getAdminLink('AdminCarts')}",
+			async: true,
+			dataType: "json",
+			data : {
+				ajax: "1",
+				token: "{getAdminToken tab='AdminCarts'}",
+				tab: "AdminCarts",
+				action: "getSummary",
+				id_cart: id_cart,
+				id_customer: id_customer
+				},
+			success : function(res)
+			{
+				displaySummary(res);
+			}
+		});
+	}
+
+	function deleteVoucher(id_cart_rule)
+	{
+		$.ajax({
+			type:"POST",
+			url: "{$link->getAdminLink('AdminCarts')}",
+			async: true,
+			dataType: "json",
+			data : {
+				ajax: "1",
+				token: "{getAdminToken tab='AdminCarts'}",
+				tab: "AdminCarts",
+				action: "deleteVoucher",
+				id_cart_rule: id_cart_rule,
+				id_cart: id_cart,
+				id_customer: id_customer
+				},
+			success : function(res)
+			{
+				displaySummary(res);
+			}
+		});
+	}
+
+	function deleteProduct(id_product, id_product_attribute)
+	{
+		$.ajax({
+			type:"POST",
+			url: "{$link->getAdminLink('AdminCarts')}",
+			async: true,
+			dataType: "json",
+			data : {
+				ajax: "1",
+				token: "{getAdminToken tab='AdminCarts'}",
+				tab: "AdminCarts",
+				action: "deleteProduct",
+				id_product: id_product,
+				id_product_attribute: id_product_attribute,
+				id_cart: id_cart,
+				id_customer: id_customer
+				},
+			success : function(res)
+			{
+				displaySummary(res);
+			}
+		});
+	}
+
+	function searchCustomers()
+	{
+		$.ajax({
+			type:"POST",
+			url : "{$link->getAdminLink('AdminOrders')}",
+			async: true,
+			dataType: "json",
+			data : {
+				ajax: "1",
+				token: "{$token}",
+				tab: "AdminOrders",
+				action: "searchCustomers",
+				customer_search: $('#customer').val()},
+			success : function(res)
+			{
+				if(res.found)
+				{
+					var html = '<ul>';
+					$.each(res.customers, function() {
+						html += '<li class="customerCard"><div class="customerName"><a class="fancybox" href="{$link->getAdminLink('AdminCustomers')}&id_customer='+this.id_customer+'&viewcustomer&liteDisplaying=1">'+this.firstname+' '+this.lastname+'</a><span class="customerBirthday"> '+((this.birthday) ? this.birthday : '')+'</span></div>';
+						html += '<div class="customerEmail"><a href="mailto:'+this.email+'">'+this.email+'</div>';
+						html += '<a onclick="setupCustomer('+ this.id_customer+');" href="#" class="id_customer button">{l s='Choose'}</a></li>';
+					});
+					html += '</ul>';
+				}
+				else
+					html = '<div class="warn">{l s='No customers found'}</div>';
+				$('#customers').html(html);
+				resetBind();
+			}
+		});
+	}
+
+	function setupCustomer(idCustomer)
+	{
+		$('#products_part').show();
+		$('#vouchers_part').show();
+		$('#address_part').show();
+		$('#carriers_part').show();
+		$('#summary_part').show();
+		var address_link = $('#new_address').attr('href');
+		id_customer = idCustomer;
+		$('#new_address').attr('href', address_link.replace(/id_customer=[0-9]+/, 'id_customer='+id_customer));
+		$.ajax({
+			type:"POST",
+			url : "{$link->getAdminLink('AdminCarts')}",
+			async: true,
+			dataType: "json",
+			data : {
+				ajax: "1",
+				token: "{getAdminToken tab='AdminCarts'}",
+				tab: "AdminCarts",
+				action: "searchCarts",
+				id_customer: id_customer
+			},
+			success : function(res)
+			{
+				if(res.found)
+				{
+					var html_carts = '';
+					var html_orders = '';
+					$.each(res.carts, function() {
+						html_carts += '<tr><td>'+this.id_cart+'</td><td>'+this.date_add+'</td><td>'+this.total_price+'</td>';
+						html_carts += '<td><a title="{l s='View this cart'}" class="fancybox" href="index.php?tab=AdminCarts&id_cart='+this.id_cart+'&viewcart&token={getAdminToken tab='AdminCarts'}&liteDisplaying=1#"><img src="../img/admin/details.gif" /></a>';
+						html_carts += '<a href="#" title="{l s='Use this cart'}" class="use_cart" rel="'+this.id_cart+'"><img src="../img/admin/duplicate.png" /></a></td></tr>';
+					});
+					$.each(res.orders, function() {
+						html_orders += '<tr><td>'+this.id_order+'</td><td>'+this.date_add+'</td><td>'+this.nb_products+'</td><td>'+this.total_paid_real+'</span></td><td>'+this.payment+'</td><td>'+this.order_state+'</td>';
+						html_orders += '<td><a title="{l s='View this order'}" class="fancybox" href="{$link->getAdminLink('AdminOrders')}&id_order='+this.id_order+'&vieworder&liteDisplaying=1#"><img src="../img/admin/details.gif" /></a>';
+						html_orders += '<a href="#" "title="{l s='Duplicate this order'}" class="duplicate_order" rel="'+this.id_order+'"><img src="../img/admin/duplicate.png" /></a></td></tr>';
+					});
+					$('#nonOrderedCarts table tbody').html(html_carts);
+					$('#lastOrders table tbody').html(html_orders);
+				}
+				if (res.id_cart)
+				{
+					id_cart = res.id_cart;
+					$('#id_cart').val(id_cart);
+				}
+				displaySummary(res);
+				resetBind();
+				updateCurrencySign();
+			}
+		});
+	}
+
+	function updateDeliveryOptionList(delivery_option_list)
+	{
+		var html = '';
+		if (delivery_option_list.length > 0)
+		{
+			$.each(delivery_option_list, function() {
+				html += '<option value="'+this.key+'" '+(($('#delivery_option').val() == this.key) ? 'selected="selected"' : '')+'>'+this.name+'</option>';
+			});
+			$('#carrier_form').show();
+			$('#delivery_option').html(html);
+			$('#carriers_err').hide();
+		}
+		else
+		{
+			$('#carrier_form').hide();
+			$('#carriers_err').show().html('{l s='No carrier can be applied to this order'}');
+		}
+	}
+
+	function searchProducts()
+	{
+		$('#products_part').show();
+		$.ajax({
+			type:"POST",
+			url: "{$link->getAdminLink('AdminOrders')}",
+			async: true,
+			dataType: "json",
+			data : {
+				ajax: "1",
+				token: "{$token}",
+				tab: "AdminOrders",
+				action: "searchProducts",
+				id_cart: id_cart,
+				id_customer: id_customer,
+				id_currency: id_currency,
+				product_search: $('#product').val()},
+			success : function(res)
+			{
+				var products_found = '';
+				var attributes_html = '';
+				stock = {};
+				
+				if(res.found)
+				{
+					$('#products_err').hide();
+					$('#products_found').show();
+					products_found += '<label>{l s='Product:'}</label><select id="id_product" onclick="displayProductAttributes();">';
+					attributes_html += '<label>{l s='Combination:'}</label>';
+					$.each(res.products, function() {
+						products_found += '<option '+(this.combinations.length > 0 ? 'rel="'+this.qty_in_stock+'"' : '')+' value="'+this.id_product+'">'+this.name+(this.combinations.length == 0 ? ' - '+this.formatted_price : '')+'</option>';
+						attributes_html += '<select class="id_product_attribute" id="ipa_'+this.id_product+'" style="display:none;">';
+						var id_product = this.id_product;
+						
+						$.each(this.combinations, function() {
+							attributes_html += '<option rel="'+this.qty_in_stock+'" '+(this.default_on == 1 ? 'selected="selected"' : '')+' value="'+this.id_product_attribute+'">'+this.attributes+' - '+this.formatted_price+'</option>';
+						});
+						
+						stock[this.id_product] = this.stock;
+						
+						attributes_html += '</select>';
+					});
+					
+					products_found += '</select>';
+					
+					$('#products_found #product_list').html(products_found);
+					$('#products_found #attributes_list').html(attributes_html);
+					displayProductAttributes();
+					$('#id_product').change();
+				}
+				else
+				{
+					$('#products_found').hide();
+					$('#products_err').html('{l s='No products found'}');
+					$('#products_err').show();
+				}
+				resetBind();
+			}
+		});
+	}
+
+	function displayProductAttributes()
+	{
+		if ($('#ipa_'+$('#id_product option:selected').val()+' option').length === 0)
+			$('#attributes_list').hide();
+		else
+		{
+			$('#attributes_list').show();
+			$('.id_product_attribute').hide();
+			$('#ipa_'+$('#id_product option:selected').val()).show();
+		}
+	}
+
+	function updateCartProducts(products)
+	{
+		var cart_content = '';
+		$.each(products, function() {
+			cart_quantity[this.id_product+'_'+this.id_product_attribute] = this.cart_quantity;
+			cart_content += '<tr><td><img src="'+this.image_link+'" title="'+this.name+'" /></td><td>'+this.name+'<br />'+this.attributes_small+'</td><td>'+this.reference+'</td><td><input type="text" size="7" rel="'+this.id_product+'_'+this.id_product_attribute+'" class="product_unit_price" value="'+this.price+'" />&nbsp;<span class="currency_sign"></span></td><td>';
+			cart_content += '<div style="float:left;"><a href="#" class="increaseqty_product" rel="'+this.id_product+'_'+this.id_product_attribute+'" ><img src="../img/admin/up.gif" /></a><br /><a href="#" class="decreaseqty_product" rel="'+this.id_product+'_'+this.id_product_attribute+'"><img src="../img/admin/down.gif" /></a></div>';
+			cart_content += '<div style="float:left;"><input type="text" rel="'+this.id_product+'_'+this.id_product_attribute+'" class="cart_quantity" size="2" value="'+this.cart_quantity+'" />';
+			cart_content += '<a href="#" class="delete_product" rel="delete_'+this.id_product+'_'+this.id_product_attribute+'" ><img src="../img/admin/delete.gif" /></a>';
+			cart_content += '</div></td><td>'+this.total+'&nbsp;<span class="currency_sign"></span></td></tr>';
+		});
+		$('#customer_cart tbody').html(cart_content);
+	}
+
+	function updateCartVouchers(vouchers)
+	{
+		var vouchers_html = '';
+		if (vouchers.length > 0)
+		{
+			$.each(vouchers, function() {
+				vouchers_html += '<tr><td>'+this.name+'</td><td>'+this.description+'</td><td>'+this.value_real+'</td><td><a href="#" class="delete_discount" rel="'+this.id_discount+'"><img src="../img/admin/delete.gif" /></a></td></tr>';
+			});
+			$('#voucher_list').show();
+		}
+		else
+			$('#voucher_list').hide();
+
+		$('#voucher_list tbody').html(vouchers_html);
+	}
+
+	function updateCartPaymentList(payment_list)
+	{
+		$('#payment_list').html(payment_list);
+	}
+
+	function displaySummary(jsonSummary)
+	{
+		updateCartProducts(jsonSummary.summary.products);
+		updateCartVouchers(jsonSummary.summary.discounts);
+		updateAddressesList(jsonSummary.addresses, jsonSummary.cart.id_address_delivery, jsonSummary.cart.id_address_invoice);
+
+		if (!jsonSummary.summary.products.length || !jsonSummary.addresses.length || !jsonSummary.delivery_option_list)
+			$('#carriers_part,#summary_part').hide();
+		else
+			$('#carriers_part,#summary_part').show();
+		
+		updateDeliveryOptionList(jsonSummary.delivery_option_list);
+
+		if (jsonSummary.cart.gift == 1)
+			$('#order_gift').attr('checked', 'checked');
+		else
+			$('#carrier_gift').removeAttr('checked');
+		if (jsonSummary.cart.recyclable == 1)
+			$('#carrier_recycled_package').attr('checked', 'checked');
+		else
+			$('#carrier_recycled_package').removeAttr('checked');
+		$('#gift_message').html(jsonSummary.cart.gift_message);
+		if(!changed_shipping_price)
+			$('#shipping_price').val(jsonSummary.summary.total_shipping);
+		shipping_price_selected_carrier = jsonSummary.summary.total_shipping;
+
+		$('#total_vouchers').html(jsonSummary.summary.total_discounts_tax_exc);
+		$('#total_shipping').html(jsonSummary.summary.total_shipping_tax_exc);
+		$('#total_taxes').html(jsonSummary.summary.total_tax);
+		$('#total_without_taxes').html(jsonSummary.summary.total_price_without_tax);
+		$('#total_with_taxes').html(jsonSummary.summary.total_price);
+		$('#total_products').html(jsonSummary.summary.total_products);
+		id_currency = jsonSummary.cart.id_currency;
+		$('#id_currency option').removeAttr('selected');
+		$('#id_currency option[value="'+id_currency+'"]').attr('selected', 'selected');
+		updateCurrencySign();
+		id_lang = jsonSummary.cart.id_lang;
+		$('#id_lang option').removeAttr('selected');
+		$('#id_lang option[value="'+id_lang+'"]').attr('selected', 'selected');
+		$('#send_email_to_customer').attr('rel', jsonSummary.link_order);
+		$('#go_order_process').attr('href', jsonSummary.link_order);
+		resetBind();
+	}
+
+	function updateQty(id_product, id_product_attribute, qty)
+	{
+		$.ajax({
+			type:"POST",
+			url: "{$link->getAdminLink('AdminCarts')}",
+			async: true,
+			dataType: "json",
+			data : {
+				ajax: "1",
+				token: "{getAdminToken tab='AdminCarts'}",
+				tab: "AdminCarts",
+				action: "updateQty",
+				id_product: id_product,
+				id_product_attribute: id_product_attribute,
+				qty: qty,
+				id_customer: id_customer,
+				id_cart: id_cart
+				},
+			success : function(res)
+			{
+					displaySummary(res);
+					var errors = '';
+					if(res.errors.length)
+					{
+						$.each(res.errors, function() {
+							errors += this+'<br />';
+						});
+						$('#products_err').show();
+					}
+					else
+						$('#products_err').hide();
+					$('#products_err').html(errors);
+			}
+		});
+	}
+
+	function resetShippingPrice()
+	{
+		$('#shipping_price').val(shipping_price_selected_carrier);
+		changed_shipping_price = false;
+	}
+
+	function addProduct()
+	{
+		var id_product = $('#id_product option:selected').val();
+		updateQty(id_product, $('#ipa_'+id_product+' option:selected').val(), $('#qty').val());
+	}
+
+	function updateCurrency()
+	{
+		$.ajax({
+			type:"POST",
+			url: "{$link->getAdminLink('AdminCarts')}",
+			async: true,
+			dataType: "json",
+			data : {
+				ajax: "1",
+				token: "{getAdminToken tab='AdminCarts'}",
+				tab: "AdminCarts",
+				action: "updateCurrency",
+				id_currency: $('#id_currency option:selected').val(),
+				id_customer: id_customer,
+				id_cart: id_cart
+				},
+			success : function(res)
+			{
+					displaySummary(res);
+			}
+		});
+	}
+
+	function updateLang()
+	{
+		$.ajax({
+			type:"POST",
+			url: "{$link->getAdminLink('AdminCarts')}",
+			async: true,
+			dataType: "json",
+			data : {
+				ajax: "1",
+				token: "{getAdminToken tab='AdminCarts'}",
+				tab: "admincarts",
+				action: "updateLang",
+				id_currency: $('#id_lang option:selected').val(),
+				id_customer: id_customer,
+				id_cart: id_cart
+				},
+			success : function(res)
+			{
+					displaySummary(res);
+			}
+		});
+	}
+
+	function updateDeliveryOption()
+	{
+		$.ajax({
+			type:"POST",
+			url: "{$link->getAdminLink('AdminCarts')}",
+			async: true,
+			dataType: "json",
+			data : {
+				ajax: "1",
+				token: "{getAdminToken tab='AdminCarts'}",
+				tab: "AdminCarts",
+				action: "updateDeliveryOption",
+				delivery_option: $('#delivery_option option:selected').val(),
+				gift: $('#order_gift').is(':checked')?1:0,
+				gift_message: $('#gift_message').val(),
+				recyclable: $('#carrier_recycled_package').is(':checked')?1:0,
+				id_customer: id_customer,
+				id_cart: id_cart
+				},
+			success : function(res)
+			{
+				displaySummary(res);
+			}
+		});
+	}
+
+	function updateCurrencySign()
+	{
+		$('.currency_sign').html(currencies[id_currency]);
+	}
+
+	function sendMailToCustomer()
+	{
+		$.ajax({
+			type:"POST",
+			url: "{$link->getAdminLink('AdminOrders')}",
+			async: true,
+			dataType: "json",
+			data : {
+				ajax: "1",
+				token: "{getAdminToken tab='AdminOrders'}",
+				tab: "AdminOrders",
+				action: "sendMailValidateOrder",
+				id_customer: id_customer,
+				id_cart: id_cart
+				},
+			success : function(res)
+			{
+				if (res.errors)
+					$('#send_email_feedback').removeClass('conf').addClass('error');
+				else
+					$('#send_email_feedback').removeClass('error').addClass('conf');
+				$('#send_email_feedback').html(res.result);
+			}
+		});
+	}
+	
+	function updateAddressesList(addresses, id_address_delivery, id_address_invoice)
+	{
+		var addresses_delivery_options = '';
+		var addresses_invoice_options = '';
+		var address_invoice_detail = '';
+		var address_delivery_detail = '';
+		$.each(addresses, function() {
+			if (this.id_address == id_address_invoice)
+				address_invoice_detail = this.company+' '+this.firstname+' '+this.lastname+'<br />'+this.address1+'<br />'+this.address2+'<br />'+this.postcode+' '+this.city+' '+this.country;
+			if(this.id_address == id_address_delivery)
+				address_delivery_detail = this.company+' '+this.firstname+' '+this.lastname+'<br />'+this.address1+'<br />'+this.address2+'<br />'+this.postcode+' '+this.city+' '+this.country;
+
+			addresses_delivery_options += '<option value="'+this.id_address+'" '+(this.id_address == id_address_delivery ? 'selected="selected"' : '')+'>'+this.alias+'</option>';
+			addresses_invoice_options += '<option value="'+this.id_address+'" '+(this.id_address == id_address_invoice ? 'selected="selected"' : '')+'>'+this.alias+'</option>';
+		});
+		$('#id_address_delivery').html(addresses_delivery_options);
+		$('#id_address_invoice').html(addresses_invoice_options);
+		$('#address_delivery_detail').html(address_delivery_detail);
+		$('#address_invoice_detail').html(address_invoice_detail);
+	}
+
+	function updateAddresses()
+	{
+		$.ajax({
+			type:"POST",
+			url: "{$link->getAdminLink('AdminCarts')}",
+			async: true,
+			dataType: "json",
+			data : {
+				ajax: "1",
+				token: "{getAdminToken tab='AdminCarts'}",
+				tab: "AdminCarts",
+				action: "updateAddresses",
+				id_customer: id_customer,
+				id_cart: id_cart,
+				id_address_delivery: $('#id_address_delivery option:selected').val(),
+				id_address_invoice: $('#id_address_invoice option:selected').val()
+				},
+			success : function(res)
+			{
+				displaySummary(res);
+			}
+		});
+	}
+
+</script>
+{if $show_toolbar}
+	<div class="toolbar-placeholder">
+		<div class="toolbarBox {if $toolbar_fix}toolbarHead{/if}">
+				{include file="toolbar.tpl"}
+				<div class="pageTitle">
+				<h3>
+					{block name=pageTitle}
+						<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
+					{/block}
+				</h3>
+				</div>
+		</div>
+	</div>
+	<div class="leadin">{block name="leadin"}{/block}</div>
+{/if}
+<fieldset id="customer_part"><legend><img src="../img/admin/tab-customers.gif" />{l s='Customer'}</legend>
+	<p><label>{l s='Search customers:'}</label><input type="text" id="customer" value="" />
+	<a class="fancybox button" href="{$link->getAdminLink('AdminCustomers')}&addcustomer&liteDisplaying=1&submitFormAjax=1#"><img src="../img/admin/add.gif" title="new"/><span>{l s='Add new customer'}</span></a></p>
+	<div id="customers">
+	</div>
+</fieldset><br />
+<form action="{$link->getAdminLink('AdminOrders')}&submitAdd{$table}=1" method="post" autocomplete="off">
+<fieldset id="products_part" style="display:none;"><legend><img src="../img/t/AdminCatalog.gif" />{l s='Cart'}</legend>
+	<div>
+		<p><label>{l s='Search a product:'} </label>
+		<input type="hidden" value="" id="id_cart" name="id_cart" />
+		<input type="text" id="product" value="" /></p>
+		<div id="products_found">
+			<div id="product_list">
+			</div>
+			<div id="attributes_list">
+			</div>
+			<p><label for="qty">{l s='Quantity:'}</label><input type="text" name="qty" id="qty"/>&nbsp;<b>{l s='In stock:'}</b>&nbsp;<span id="qty_in_stock"></span></p>
+			<div class="margin-form">
+				<p><input type="submit" onclick="addProduct();return false;" class="button" id="submitAddProduct" value="{l s='Add to cart'}"/></p>
+			</div>
+		</div>
+	</div>
+	<div id="products_err" class="warn" style="display:none;"></div>
+	<div>
+		<table cellspacing="0" cellpadding="0" class="table width5" id="customer_cart">
+				<colgroup>
+					<col width="50px"></col>
+					<col width=""></col>
+					<col width="90px"></col>
+					<col width="100px"></col>
+					<col width="50px"></col>
+					<col width="50px"></col>
+				</colgroup>
+			<thead>
+				<tr>
+					<th height="39px">{l s='Product'}</th>
+					<th>{l s='Description'}</th>
+					<th>{l s='Ref'}</th>
+					<th>{l s='Unit price'}</th>
+					<th style="width: 80px;">{l s='Qty'}</th>
+					<th style="width: 80px;">{l s='Price'}</th>
+				</tr>
+			</thead>
+			<tbody>
+			</tbody>
+		</table>
+	</div>
+	<div>
+		<p><label for="id_currency">{l s='Currency:'}</label>
+			<script type="text/javascript">
+				{foreach from=$currencies item='currency'}
+					currencies['{$currency.id_currency}'] = '{$currency.sign}';
+				{/foreach}
+			</script>
+			<select id="id_currency" name="id_currency">
+			{foreach from=$currencies item='currency'}
+				<option rel="{$currency.iso_code}" value="{$currency.id_currency}">{$currency.name}</option>
+			{/foreach}
+			</select>
+		</p>
+		<p>
+		<label for="id_lang">{l s='Language:'}</label>
+		<select id="id_lang" name="id_lang">
+			{foreach from=$langs item='lang'}
+				<option value="{$lang.id_lang}">{$lang.name}</option>
+			{/foreach}
+		</select>
+		</p>
+	</div>
+	<div class="separation"></div>
+	<div id="carts">
+		<p><a href="#" id="show_old_carts" class="button"></a></p>
+		<div id="old_carts_orders">
+			<div id="nonOrderedCarts">
+				<h3>{l s='Carts:'}</h3>
+				<table cellspacing="0" cellpadding="0" class="table  width5">
+					<colgroup>
+						<col width="10px"></col>
+						<col width=""></col>
+						<col width="70px"></col>
+						<col width="50px"></col>
+					</colgroup>
+				<thead>
+					<tr>
+						<th height="39px" class="left">{l s='ID'}</th>
+						<th class="left">{l s='Date'}</th>
+						<th class="left">{l s='Total'}</th>
+						<th class="left">{l s='Action'}</th>
+					</tr>
+					</thead>
+					<tbody>
+					</tbody>
+				</table>
+			</div>
+			<div id="lastOrders">
+				<h3>{l s='Orders:'}</h3>
+				<table cellspacing="0" cellpadding="0" class="table  width5">
+					<colgroup>
+						<col width="10px"></col>
+						<col width="50px"></col>
+						<col width=""></col>
+						<col width="90px"></col>
+						<col width="100px"></col>
+						<col width="250px"></col>
+						<col width="50px"></col>
+					</colgroup>
+					<thead>
+						<tr>
+							<th height=39px" class="left">{l s='ID'}</th>
+							<th class="left">{l s='Date'}</th>
+							<th class="left">{l s='Produits'}</th>
+							<th class="left">{l s='Total paid'}</th>
+							<th class="left">{l s='Payment'}</th>
+							<th class="left">{l s='Status'}</th>
+							<th class="left">{l s='Action'}</th>
+						</tr>
+					</thead>
+					<tbody>
+					</tbody>
+				</table>
+			</div>
+		</div>
+	</div>
+</fieldset>
+<br />
+<fieldset id="vouchers_part" style="display:none;">
+	<legend><img src="../img/t/AdminDiscounts.gif" />{l s='Vouchers'}</legend>
+	<p>
+		<label>{l s='Search a voucher:'} </label>
+		<input type="text" id="voucher" value="" />
+		<a class="fancybox button" href="{$link->getAdminLink('AdminCartRules')}&addcart_rule&liteDisplaying=1&submitFormAjax=1#"><img src="../img/admin/add.gif" title="new"/>{l s='Add new voucher'}</a>
+	</p>
+	<div class="margin-form">
+		<table cellspacing="0" cellpadding="0" class="table" id="voucher_list">
+			<thead>
+				<tr>
+					<th class="left">{l s='Name'}</th>
+					<th class="left">{l s='Description'}</th>
+					<th class="left">{l s='Value'}</th>
+					<th class="left">{l s='Action'}</th>
+				</tr>
+			</thead>
+			<tbody>
+			</tbody>
+		</table>
+	</div>
+	<div id="vouchers_err" class="warn"></div>
+</fieldset>
+<br />
+<fieldset id="address_part" style="display:none;">
+	<legend><img src="../img/t/AdminAddresses.gif" />{l s='Addresses'}</legend>
+	<div id="address_delivery">
+		<h3>{l s='Delivery:'}</h3>
+		<select id="id_address_delivery" name="id_address_delivery">
+		</select>
+		<div id="address_delivery_detail">
+		</div>
+	</div>
+	<div id="address_invoice">
+		<h3>{l s='Invoice:'}</h3>
+		<select id="id_address_invoice" name="id_address_invoice">
+		</select>
+		<div id="address_invoice_detail">
+		</div>
+	</div>
+<a class="fancybox button" id="new_address" href="{$link->getAdminLink('AdminAddresses')}&addaddress&id_customer=42&liteDisplaying=1&submitFormAjax=1#"><img src="../img/admin/add.gif" title="new"/>{l s='Add new address'}</a>
+</fieldset>
+<br />
+<fieldset id="carriers_part" style="display:none;">
+	<legend><img src="../img/t/AdminCarriers.gif" />{l s='Shipping'}</legend>
+	<div id="carriers_err" style="display:none;" class="warn"></div>
+		<div id="carrier_form">
+			<div>
+				<p>
+					<label>{l s='Delivery option:'} </label>
+					<select name="delivery_option" id="delivery_option">
+					</select>
+				</p>
+				<p>
+					<label for="shipping_price">{l s='Shipping price:'}</label> <input type="text" id="shipping_price"  name="shipping_price" size="7" />&nbsp;<span class="currency_sign"></span>&nbsp;
+					<a class="button" href="#" onclick="resetShippingPrice()">{l s='Reset shipping price'}</a>
+				</p>
+			</div>
+			<div id="float:left;">
+				{if $recyclable_pack}
+					<p><input type="checkbox" name="carrier_recycled_package" value="1" id="carrier_recycled_package" />  <label for="carrier_recycled_package">{l s='Recycled package'}</label></p>
+				{/if}
+				{if $gift_wrapping}
+					<p><input type="checkbox" name="order_gift" id="order_gift" value="1" /> <label for="order_gift">{l s='Gift'}</label></p>
+					<p><label for="gift_message">{l s='Gift message:'}</label><textarea id="gift_message" cols="40" rows="4"></textarea></p>
+				{/if}
+			</div>
+		</div>
+	</div>
+</fieldset>
+<br />
+<fieldset id="summary_part" style="display:none;">
+	<legend><img src="../img/t/AdminPayment.gif" />{l s='Summary'}</legend>
+	<div id="send_email_feedback"></div>
+	<div id="cart_summary" style="clear:both;float:left;">
+		<ul>
+			<li><span class="total_cart">{l s='Total products:'}</span><span id="total_products"></span><span class="currency_sign"></span></li>
+			<li><span class="total_cart">{l s='Total vouchers:'}</span><span id="total_vouchers"></span><span class="currency_sign"></span></li>
+			<li><span class="total_cart">{l s='Total shipping:'}</span><span id="total_shipping"></span><span class="currency_sign"></span></li>
+			<li><span class="total_cart">{l s='Total without taxes:'}</span><span id="total_without_taxes"></span><span class="currency_sign"></span></li>
+			<li><span class="total_cart">{l s='Total taxes:'}</span><span id="total_taxes"></span><span class="currency_sign"></span></li>
+			<li><span class="total_cart">{l s='Total with taxes:'}</span><span id="total_with_taxes"></span><span class="currency_sign"></span></li>
+		</ul>
+	</div>
+	<div class="order_message_right">
+		<label for="order_message">{l s='Order message:'}</label>
+		<div class="margin-form">
+			<textarea name="order_message" id="order_message" rows="3" cols="45"></textarea>
+		</div>
+		<div class="margin-form">
+			<a href="#" id="send_email_to_customer" class="button">{l s='Send an email to the customer with the link to process the payment.'}</a>
+		</div>
+		<div class="margin-form">
+			<a target="_blank" id="go_order_process" href="" class="button">{l s='Go on payment page to process the payment.'}</a>
+		</div>
+		<label>{l s='Payment:'}</label>
+		<div class="margin-form">
+			<select name="payment_module_name" id="payment_module_name">
+				{foreach from=$payment_modules item='module'}
+					<option value="{$module.name}" {if isset($smarty.post.payment_module_name) && $module.name == $smarty.post.payment_module_name}selected="selected"{/if}>{$module.name}</option>
+				{/foreach}
+			</select>
+		</div>
+		<label>{l s='Order status:'}</label>
+		<div class="margin-form">
+			<select name="id_order_state" id="id_order_state">
+				{foreach from=$order_states item='order_state'}
+					<option value="{$order_state.id_order_state}" {if isset($smarty.post.id_order_state) && $order_state.id_order_state == $smarty.post.id_order_state}selected="selected"{/if}>{$order_state.name}</option>
+				{/foreach}
+			</select>
+		</div>
+		<div class="margin-form">
+			<input type="submit" name="submitAddOrder" class="button" value="{l s='Create the order'}" />
+		</div>
+	</div>
+</fieldset>
+</form>
+<div id="loader_container">
+	<div id="loader">
+	</div>
+</div>