diff --git a/.eslintrc.yml b/.eslintrc.yml
index de984486..5b9c4a2f 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -1,3 +1,4 @@
 extends: eslint:recommended
 rules:
-    no-undef: 0
\ No newline at end of file
+    no-undef: 0
+    no-redeclare: 0
\ No newline at end of file
diff --git a/forms/account/address-list/ui.xml b/forms/account/address-list/ui.xml
index 2496a87c..69fd8f50 100755
--- a/forms/account/address-list/ui.xml
+++ b/forms/account/address-list/ui.xml
@@ -19,9 +19,9 @@
 		</custom>
 	</db-model>
 </vn-group>
-<div id="title">
-	<h1><t>Addresses</t></h1>
-</div>
+<h1 id="title">
+	<t>Addresses</t>
+</h1>
 <div id="actions">
 	<htk-bar-button
 		icon="add"
diff --git a/forms/account/address/ui.xml b/forms/account/address/ui.xml
index 8650697b..412d1edd 100755
--- a/forms/account/address/ui.xml
+++ b/forms/account/address/ui.xml
@@ -24,9 +24,9 @@
 		</db-model>
 	</db-form>
 </vn-group>
-<div id="title">
-	<h1><t>AddEditAddress</t></h1>
-</div>
+<h1 id="title">
+	<t>AddEditAddress</t>
+</h1>
 <div id="actions">
 	<htk-bar-button
 		icon="ok"
diff --git a/forms/account/conf/ui.xml b/forms/account/conf/ui.xml
index 4823885c..639c61a9 100755
--- a/forms/account/conf/ui.xml
+++ b/forms/account/conf/ui.xml
@@ -30,9 +30,9 @@
 		</custom>
 	</db-model>
 </vn-group>
-<div id="title">
-	<h1><t>Configuration</t></h1>
-</div>
+<h1 id="title">
+	<t>Configuration</t>
+</h1>
 <div id="actions">
 	<htk-bar-button
 		icon="place"
diff --git a/forms/admin/access-log/ui.xml b/forms/admin/access-log/ui.xml
index c3f85f34..73bfb7ae 100755
--- a/forms/admin/access-log/ui.xml
+++ b/forms/admin/access-log/ui.xml
@@ -16,9 +16,9 @@
 		</db-model>
 	</db-form>
 </vn-group>
-<div id="title">
-	<h1><t>AccessLog</t></h1>
-</div>
+<h1 id="title">
+	<t>AccessLog</t>
+</h1>
 <div id="form" class="access-log">
 	<div class="card form">
 		<p>
diff --git a/forms/admin/connections/ui.xml b/forms/admin/connections/ui.xml
index dd71cf54..ece7ef8b 100755
--- a/forms/admin/connections/ui.xml
+++ b/forms/admin/connections/ui.xml
@@ -1,7 +1,7 @@
 <vn>
-<div id="title">
-	<h1><t>Connections</t></h1>
-</div>
+<h1 id="title">
+	<t>Connections</t>
+</h1>
 <div id="actions">
 	<htk-bar-button
 		icon="refresh"
diff --git a/forms/admin/items/ui.xml b/forms/admin/items/ui.xml
index ce78c0a5..4110bec0 100755
--- a/forms/admin/items/ui.xml
+++ b/forms/admin/items/ui.xml
@@ -1,7 +1,7 @@
 <vn>
-<div id="title">
-	<h1><t>Item list</t></h1>
-</div>
+<h1 id="title">
+	<t>Item list</t>
+</h1>
 <div id="actions" class="action-bar">
 	<htk-bar-button
 		icon="print"
diff --git a/forms/admin/links/ui.xml b/forms/admin/links/ui.xml
index c3024377..f6936f23 100755
--- a/forms/admin/links/ui.xml
+++ b/forms/admin/links/ui.xml
@@ -1,7 +1,7 @@
 <vn>
-<div id="title">
-	<h1><t>ControlPanel</t></h1>
-</div>
+<h1 id="title">
+	<t>ControlPanel</t>
+</h1>
 <div id="form" class="cpanel">
 	<div class="card list">
 		<htk-repeater form-id="iter" renderer="repeaterFunc">
diff --git a/forms/admin/photos/ui.xml b/forms/admin/photos/ui.xml
index f2574a37..42c04f54 100755
--- a/forms/admin/photos/ui.xml
+++ b/forms/admin/photos/ui.xml
@@ -1,7 +1,7 @@
 <vn>
-<div id="title">
-	<h1><t>Photos</t></h1>
-</div>
+<h1 id="title">
+	<t>Photos</t>
+</h1>
 <div id="form" class="photos">
 	<form
 		id="html-form"
diff --git a/forms/admin/queries/ui.xml b/forms/admin/queries/ui.xml
index 9616ef2f..4c62a742 100755
--- a/forms/admin/queries/ui.xml
+++ b/forms/admin/queries/ui.xml
@@ -1,7 +1,7 @@
 <vn>
-<div id="title">
-	<h1><t>Queries</t></h1>
-</div>
+<h1 id="title">
+	<t>Queries</t>
+</h1>
 <div id="actions">
 	<htk-bar-button
 		icon="ok"
diff --git a/forms/admin/shelves/ui.xml b/forms/admin/shelves/ui.xml
index e5a29eee..df4160e2 100755
--- a/forms/admin/shelves/ui.xml
+++ b/forms/admin/shelves/ui.xml
@@ -10,9 +10,9 @@
 	</db-model>
 	<vn-basic-set id="set"/>
 </vn-group>
-<div id="title">
-	<h1><t>Shelves</t></h1>
-</div>
+<h1 id="title">
+	<t>Shelves</t>
+</h1>
 <div id="actions">
 	<htk-bar-button
 		icon="print"
diff --git a/forms/admin/users/ui.xml b/forms/admin/users/ui.xml
index eb73ec21..bc7893b8 100755
--- a/forms/admin/users/ui.xml
+++ b/forms/admin/users/ui.xml
@@ -3,9 +3,9 @@
 	<vn-param id="user-name"/>
 	<vn-hash-param key="user" param="user-name"/>
 </vn-group>
-<div id="title">
-	<h1><t>UserManagement</t></h1>
-</div>
+<h1 id="title">
+	<t>UserManagement</t>
+</h1>
 <div id="actions">
 	<htk-search-entry
 		param="user-name"/>
diff --git a/forms/admin/visits/ui.xml b/forms/admin/visits/ui.xml
index 30850424..5f94ebee 100755
--- a/forms/admin/visits/ui.xml
+++ b/forms/admin/visits/ui.xml
@@ -1,7 +1,7 @@
 <vn>
-<div id="title">
-	<h1><t>Visits</t></h1>
-</div>
+<h1 id="title">
+	<t>Visits</t>
+</h1>
 <div id="actions">
 	<htk-bar-button
 		icon="refresh"
diff --git a/forms/agencies/packages/ui.xml b/forms/agencies/packages/ui.xml
index e2bf66ce..ac2c8ae3 100755
--- a/forms/agencies/packages/ui.xml
+++ b/forms/agencies/packages/ui.xml
@@ -1,7 +1,7 @@
 <vn>
-<div id="title">
-	<h1><t>ListByAgency</t></h1>
-</div>
+<h1 id="title">
+	<t>ListByAgency</t>
+</h1>
 <div id="form" class="packages">
 	<div class="card">
 		<htk-grid>
diff --git a/forms/agencies/provinces/ui.xml b/forms/agencies/provinces/ui.xml
index 8de84333..5e255840 100755
--- a/forms/agencies/provinces/ui.xml
+++ b/forms/agencies/provinces/ui.xml
@@ -3,9 +3,9 @@
 	<vn-param id="agency"/>
 	<vn-hash-param key="agency" param="agency"/>
 </vn-group>
-<div id="title">
-	<h1><t>ByProvince</t></h1>
-</div>
+<h1 id="title">
+	<t>ByProvince</t>
+</h1>
 <div id="form" class="provinces">
 	<div class="card">
 		<htk-grid>
diff --git a/forms/cms/about/ui.xml b/forms/cms/about/ui.xml
index 1e74f216..626ac82a 100755
--- a/forms/cms/about/ui.xml
+++ b/forms/cms/about/ui.xml
@@ -1,7 +1,7 @@
 <vn>
-<div id="title">
-	<h1><t>About</t></h1>
-</div>
+<h1 id="title">
+	<t>About</t>
+</h1>
 <div id="form" class="about">
 <div class="cols">
 	<div class="card">
diff --git a/forms/cms/contact/ui.xml b/forms/cms/contact/ui.xml
index f9a5818c..3cc0c14a 100755
--- a/forms/cms/contact/ui.xml
+++ b/forms/cms/contact/ui.xml
@@ -1,7 +1,7 @@
 <vn>
-<div id="title">
-	<h1><t>IWantCustomer</t></h1>
-</div>
+<h1 id="title">
+	<t>IWantCustomer</t>
+</h1>
 <div id="form" class="contact">
 	<form
 		id="contact-form">
diff --git a/forms/cms/home/ui.xml b/forms/cms/home/ui.xml
index 5c9f1e56..cf86d5e3 100755
--- a/forms/cms/home/ui.xml
+++ b/forms/cms/home/ui.xml
@@ -1,7 +1,7 @@
 <vn>
-<div id="title">
-	<h1><t>Home</t></h1>
-</div>
+<h1 id="title">
+	<t>Home</t>
+</h1>
 <div id="actions" class="catalog-actions">
 	<htk-bar-button
 		class="start-order"
diff --git a/forms/cms/location/ui.xml b/forms/cms/location/ui.xml
index 58388869..c9d830fb 100755
--- a/forms/cms/location/ui.xml
+++ b/forms/cms/location/ui.xml
@@ -1,6 +1,6 @@
 <vn>
-	<div id="title">
-		<h1><t>Location</t></h1>
-	</div>
+	<h1 id="title">
+		<t>Location</t>
+	</h1>
 	<div id="form" class="location"/>
 </vn>
diff --git a/forms/cms/training/ui.xml b/forms/cms/training/ui.xml
index 86efa1c7..2d1ab7be 100755
--- a/forms/cms/training/ui.xml
+++ b/forms/cms/training/ui.xml
@@ -1,7 +1,7 @@
 <vn>
-<div id="title">
-	<h1><t>Training</t></h1>
-</div>
+<h1 id="title">
+	<t>Training</t>
+</h1>
 <div id="form" class="training">
 	<div class="column mansonry" id="news-column">
 		<htk-repeater form-id="new">
diff --git a/forms/cms/why/ui.xml b/forms/cms/why/ui.xml
index a9fda24f..a7e612cd 100755
--- a/forms/cms/why/ui.xml
+++ b/forms/cms/why/ui.xml
@@ -1,7 +1,7 @@
 <vn>
-<div id="title">
-	<h1><t>AboutCompany</t></h1>
-</div>
+<h1 id="title">
+	<t>AboutCompany</t>
+</h1>
 <div id="form" class="why">
 	<div class="card">
 		<div class="body">
diff --git a/forms/ecomerce/basket/style.css b/forms/ecomerce/basket/style.css
index e7c05999..6beaf9e9 100644
--- a/forms/ecomerce/basket/style.css
+++ b/forms/ecomerce/basket/style.css
@@ -62,4 +62,3 @@
 {
 	border-radius: 50%;
 }
-
diff --git a/forms/ecomerce/basket/ui.xml b/forms/ecomerce/basket/ui.xml
index 549a07af..5579b182 100755
--- a/forms/ecomerce/basket/ui.xml
+++ b/forms/ecomerce/basket/ui.xml
@@ -1,7 +1,7 @@
 <vn>
-<div id="title">
-	<h1><t>ShoppingBasket</t></h1>
-</div>
+<h1 id="title">
+	<t>ShoppingBasket</t>
+</h1>
 <div id="actions">
 	<htk-bar-button
 		icon="ok"
@@ -30,7 +30,7 @@
 			<db-model id="items" property="model" updatable="true">
 				<custom>
 					SELECT i.id, i.amount, i.price, a.Article, a.Categoria, 
-					a.Medida, a.Tallos, a.Color, o.Abreviatura, a.Foto
+						a.Medida, a.Tallos, a.Color, o.Abreviatura, a.Foto
 						FROM basket_item i
 							JOIN vn2008.Articles a ON a.Id_Article = i.item_id
 							LEFT JOIN vn2008.Origen o ON a.id_origen = o.id
diff --git a/forms/ecomerce/catalog/catalog.js b/forms/ecomerce/catalog/catalog.js
index 524baf9d..67593bc1 100644
--- a/forms/ecomerce/catalog/catalog.js
+++ b/forms/ecomerce/catalog/catalog.js
@@ -206,7 +206,7 @@ Hedera.Catalog = new Class
 				title = types.get (row, 'name');
 		}
 
-		Vn.Node.setText (this.$('title-text'), title);
+		Vn.Node.setText (this.$('title'), title);
 	}
 
 	,onRightPanelClick: function (event)
diff --git a/forms/ecomerce/catalog/ui.xml b/forms/ecomerce/catalog/ui.xml
index 0fd5a9d5..50ca6986 100755
--- a/forms/ecomerce/catalog/ui.xml
+++ b/forms/ecomerce/catalog/ui.xml
@@ -121,9 +121,9 @@
 		</custom>
 	</db-model>
 </vn-group>
-<div id="title">
-	<h1 id="title-text"><t>Catalog</t></h1>
-</div>
+<h1 id="title">
+	<t>Catalog</t>
+</h1>
 <div id="actions" class="catalog-actions">
 	<button class="menu" on-click="onShowMenuClick">
 		<img src="image/icon/dark/menu.svg" alt="_Menu"/>
diff --git a/forms/ecomerce/checkout/checkout.js b/forms/ecomerce/checkout/checkout.js
index 38df9c65..5d8bce26 100644
--- a/forms/ecomerce/checkout/checkout.js
+++ b/forms/ecomerce/checkout/checkout.js
@@ -56,7 +56,7 @@ Hedera.Checkout = new Class
 	{
 		this.disableButtons (true);
 	
-		var query = 'CALL basket_configure (#date, #method, #agency, #address)';
+		var query = 'CALL basketConfigure (#date, #method, #agency, #address)';
 	
 		var batch = new Sql.Batch ();
 		batch.addParam ('method', this.$('method'));
diff --git a/forms/ecomerce/checkout/ui.xml b/forms/ecomerce/checkout/ui.xml
index 2a2bed35..3a8cbe39 100755
--- a/forms/ecomerce/checkout/ui.xml
+++ b/forms/ecomerce/checkout/ui.xml
@@ -15,23 +15,15 @@
 	<db-form id="order-form" on-ready="onValuesReady">
 		<db-model property="model">
 			<custom>
-				SELECT v.code delivery_method, o.date_send, o.agency_id, o.address_id
+				SELECT d.code delivery_method, o.date_send, o.agency_id, o.address_id
 					FROM basket o
-						JOIN vn2008.Vistas v ON o.delivery_method_id = v.vista_id
+						JOIN vn.deliveryMethod d ON d.id = o.delivery_method_id
 			</custom>
 		</db-model>
 	</db-form>
-	<db-model id="agencies" auto-load="false" result-index="1" on-status-changed="onAgenciesReady">
+	<db-model id="agencies" auto-load="false" on-status-changed="onAgenciesReady">
 		<custom>
-			CALL agency_list_from_date (#date, #address);
-			SELECT a.Id_Agencia, a.description
-				FROM t_agency t
-					JOIN vn2008.Agencias a ON a.Id_Agencia = t.agency_id
-					JOIN vn2008.Vistas v ON a.Vista = v.vista_id
-				WHERE a.web != FALSE
-					AND v.code = 'AGENCY'
-				ORDER BY a.description;
-			DROP TEMPORARY TABLE t_agency;
+			CALL vn.agencyListForMethod(#date, #address, 'AGENCY')
 		</custom>
 		<sql-batch property="batch">
 			<custom>
@@ -40,17 +32,9 @@
 			</custom>
 		</sql-batch>
 	</db-model>
-	<db-model id="warehouses" auto-load="false" result-index="1" on-status-changed="onWarehousesReady">
+	<db-model id="warehouses" auto-load="false" on-status-changed="onWarehousesReady">
 		<custom>
-			CALL agency_list_from_date (#date, #address);
-			SELECT a.Id_Agencia, a.description
-				FROM t_agency t
-					JOIN vn2008.Agencias a ON a.Id_Agencia = t.agency_id
-					JOIN vn2008.Vistas v ON a.Vista = v.vista_id
-				WHERE a.web != FALSE
-					AND v.code = 'PICKUP'
-				ORDER BY a.description;
-			DROP TEMPORARY TABLE t_agency;
+			CALL vn.agencyListForMethod(#date, #address, 'PICKUP')
 		</custom>
 		<sql-batch property="batch">
 			<custom>
@@ -60,9 +44,9 @@
 		</sql-batch>
 	</db-model>
 </vn-group>
-<div id="title">
-	<h1><t>ConfigureOrder</t></h1>
-</div>
+<h1 id="title">
+	<t>ConfigureOrder</t>
+</h1>
 <div id="actions">
 	<htk-bar-button
 		icon="close"
diff --git a/forms/ecomerce/confirm/ui.xml b/forms/ecomerce/confirm/ui.xml
index e081d2a8..cad9fc15 100755
--- a/forms/ecomerce/confirm/ui.xml
+++ b/forms/ecomerce/confirm/ui.xml
@@ -29,9 +29,9 @@
 		</custom>
 	</db-query>
 </vn-group>
-<div id="title">
-	<h1><t>Order summary</t></h1>
-</div>
+<h1 id="title">
+	<t>Order summary</t>
+</h1>
 <div id="form" class="confirm">
 	<div class="summary form card">
 		<div>
diff --git a/forms/ecomerce/invoices/ui.xml b/forms/ecomerce/invoices/ui.xml
index 5be33079..089331a7 100755
--- a/forms/ecomerce/invoices/ui.xml
+++ b/forms/ecomerce/invoices/ui.xml
@@ -1,7 +1,7 @@
 <vn>
-<div id="title">
-	<h1><t>Invoices</t></h1>
-</div>
+<h1 id="title">
+	<t>Invoices</t>
+</h1>
 <div id="form" class="invoices">
 	<div class="card">
 	<div>
diff --git a/forms/ecomerce/orders/orders.js b/forms/ecomerce/orders/orders.js
index 1e4a6727..c412f925 100644
--- a/forms/ecomerce/orders/orders.js
+++ b/forms/ecomerce/orders/orders.js
@@ -40,7 +40,7 @@ Hedera.Orders = new Class
 	
 	,onPayButtonClick: function ()
 	{
-		var amount = -this.$('debt').value;
+		var amount = -this.$('debt').get('debt');
 
 		amount = amount <= 0 ? null : amount;
 
@@ -49,7 +49,7 @@ Hedera.Orders = new Class
 		if (amount !== null)
 			defaultAmountStr = Vn.Value.format (amount, '%.2d');
 
-		var amount = parseFloat (prompt (_('AmountToPay:'), defaultAmountStr));
+		amount = parseFloat (prompt (_('AmountToPay:'), defaultAmountStr));
 	
 		this.tpv.pay (amount, null);
 	}
diff --git a/forms/ecomerce/orders/ui.xml b/forms/ecomerce/orders/ui.xml
index 9e6540f6..5e9265ad 100755
--- a/forms/ecomerce/orders/ui.xml
+++ b/forms/ecomerce/orders/ui.xml
@@ -1,16 +1,16 @@
 <vn>
 <vn-group>
-	<db-model id="debt-model" result-index="1">
-		<custom>
-			CALL customer_get_debt_by_company ();
-			SELECT -amount amount FROM t_customer_debt;
-			DROP TEMPORARY TABLE t_customer_debt;
-		</custom>
-	</db-model>
+	<db-form id="debt">
+		<db-model property="model">
+			<custom>
+				SELECT clientGetDebt() debt
+			</custom>
+		</db-model>
+	</db-form>
 </vn-group>
-<div id="title">
-	<h1><t>LastOrders</t></h1>
-</div>
+<h1 id="title">
+	<t>LastOrders</t>
+</h1>
 <div id="actions">
 	<htk-bar-button
 		icon="basket"
@@ -28,16 +28,8 @@
 			<t>Balance:</t>
 		</span> 
 		<span class="amount" id="balance">
-			<htk-text
-				format="%.2d€"
-				conditional-func="balanceConditionalFunc">
-				<db-calc-sum
-					property="param"
-					model="debt-model"
-					column-name="amount"
-					id="debt"/>
-			</htk-text>
-		</span> 
+			<htk-text form="debt" column="debt" format="%.2d€"/>
+		</span>
 		<img
 			src="image/icon/dark/info.svg"
 			title="_PaymentInfo"
@@ -50,7 +42,7 @@
 		<htk-repeater form-id="iter" renderer="repeaterFunc">
 			<db-model property="model" id="tickets">
 				<custom>
-					CALL ticket_list ();
+					CALL clientTicketList ()
 				</custom>
 			</db-model>
 			<custom>
@@ -67,6 +59,9 @@
 					<p>
 						<htk-text form="iter" column="type"/>
 					</p>
+					<p>
+						<htk-text form="iter" column="ticket_id"/>
+					</p>
 				</a>
 			</custom>
 		</htk-repeater>
diff --git a/forms/ecomerce/ticket/locale/ca.json b/forms/ecomerce/ticket/locale/ca.json
index fe99237b..d76c9907 100755
--- a/forms/ecomerce/ticket/locale/ca.json
+++ b/forms/ecomerce/ticket/locale/ca.json
@@ -1,7 +1,7 @@
 {
 	 "OrderDetail": "Detall de l'encarrec"
 
-	,"Print delivery note": "Imprimir albarà"
+	,"Delivery note": "Albarà"
 
 	,"Delivery": "Entrega"
 	,"Total": "Total"
diff --git a/forms/ecomerce/ticket/locale/en.json b/forms/ecomerce/ticket/locale/en.json
index dc7ccbf6..637bc6d1 100755
--- a/forms/ecomerce/ticket/locale/en.json
+++ b/forms/ecomerce/ticket/locale/en.json
@@ -1,7 +1,7 @@
 {
 	 "OrderDetail": "Order detail"
 
-	,"Print delivery note": "Print delivery note"
+	,"Delivery note": "Delivery note"
 
 	,"Delivery": "Delivery"
 	,"Total": "Total"
diff --git a/forms/ecomerce/ticket/locale/es.json b/forms/ecomerce/ticket/locale/es.json
index be06236d..3127cd32 100755
--- a/forms/ecomerce/ticket/locale/es.json
+++ b/forms/ecomerce/ticket/locale/es.json
@@ -1,12 +1,13 @@
 {
 	 "OrderDetail": "Detalle del pedido"
 
-	,"Print delivery note": "Imprimir albarán"
+	,"Delivery note": "Albarán"
 
 	,"Delivery": "Entrega"
 	,"Total": "Total"
 	,"Tax base": "Base imponible"
 	,"VAT": "IVA"
+	,"Total + VAT": "Total + IVA"
 
 	,"ItemNumber": "Nº artículo"
 	,"Amount": "Cant"
diff --git a/forms/ecomerce/ticket/locale/fr.json b/forms/ecomerce/ticket/locale/fr.json
index 4a3764a1..e55f885f 100755
--- a/forms/ecomerce/ticket/locale/fr.json
+++ b/forms/ecomerce/ticket/locale/fr.json
@@ -1,9 +1,9 @@
 {
 	 "OrderDetail": "Détails de la commande"
 
-	,"Print delivery note": "Imprimer bulletin de livraison"
+	,"Delivery note": "Bulletin de livraison"
 
-	,"Delivery": "Accouchement"
+	,"Delivery": "Livraison"
 	,"Total": "Total"
 	,"Tax base": "Imposable"
 	,"VAT": "TVA"
diff --git a/forms/ecomerce/ticket/locale/mn.json b/forms/ecomerce/ticket/locale/mn.json
index dc7ccbf6..637bc6d1 100755
--- a/forms/ecomerce/ticket/locale/mn.json
+++ b/forms/ecomerce/ticket/locale/mn.json
@@ -1,7 +1,7 @@
 {
 	 "OrderDetail": "Order detail"
 
-	,"Print delivery note": "Print delivery note"
+	,"Delivery note": "Delivery note"
 
 	,"Delivery": "Delivery"
 	,"Total": "Total"
diff --git a/forms/ecomerce/ticket/locale/pt.json b/forms/ecomerce/ticket/locale/pt.json
index 486f2eb8..2aa40fc9 100644
--- a/forms/ecomerce/ticket/locale/pt.json
+++ b/forms/ecomerce/ticket/locale/pt.json
@@ -1,7 +1,7 @@
 {
 	 "OrderDetail": "Detalhe do pedido"
 
-	,"Print delivery note": "Imprimir guía de remessa"
+	,"Delivery note": "Guía de remessa"
 
 	,"Delivery": "Entrega"
 	,"Total": "Total"
diff --git a/forms/ecomerce/ticket/ticket.js b/forms/ecomerce/ticket/ticket.js
index 859bc98a..2c4564dd 100644
--- a/forms/ecomerce/ticket/ticket.js
+++ b/forms/ecomerce/ticket/ticket.js
@@ -10,10 +10,10 @@ Hedera.Ticket = new Class
 
 		var batch = new Sql.Batch ();
 		batch.addValue ('ticket', ticket.value);
-		this.conn.execQuery ('CALL ticketLog (#ticket)', null, batch);
+		this.conn.execQuery ('CALL clientTicketLog (#ticket)', null, batch);
 	}
 
-	,onPrintClick: function (event)
+	,onPrintClick: function ()
 	{
 		var batch = new Sql.Batch ();
 		batch.addValue ('ticket', this.$('ticket-id').value);
diff --git a/forms/ecomerce/ticket/ui.xml b/forms/ecomerce/ticket/ui.xml
index 605bb999..aa824156 100755
--- a/forms/ecomerce/ticket/ui.xml
+++ b/forms/ecomerce/ticket/ui.xml
@@ -3,15 +3,9 @@
 	<vn-param id="ticket-id" on-changed="onTicketChange"/>
 	<vn-hash-param key="ticket" param="ticket-id"/>
 	<db-form id="ticket">
-		<db-model id="ticket-data" property="model">
+		<db-model property="model">
 			<custom>
-				SELECT t.id, date, a.Agencia, note, p.name province,
-					zip_code, city, c.name, consignee, invoice, delivery
-					FROM ticket_view t
-						JOIN address_view c ON t.address_id = c.id
-						JOIN vn2008.Agencias a ON t.agency_id = a.Id_Agencia
-						JOIN vn2008.province p ON c.province_id = p.province_id
-					WHERE t.id = #ticket
+				CALL clientTicketGet(#ticket)
 			</custom>
 			<sql-batch property="batch">
 				<custom>
@@ -21,13 +15,13 @@
 		</db-model>
 	</db-form>
 </vn-group>
-<div id="title">
-	<h1><t>OrderDetail</t></h1>
-</div>
+<h1 id="title">
+	<t>OrderDetail</t>
+</h1>
 <div id="actions" class="action-bar">
 	<htk-bar-button
-		icon="print"
-		tip="_Print delivery note"
+		icon="receipt"
+		tip="_Delivery note"
 		on-click="onPrintClick"/>
 </div>
 <div id="form" class="ticket">
@@ -60,24 +54,18 @@
 			<div>
 				<p class="important total">
 					<t>Total</t> 
-					<htk-text format="%.2d€">
-						<db-calc-sum property="param" func="subtotal" model="movements"/>
-					</htk-text>
+					<htk-text form="ticket" column="total" format="%.2d€"/>
+				</p>
+				<p class="important total">
+					<t>Total + VAT</t> 
+					<htk-text form="ticket" column="totalPlusVat" format="%.2d€"/>
 				</p>
 			</div>
 		</div>
 		<htk-repeater form-id="iter" renderer="repeaterFunc">
 			<db-model property="model" id="movements">
 				<custom>
-					SELECT m.item_id, m.amount, m.concept,
-						IF(m.fixed != FALSE, m.price, NULL) price, m.fixed, m.discount,
-						o.Abreviatura, a.Categoria, a.Medida, a.Tallos, a.Color, a.Foto
-						FROM ticket_row_view m
-							INNER JOIN vn2008.Articles a
-								ON m.item_id = a.Id_Article AND ticket_id = #ticket 
-							LEFT JOIN vn2008.Origen o
-								ON a.id_origen = o.id
-						ORDER BY concept
+					CALL clientTicketRowGet(#ticket)
 				</custom>
 				<sql-batch property="batch">
 					<custom>
diff --git a/forms/news/new/ui.xml b/forms/news/new/ui.xml
index b3c60849..435940c5 100755
--- a/forms/news/new/ui.xml
+++ b/forms/news/new/ui.xml
@@ -21,9 +21,9 @@
 	</db-form>
 	<db-param form="iter" column="text" on-changed="onBodyChange"/>
 </vn-group>
-<div id="title">
-	<h1><t>AddEditNew</t></h1>
-</div>
+<h1 id="title">
+	<t>AddEditNew</t>
+</h1>
 <div id="actions">
 	<htk-bar-button
 		icon="ok"
diff --git a/forms/news/news/ui.xml b/forms/news/news/ui.xml
index ff06afff..2f2d637d 100755
--- a/forms/news/news/ui.xml
+++ b/forms/news/news/ui.xml
@@ -1,7 +1,7 @@
 <vn>
-<div id="title">
-	<h1><t>NewsManagement</t></h1>
-</div>
+<h1 id="title">
+	<t>NewsManagement</t>
+</h1>
 <div id="actions">
 	<htk-bar-button
 		icon="add"
diff --git a/image/icon/dark/receipt.svg b/image/icon/dark/receipt.svg
new file mode 100644
index 00000000..42b0d0cb
--- /dev/null
+++ b/image/icon/dark/receipt.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16"
+   viewBox="0 0 16 16"
+   width="16"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="receipt.svg"
+   style="fill:#000000"
+   inkscape:version="0.92.1 r15371">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#666666"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="22.627417"
+     inkscape:cx="-8.4089381"
+     inkscape:cy="13.293182"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6" />
+  <path
+     d="M 12.2,11.5 H 3.8 v -1.4 h 8.4 z m 0,-2.8 H 3.8 V 7.3 h 8.4 z m 0,-2.8 H 3.8 V 4.5 h 8.4 z M 1.7,15 2.75,13.95 3.8,15 4.85,13.95 5.9,15 6.95,13.95 8,15 9.05,13.95 10.1,15 11.15,13.95 12.2,15 13.25,13.95 14.3,15 V 1 L 13.25,2.05 12.2,1 11.15,2.05 10.1,1 9.05,2.05 8,1 6.95,2.05 5.9,1 4.85,2.05 3.8,1 2.75,2.05 1.7,1 Z"
+     id="path2"
+     style="fill:#ffffff;fill-opacity:1;stroke-width:0.70000029"
+     inkscape:connector-curvature="0" />
+  <path
+     d="M 0,-8 H 24 V 16 H 0 Z"
+     id="path4"
+     inkscape:connector-curvature="0"
+     style="fill:none" />
+</svg>
diff --git a/image/icon/light/print.svg b/image/icon/light/print.svg
index b14a8256..b5ef13d3 100644
--- a/image/icon/light/print.svg
+++ b/image/icon/light/print.svg
@@ -12,7 +12,7 @@
    id="svg7384"
    sodipodi:docname="print.svg"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
+   inkscape:version="0.92.1 r15371"
    height="16"
    width="16">
   <metadata
@@ -28,13 +28,13 @@
     </rdf:RDF>
   </metadata>
   <sodipodi:namedview
-     inkscape:cy="72.4546"
+     inkscape:cy="8"
      pagecolor="#555753"
      borderopacity="1"
      showborder="false"
      inkscape:bbox-paths="false"
      guidetolerance="10"
-     inkscape:window-width="1310"
+     inkscape:window-width="1920"
      showguides="true"
      inkscape:snap-bbox="true"
      inkscape:pageshadow="2"
@@ -44,24 +44,26 @@
      objecttolerance="10"
      id="namedview88"
      showgrid="false"
-     inkscape:window-maximized="0"
-     inkscape:window-x="54"
+     inkscape:window-maximized="1"
+     inkscape:window-x="1920"
      inkscape:window-y="27"
      gridtolerance="10"
-     inkscape:window-height="701"
+     inkscape:window-height="1016"
      inkscape:current-layer="layer10"
-     inkscape:zoom="2.0390625"
-     inkscape:cx="-25.548654"
+     inkscape:zoom="51.4375"
+     inkscape:cx="8"
      inkscape:pageopacity="1">
     <inkscape:grid
-       spacingx="1px"
-       spacingy="1px"
+       spacingx="1"
+       spacingy="1"
        id="grid4866"
        empspacing="2"
        enabled="true"
        type="xygrid"
        snapvisiblegridlinesonly="true"
-       visible="true" />
+       visible="true"
+       originx="0"
+       originy="0" />
   </sodipodi:namedview>
   <title
      id="title9167">Gnome Symbolic Icon Theme</title>
@@ -87,25 +89,25 @@
        inkscape:label="Layer 1"
        transform="translate(142,338)"
        id="layer1-6"
-       style="fill:#333333;fill-opacity:1">
+       style="fill:#666666;fill-opacity:1">
       <path
          inkscape:connector-curvature="0"
          d="M 2,4 C 1.5,4 1,4.5 1,5 l 0,4 c 0,0.5 0.5,1 1,1 l 1,0 0,-2 10,0 0,2 1,0 c 0.5,0 1,-0.5 1,-1 L 15,5 C 15,4.5 14.5,4 14,4 L 2,4 z"
          id="path3520"
          sodipodi:nodetypes="ccccccccccccc"
-         style="fill:#333333;fill-opacity:1;stroke:none" />
+         style="fill:#666666;fill-opacity:1;stroke:none" />
       <path
          inkscape:connector-curvature="0"
          d="M 4,1 4,3 12,3 12,1 4,1 z"
          id="path4804"
          sodipodi:nodetypes="ccccc"
-         style="fill:#333333;fill-opacity:1;stroke:none" />
+         style="fill:#666666;fill-opacity:1;stroke:none" />
       <path
          inkscape:connector-curvature="0"
          d="M 4,9.0000001 4,14 l 8,0 0,-5 -8,10e-8 z M 5,10 l 6,0 0,1 -6,0 0,-1 z m 0,2 5,0 0,1 -5,0 0,-1 z"
          id="path4806"
          sodipodi:nodetypes="ccccccccccccccc"
-         style="fill:#333333;fill-opacity:1;stroke:none" />
+         style="fill:#666666;fill-opacity:1;stroke:none" />
     </g>
   </g>
   <g
diff --git a/image/icon/light/print_backup.svg b/image/icon/light/print_backup.svg
new file mode 100644
index 00000000..b14a8256
--- /dev/null
+++ b/image/icon/light/print_backup.svg
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   sodipodi:docname="print.svg"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   height="16"
+   width="16">
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:cy="72.4546"
+     pagecolor="#555753"
+     borderopacity="1"
+     showborder="false"
+     inkscape:bbox-paths="false"
+     guidetolerance="10"
+     inkscape:window-width="1310"
+     showguides="true"
+     inkscape:snap-bbox="true"
+     inkscape:pageshadow="2"
+     inkscape:guide-bbox="true"
+     inkscape:snap-nodes="true"
+     bordercolor="#666666"
+     objecttolerance="10"
+     id="namedview88"
+     showgrid="false"
+     inkscape:window-maximized="0"
+     inkscape:window-x="54"
+     inkscape:window-y="27"
+     gridtolerance="10"
+     inkscape:window-height="701"
+     inkscape:current-layer="layer10"
+     inkscape:zoom="2.0390625"
+     inkscape:cx="-25.548654"
+     inkscape:pageopacity="1">
+    <inkscape:grid
+       spacingx="1px"
+       spacingy="1px"
+       id="grid4866"
+       empspacing="2"
+       enabled="true"
+       type="xygrid"
+       snapvisiblegridlinesonly="true"
+       visible="true" />
+  </sodipodi:namedview>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386" />
+  <g
+     inkscape:label="status"
+     transform="translate(-142,-338)"
+     inkscape:groupmode="layer"
+     id="layer9"
+     style="display:inline" />
+  <g
+     inkscape:label="devices"
+     transform="translate(-142,-338)"
+     inkscape:groupmode="layer"
+     id="layer10">
+    <g
+       inkscape:label="accessories-calculator"
+       transform="translate(94,-60)"
+       id="g10819"
+       style="fill:#333333;fill-opacity:1" />
+    <g
+       inkscape:label="Layer 1"
+       transform="translate(142,338)"
+       id="layer1-6"
+       style="fill:#333333;fill-opacity:1">
+      <path
+         inkscape:connector-curvature="0"
+         d="M 2,4 C 1.5,4 1,4.5 1,5 l 0,4 c 0,0.5 0.5,1 1,1 l 1,0 0,-2 10,0 0,2 1,0 c 0.5,0 1,-0.5 1,-1 L 15,5 C 15,4.5 14.5,4 14,4 L 2,4 z"
+         id="path3520"
+         sodipodi:nodetypes="ccccccccccccc"
+         style="fill:#333333;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         d="M 4,1 4,3 12,3 12,1 4,1 z"
+         id="path4804"
+         sodipodi:nodetypes="ccccc"
+         style="fill:#333333;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         d="M 4,9.0000001 4,14 l 8,0 0,-5 -8,10e-8 z M 5,10 l 6,0 0,1 -6,0 0,-1 z m 0,2 5,0 0,1 -5,0 0,-1 z"
+         id="path4806"
+         sodipodi:nodetypes="ccccccccccccccc"
+         style="fill:#333333;fill-opacity:1;stroke:none" />
+    </g>
+  </g>
+  <g
+     inkscape:label="apps"
+     transform="translate(-142,-338)"
+     inkscape:groupmode="layer"
+     id="layer11" />
+  <g
+     inkscape:label="actions"
+     transform="translate(-142,-338)"
+     inkscape:groupmode="layer"
+     id="layer12" />
+  <g
+     inkscape:label="places"
+     transform="translate(-142,-338)"
+     inkscape:groupmode="layer"
+     id="layer13" />
+  <g
+     inkscape:label="mimetypes"
+     transform="translate(-142,-338)"
+     inkscape:groupmode="layer"
+     id="layer14" />
+  <g
+     inkscape:label="emblems"
+     transform="translate(-142,-338)"
+     inkscape:groupmode="layer"
+     id="layer15" />
+</svg>
diff --git a/image/icon/light/receipt.svg b/image/icon/light/receipt.svg
new file mode 100644
index 00000000..04fc5eab
--- /dev/null
+++ b/image/icon/light/receipt.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16"
+   viewBox="0 0 16 16"
+   width="16"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="receipt.svg"
+   style="fill:#000000"
+   inkscape:version="0.92.1 r15371">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="22.627417"
+     inkscape:cx="4.849314"
+     inkscape:cy="13.469959"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6" />
+  <path
+     d="M 12.2,11.5 H 3.8 v -1.4 h 8.4 z m 0,-2.8 H 3.8 V 7.3 h 8.4 z m 0,-2.8 H 3.8 V 4.5 h 8.4 z M 1.7,15 2.75,13.95 3.8,15 4.85,13.95 5.9,15 6.95,13.95 8,15 9.05,13.95 10.1,15 11.15,13.95 12.2,15 13.25,13.95 14.3,15 V 1 L 13.25,2.05 12.2,1 11.15,2.05 10.1,1 9.05,2.05 8,1 6.95,2.05 5.9,1 4.85,2.05 3.8,1 2.75,2.05 1.7,1 Z"
+     id="path2"
+     style="fill:#666666;fill-opacity:1;stroke-width:0.70000029"
+     inkscape:connector-curvature="0" />
+  <path
+     d="M 0,-8 H 24 V 16 H 0 Z"
+     id="path4"
+     inkscape:connector-curvature="0"
+     style="fill:none" />
+</svg>
diff --git a/image/icon/light/refresh_backup.svg b/image/icon/light/refresh_backup.svg
new file mode 100644
index 00000000..bba06339
--- /dev/null
+++ b/image/icon/light/refresh_backup.svg
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   sodipodi:docname="refresh.svg"
+   inkscape:version="0.48.5 r10040"
+   version="1.1"
+   width="16"
+   height="16">
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:zoom="2.0390625"
+     inkscape:bbox-paths="false"
+     inkscape:pageopacity="1"
+     guidetolerance="10"
+     inkscape:snap-bbox="true"
+     inkscape:window-height="701"
+     objecttolerance="10"
+     id="namedview88"
+     showborder="false"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:cx="-82.864112"
+     inkscape:cy="10.6119"
+     gridtolerance="10"
+     inkscape:snap-bbox-midpoints="false"
+     showguides="true"
+     inkscape:pageshadow="2"
+     pagecolor="#555753"
+     bordercolor="#666666"
+     inkscape:snap-global="true"
+     inkscape:window-maximized="0"
+     inkscape:object-nodes="false"
+     inkscape:snap-nodes="false"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1364"
+     inkscape:snap-others="false"
+     borderopacity="1"
+     showgrid="false"
+     inkscape:snap-to-guides="true"
+     inkscape:object-paths="false"
+     inkscape:snap-grids="true"
+     inkscape:current-layer="layer12">
+    <inkscape:grid
+       enabled="true"
+       spacingx="1px"
+       spacingy="1px"
+       id="grid4866"
+       visible="true"
+       snapvisiblegridlinesonly="true"
+       empspacing="2"
+       type="xygrid" />
+  </sodipodi:namedview>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386" />
+  <g
+     id="layer9"
+     transform="translate(-241.0002,-627)"
+     inkscape:label="status"
+     style="display:inline"
+     inkscape:groupmode="layer" />
+  <g
+     id="layer10"
+     transform="translate(-241.0002,-627)"
+     inkscape:label="devices"
+     inkscape:groupmode="layer" />
+  <g
+     id="layer11"
+     transform="translate(-241.0002,-627)"
+     inkscape:label="apps"
+     inkscape:groupmode="layer" />
+  <g
+     id="layer13"
+     transform="translate(-241.0002,-627)"
+     inkscape:label="places"
+     inkscape:groupmode="layer" />
+  <g
+     id="layer14"
+     transform="translate(-241.0002,-627)"
+     inkscape:label="mimetypes"
+     inkscape:groupmode="layer" />
+  <g
+     id="layer15"
+     transform="translate(-241.0002,-627)"
+     inkscape:label="emblems"
+     style="display:inline"
+     inkscape:groupmode="layer" />
+  <g
+     id="g71291"
+     transform="translate(-241.0002,-627)"
+     inkscape:label="emotes"
+     style="display:inline"
+     inkscape:groupmode="layer" />
+  <g
+     id="g4953"
+     transform="translate(-241.0002,-627)"
+     inkscape:label="categories"
+     style="display:inline"
+     inkscape:groupmode="layer" />
+  <g
+     id="layer12"
+     transform="translate(-241.0002,-627)"
+     inkscape:label="actions"
+     style="display:inline"
+     inkscape:groupmode="layer">
+    <path
+       id="path4597"
+       d="m 253.90645,628.96875 a 1.0001,1.0001 0 0 0 -0.125,0.0312 1.0001,1.0001 0 0 0 -0.78125,1 l 0,1.6875 c -0.38225,-0.57796 -0.84927,-1.08223 -1.40625,-1.5 -1.15563,-0.86677 -2.53199,-1.25227 -3.875,-1.1875 -0.19186,0.009 -0.37223,0.0353 -0.5625,0.0625 -1.52218,0.21741 -2.97815,1.02304 -3.96875,2.34375 -1.98119,2.64144 -1.42267,6.42505 1.21875,8.40625 2.64147,1.98122 6.42504,1.42267 8.40625,-1.21875 A 1.0063276,1.0063276 0 0 0 253.0002,638 a 1.0063276,1.0063276 0 0 0 0,-0.15625 l 0,-0.84375 -0.8125,0 -0.0937,0 a 1.0063276,1.0063276 0 0 0 -0.0937,0 1.0063276,1.0063276 0 0 0 -0.8125,0.40625 c -1.33265,1.77674 -3.81702,2.11387 -5.59375,0.78125 -1.77674,-1.33264 -2.1139,-3.81699 -0.78125,-5.59375 1.33265,-1.77674 3.817,-2.11389 5.59375,-0.78125 0.42946,0.32212 0.76954,0.73295 1.03125,1.1875 l -1.4375,0 a 1.0001,1.0001 0 0 0 -1,1 1.0001,1.0001 0 0 0 0,0.21875 l 0,0.78125 0.84375,0 0.15625,0 4,0 1,0 0,-1 0,-4 a 1.0001,1.0001 0 0 0 0,-0.1875 l 0,-0.8125 -0.8125,0 a 1.0001,1.0001 0 0 0 -0.28125,-0.0312 z"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#666666;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/js/hedera/basket-checker.js b/js/hedera/basket-checker.js
index cc3d8930..253d8bba 100644
--- a/js/hedera/basket-checker.js
+++ b/js/hedera/basket-checker.js
@@ -3,7 +3,7 @@ module.exports =
 {
 	check: function (conn, callback)
 	{
-		conn.execQuery ('CALL basket_check ()',
+		conn.execQuery ('CALL basketCheck ()',
 			this._onBasketCheck.bind (this, callback));
 	}
 	
@@ -24,4 +24,3 @@ module.exports =
 			Vn.Hash.set ({'form': 'ecomerce/checkout'});
 	}
 };
-
diff --git a/js/hedera/form.js b/js/hedera/form.js
index 652b6d76..b1864abf 100644
--- a/js/hedera/form.js
+++ b/js/hedera/form.js
@@ -73,7 +73,7 @@ module.exports = new Class
 			this.deactivate ();
 			this.gui.setTitle (null);
 			this.gui.setActions (null);
-			Vn.Node.remove (this.node);
+			this.gui.setForm (null);
 			this.deactivate ();
 			this.node = null;
 		}
diff --git a/js/hedera/gui.css b/js/hedera/gui.css
index 127e1f9b..74eace01 100644
--- a/js/hedera/gui.css
+++ b/js/hedera/gui.css
@@ -56,7 +56,7 @@
 {
 	float: left;
 }
-.vn-gui .title h1
+.vn-gui .title > h1
 {
 	font-weight: normal;
 	font-size: 1.4em;
@@ -279,6 +279,11 @@
 	transition-duration: 200ms;
 }
 .vn-gui .form-holder
+{
+	position: relative;
+	height: inherit;
+}
+.vn-gui .form-holder > *
 {
 	position: relative;
 	height: inherit;
@@ -288,10 +293,10 @@
 	-webkit-transform: translateZ(0) translateX(-2em);
 
 	transition-property: opacity, transform;
-	transition-duration: 200ms;
 	transition-timing-function: ease-out;
+	transition-duration: 200ms;
 }
-.vn-gui .form-holder.show
+.vn-gui .form-holder > .slide
 {
 	opacity: 1;
 	transform: translateZ(0) translateX(0em);
@@ -348,7 +353,7 @@
 	
 		max-height: 0;
 		transition: max-height 300ms ease-out;
-		webkit-transition: max-height 300ms ease-out;
+		-webkit-transition: max-height 300ms ease-out;
 	}
 	.vn-gui .main-menu li:hover > ul.submenu
 	{
diff --git a/js/hedera/gui.js b/js/hedera/gui.js
index d0dc6048..35289ac7 100644
--- a/js/hedera/gui.js
+++ b/js/hedera/gui.js
@@ -432,14 +432,17 @@ module.exports = new Class
 
 		if (form)
 		{
-			this.$('form-holder').appendChild (form);
-			setTimeout (this._onSetFormTimeout.bind (this), 0);
+			var div = this.createElement('div');
+			div.appendChild (form);
+
+			this.$('form-holder').appendChild (div);
+			setTimeout (this._onSetFormTimeout.bind (this));
 		}
 	}
 	
 	,_onSetFormTimeout: function ()
 	{
-		Vn.Node.addClass (this.$('form-holder'), 'show');
+		Vn.Node.addClass (this.$('form-holder').firstChild, 'slide');
 	}
 	
 	,setTitle: function (title)
@@ -456,7 +459,6 @@ module.exports = new Class
 	{
 		if (this.activeForm)
 		{
-			Vn.Node.removeClass (this.$('form-holder'), 'show');
 			this.activeForm.close ();
 			this.activeForm.unref ();
 			this.activeForm = null;
diff --git a/reports/delivery-note/locale/es.json b/reports/delivery-note/locale/es.json
index d6cc0100..8ad83bc3 100644
--- a/reports/delivery-note/locale/es.json
+++ b/reports/delivery-note/locale/es.json
@@ -1,3 +1,4 @@
 {
-    "Import": "Importe"
+     "Import": "Importe"
+	,"Total + VAT": "Total + IVA"
 }
\ No newline at end of file
diff --git a/reports/delivery-note/ui.xml b/reports/delivery-note/ui.xml
index 16c24034..546827ba 100755
--- a/reports/delivery-note/ui.xml
+++ b/reports/delivery-note/ui.xml
@@ -3,13 +3,7 @@
 	<db-form id="ticket">
 		<db-model property="model" id="ticket-data" conn="conn" batch="batch">
 			<custom>
-				SELECT t.id, date, a.Agencia, note, p.name province,
-				zip_code, city, c.name, consignee, invoice
-					FROM ticket_view t
-					JOIN address_view c ON t.address_id = c.id
-					JOIN vn2008.Agencias a ON t.agency_id = a.Id_Agencia
-					JOIN vn2008.province p ON c.province_id = p.province_id
-						WHERE t.id = #ticket
+				CALL clientTicketGet(#ticket)
 			</custom>
 		</db-model>
 	</db-form>
@@ -40,17 +34,10 @@
 	<htk-grid>
 		<db-model property="model" id="movements" conn="conn" batch="batch">
 			<custom>
-				SELECT m.item_id, amount, concept, Categoria, Medida, Tallos, Color,
-				Abreviatura, IF(fixed != FALSE, price, NULL) price, fixed, discount
-					FROM ticket_row_view m
-					INNER JOIN vn2008.Articles a
-						ON m.item_id = a.Id_Article AND ticket_id = #ticket 
-					LEFT JOIN vn2008.Origen o
-						ON a.id_origen = o.id
-						ORDER BY concept
+				CALL clientTicketRowGet(#ticket)
 			</custom>
 		</db-model>
-		<htk-column-spin title="_Ref" column="item_id"/>
+		<htk-column-spin title="_Ref" column="item"/>
 		<htk-column-spin title="_Amount" column="amount"/>
 		<htk-column-text title="_Item" column="concept"/>
 		<htk-column-text title="_S1" column="Medida"/>
@@ -58,10 +45,15 @@
 		<htk-column-spin title="_Price" column="price" unit="€" digits="2"/>
 		<htk-column-spin title="_Import" unit="€" digits="2" renderer="subtotalRenderer"/>
 	</htk-grid>
-	<p class="footer">
-		<htk-text format="%.2d€">
-			<db-calc-sum property="param" func="subtotal" model="movements"/>
-		</htk-text>
-	</p>
+	<div class="footer">
+		<p>
+			<t>Total</t> 
+			<htk-text form="ticket" column="total" format="%.2d€"/>
+		</p>
+		<p>
+			<t>Total + VAT</t> 
+			<htk-text form="ticket" column="totalPlusVat" format="%.2d€"/>
+		</p>
+	</div>
 </div>
 </vn>