From 5bf20683445bf3ef82374a063b259f8728041a79 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Tue, 8 Oct 2019 13:51:16 +0200
Subject: [PATCH 01/41] added invoiceOut alias

---
 modules/invoiceOut/back/methods/invoiceOut/filter.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/invoiceOut/back/methods/invoiceOut/filter.js b/modules/invoiceOut/back/methods/invoiceOut/filter.js
index 001fe077d..092d298d0 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/filter.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/filter.js
@@ -86,8 +86,9 @@ module.exports = Self => {
                 return {'i.hasPdf': value};
             case 'created':
                 return {'i.created': value};
-            case 'amount':
             case 'clientFk':
+                return {'i.clientFk': value};
+            case 'amount':
             case 'companyFk':
             case 'issued':
             case 'dued':

From f8ba4d38b786e8a83eb7c6ee174da420dc7dbc08 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Tue, 8 Oct 2019 14:36:02 +0200
Subject: [PATCH 02/41] stowaway changed to correct field name

---
 modules/ticket/back/methods/ticket/getPossibleStowaways.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ticket/back/methods/ticket/getPossibleStowaways.js b/modules/ticket/back/methods/ticket/getPossibleStowaways.js
index f692c9f23..3565d64ab 100644
--- a/modules/ticket/back/methods/ticket/getPossibleStowaways.js
+++ b/modules/ticket/back/methods/ticket/getPossibleStowaways.js
@@ -45,7 +45,7 @@ module.exports = Self => {
                 clientFk: ship.clientFk,
                 addressFk: ship.addressFk,
                 agencyModeFk: ship.agencyModeFk,
-                warehouse: {neq: ship.warehouseFk},
+                warehouseFk: {neq: ship.warehouseFk},
                 shipped: {
                     between: [lowestDate.toJSON(), highestDate.toJSON()]
                 }

From 0c097718c15cfc0d364a82d9091aa19e60b976e4 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Thu, 10 Oct 2019 08:33:22 +0200
Subject: [PATCH 03/41] added transaction options to findOne()

---
 back/methods/dms/uploadFile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/back/methods/dms/uploadFile.js b/back/methods/dms/uploadFile.js
index b50aaf824..41d551f2b 100644
--- a/back/methods/dms/uploadFile.js
+++ b/back/methods/dms/uploadFile.js
@@ -94,7 +94,7 @@ module.exports = Self => {
         const models = Self.app.models;
         const storageConnector = Self.app.dataSources.storage.connector;
         const myUserId = ctx.req.accessToken.userId;
-        const myWorker = await models.Worker.findOne({where: {userFk: myUserId}});
+        const myWorker = await models.Worker.findOne({where: {userFk: myUserId}}, myOptions);
         const args = ctx.args;
 
         const newDms = await Self.create({

From 777baf38a84f1f54376b27a25edce7b11ffd60fd Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Thu, 10 Oct 2019 09:58:34 +0200
Subject: [PATCH 04/41] changed warehouse from ticket id 17

---
 db/dump/fixtures.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index f701c4121..f00a98759 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -471,7 +471,7 @@ INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeF
         (14, 1,     2,  1, 3,    CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            104, 'Malibu Point',          4,   NULL,       0, 9,  CURDATE()),
         (15, 1,     7,  1, 3,    CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            105, 'Plastic Cell',          125, NULL,       0, 3,  CURDATE()),
         (16, 1,     7,  1, 3,    CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            106, 'Many Places',           126, NULL,       0, 3,  CURDATE()),
-        (17, 1,     7,  1, 3,    CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            106, 'Many Places',           126, NULL,       0, 3,  CURDATE()),
+        (17, 1,     7,  2, 3,    CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            106, 'Many Places',           126, NULL,       0, 3,  CURDATE()),
         (18, 1,     4,  4, 3,    CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            108, 'Cerebro',               128, NULL,       0, 12, CURDATE()),
         (19, 1,     5,  5, 3,    CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            109, 'Somewhere in Thailand', 129, NULL,       1, 13, CURDATE()),
         (20, 1,     5,  5, 3,    DATE_ADD(CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 109, 'Somewhere in Thailand', 129, NULL,       0, 13, DATE_ADD(CURDATE(), INTERVAL +1 MONTH)),

From 9899edffc63090d9913b7f730885a2f8bc996208 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Thu, 10 Oct 2019 09:59:28 +0200
Subject: [PATCH 05/41] changed state to stowaway ticket

---
 modules/ticket/back/models/stowaway.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ticket/back/models/stowaway.js b/modules/ticket/back/models/stowaway.js
index aa21e8680..780b6b31c 100644
--- a/modules/ticket/back/models/stowaway.js
+++ b/modules/ticket/back/models/stowaway.js
@@ -14,7 +14,7 @@ module.exports = function(Self) {
                 code: 'BOARDING'
             };
             let state = await models.State.findOne({where});
-            let params = {ticketFk: ctx.instance.id, stateFk: state.id};
+            let params = {ticketFk: ctx.instance.shipFk, stateFk: state.id};
             const loopBackContext = LoopBackContext.getCurrentContext();
 
             let httpCtx = {req: loopBackContext.active};

From 2a3d6dcd76ee5e5e3005ded1c524533c769f12b4 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Mon, 14 Oct 2019 11:50:45 +0200
Subject: [PATCH 06/41] fixed transaction params

---
 back/methods/message/send.js                                | 4 ++--
 modules/client/back/methods/address/createDefaultAddress.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/back/methods/message/send.js b/back/methods/message/send.js
index f7b7ad76e..c8849774b 100644
--- a/back/methods/message/send.js
+++ b/back/methods/message/send.js
@@ -29,8 +29,8 @@ module.exports = Self => {
         const accessToken = ctx.options && ctx.options.accessToken || ctx.req && ctx.req.accessToken;
         const userId = accessToken.userId;
         const models = Self.app.models;
-        const sender = await models.Account.findById(userId, options);
-        const recipient = await models.Account.findById(data.recipientFk, options);
+        const sender = await models.Account.findById(userId, null, options);
+        const recipient = await models.Account.findById(data.recipientFk, null, options);
 
         await Self.create({
             sender: sender.name,
diff --git a/modules/client/back/methods/address/createDefaultAddress.js b/modules/client/back/methods/address/createDefaultAddress.js
index c757f9f85..e524a6017 100644
--- a/modules/client/back/methods/address/createDefaultAddress.js
+++ b/modules/client/back/methods/address/createDefaultAddress.js
@@ -26,7 +26,7 @@ module.exports = function(Self) {
 
             let address = data.address;
             let newAddress = await Address.create(address, options);
-            let client = await Client.findById(address.clientFk, options);
+            let client = await Client.findById(address.clientFk, null, options);
 
             if (data.isDefaultAddress) {
                 await client.updateAttributes({

From 3bf44d08de5786163f4b3aa2c1bd1b7d2d16d90f Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Tue, 15 Oct 2019 16:19:35 +0200
Subject: [PATCH 07/41] vnDatePicker refactor

---
 e2e/helpers/extensions.js                     | 219 ++++++++----------
 e2e/helpers/nightmare.js                      |   4 +-
 e2e/helpers/selectors.js                      |   1 -
 e2e/paths/01-login/01_login.spec.js           |   2 -
 front/core/components/autocomplete/index.html |   4 +-
 front/core/components/autocomplete/index.js   |   3 +-
 front/core/components/autocomplete/style.scss |   3 +
 front/core/components/date-picker/index.js    | 105 +++------
 .../core/components/date-picker/index.spec.js |  20 +-
 .../core/components/drop-down/drop-down.html  |   3 +-
 front/core/components/drop-down/drop-down.js  |   2 +-
 front/core/components/field/index.js          |   6 +-
 front/core/components/field/style.scss        |  39 +++-
 front/core/components/input-time/index.js     |   5 +-
 front/core/components/popover/popover.js      |   3 +-
 front/core/components/searchbar/searchbar.js  |   2 +-
 front/core/directives/focus.js                |   6 +-
 front/core/vendor.js                          |   7 -
 front/package-lock.json                       |  28 ---
 front/package.json                            |   1 -
 modules/claim/front/basic-data/index.html     |  21 +-
 modules/client/front/fiscal-data/index.html   |  13 +-
 modules/order/front/filter/index.js           |   2 +-
 .../front/basic-data/step-one/index.html      |  30 ++-
 .../front/basic-data/step-one/style.scss      |   9 +-
 webpack.config.js                             |   2 +-
 26 files changed, 237 insertions(+), 303 deletions(-)

diff --git a/e2e/helpers/extensions.js b/e2e/helpers/extensions.js
index fb36e3279..022b282d3 100644
--- a/e2e/helpers/extensions.js
+++ b/e2e/helpers/extensions.js
@@ -6,6 +6,93 @@ import config from './config.js';
 
 let currentUser;
 
+let asyncActions = {
+    // Generic extensions
+
+    clickIfExists: async function(selector) {
+        let exists = await this.exists(selector);
+        if (exists) await this.click(selector);
+    },
+
+    // Salix specific extensions
+
+    changeLanguageToEnglish: async function() {
+        let langSelector = '.user-popover vn-autocomplete[ng-model="$ctrl.lang"]';
+
+        let lang = await this.waitToClick('#user')
+            .wait(langSelector)
+            .waitToGetProperty(`${langSelector} input`, 'value');
+
+        if (lang !== 'English')
+            await this.autocompleteSearch(langSelector, 'English');
+    },
+
+    login: async function(userName) {
+        if (currentUser !== userName) {
+            this.clickIfExists('#logout')
+                .clickIfExists('.vn-dialog.shown button[response=ACCEPT]');
+
+            try {
+                await this.waitForURL('#!/login');
+            } catch (e) {
+                this.goto(`${config.url}/#!/login`);
+            }
+
+            await this.wait(`vn-login input[name=user]`)
+                .clearInput(`vn-login input[name=user]`)
+                .write(`vn-login input[name=user]`, userName)
+                .write(`vn-login input[name=password]`, 'nightmare')
+                .click(`vn-login input[type=submit]`)
+                .waitForURL('#!/')
+                .changeLanguageToEnglish();
+
+            currentUser = userName;
+        } else
+            await this.waitToClick('vn-topbar a[ui-sref="home"]');
+    },
+
+    waitForLogin: async function(userName) {
+        await this.login(userName);
+    },
+
+    selectModule: async function(moduleName) {
+        let snakeName = moduleName.replace(/[\w]([A-Z])/g, m => {
+            return m[0] + '-' + m[1];
+        }).toLowerCase();
+
+        await this.waitToClick(`vn-home a[ui-sref="${moduleName}.index"]`)
+            .waitForURL(snakeName);
+    },
+
+    loginAndModule: async function(userName, moduleName) {
+        await this.login(userName)
+            .selectModule(moduleName);
+    },
+
+    datePicker: async function(selector, changeMonth, day) {
+        let date = new Date();
+        if (changeMonth) date.setMonth(date.getMonth() + changeMonth);
+        date.setDate(day ? day : 16);
+        date = date.toISOString().substr(0, 10);
+
+        await this.wait(selector)
+            .evaluate((selector, date) => {
+                let input = document.querySelector(selector).$ctrl.input;
+                input.value = date;
+                input.dispatchEvent(new Event('change'));
+            }, selector, date);
+    },
+
+    pickTime: async function(selector, time) {
+        await this.wait(selector)
+            .evaluate((selector, time) => {
+                let input = document.querySelector(selector);
+                input.value = time;
+                input.dispatchEvent(new Event('change'));
+            }, selector, time);
+    }
+};
+
 let actions = {
     clearTextarea: function(selector, done) {
         this.wait(selector)
@@ -28,48 +115,6 @@ let actions = {
             .catch(done);
     },
 
-    login: function(userName, done) {
-        if (currentUser)
-            this.waitToClick('#logout');
-
-        let doLogin = () => {
-            this.wait(`vn-login input[name=user]`)
-                .clearInput(`vn-login input[name=user]`)
-                .write(`vn-login input[name=user]`, userName)
-                .write(`vn-login input[name=password]`, 'nightmare')
-                .click(`vn-login input[type=submit]`)
-                .then(() => {
-                    currentUser = userName;
-                    done();
-                })
-                .catch(done);
-        };
-
-        this.waitForURL('#!/login')
-            .then(doLogin)
-            .catch(() => {
-                this.goto(`${config.url}/#!/login`)
-                    .then(doLogin)
-                    .catch(done);
-            });
-    },
-
-    waitForLogin: function(userName, done) {
-        if (currentUser === userName) {
-            return this.waitToClick('vn-topbar a[ui-sref="home"]')
-                .waitForURL('#!/')
-                .changeLanguageToEnglish()
-                .then(done)
-                .catch(done);
-        }
-        return this.login(userName)
-            .waitForURL('#!/')
-            .url()
-            .changeLanguageToEnglish()
-            .then(done)
-            .catch(done);
-    },
-
     resetLogin: function(done) {
         this.then(() => {
             currentUser = undefined;
@@ -78,41 +123,6 @@ let actions = {
             .catch(done);
     },
 
-    changeLanguageToEnglish: function(done) {
-        let langSelector = '.user-popover vn-autocomplete[ng-model="$ctrl.lang"]';
-
-        this.waitToClick('#user')
-            .wait(langSelector)
-            .waitToGetProperty(`${langSelector} input`, 'value')
-            .then(lang => {
-                if (lang === 'English') {
-                    this.then(done)
-                        .catch(done);
-                } else {
-                    this.autocompleteSearch(langSelector, 'English')
-                        .then(done)
-                        .catch(done);
-                }
-            });
-    },
-
-    selectModule: function(moduleName, done) {
-        let snakeName = moduleName.replace(/[\w]([A-Z])/g, m => {
-            return m[0] + '-' + m[1];
-        }).toLowerCase();
-        this.waitToClick(`vn-home a[ui-sref="${moduleName}.index"]`)
-            .waitForURL(snakeName)
-            .then(done)
-            .catch(done);
-    },
-
-    loginAndModule: function(userName, moduleName, done) {
-        this.waitForLogin(userName)
-            .selectModule(moduleName)
-            .then(done)
-            .catch(done);
-    },
-
     parsedUrl: function(done) {
         this.url()
             .then(url => {
@@ -419,51 +429,6 @@ let actions = {
             });
     },
 
-    pickTime: function(selector, time, done) {
-        this.wait(selector)
-            .evaluate((selector, time) => {
-                let input = document.querySelector(selector);
-                input.value = time;
-                input.dispatchEvent(new Event('change'));
-            }, selector, time)
-            .then(done)
-            .catch(done);
-    },
-
-    datePicker: function(selector, changeMonth, day, done) {
-        this.wait(selector)
-            .mousedown(`${selector} input`)
-            .wait('.flatpickr-calendar.open');
-
-        if (changeMonth > 0)
-            this.mousedown(`.flatpickr-calendar.open .flatpickr-next-month`);
-        if (changeMonth < 0)
-            this.mousedown(`.flatpickr-calendar.open .flatpickr-prev-month`);
-
-        let daySelector;
-
-        if (!day)
-            daySelector = `.flatpickr-calendar.open .flatpickr-day:nth-child(16)`;
-        if (day)
-            daySelector = `.flatpickr-calendar.open .flatpickr-day[aria-label~="${day},"]:not(.prevMonthDay):not(.nextMonthDay)`;
-
-        this.wait(selector => {
-            return document.querySelector(selector);
-        }, daySelector)
-            .evaluate(selector => {
-                let event = new MouseEvent('mousedown', {
-                    bubbles: true,
-                    cancelable: true,
-                    view: window
-                });
-                document.querySelector(selector).dispatchEvent(event);
-            }, daySelector)
-            .then(done)
-            .catch(() => {
-                done(new Error(`.datePicker(), for ${daySelector} timed out`));
-            });
-    },
-
     reloadSection: function(sectionRoute, done) {
         this.waitToClick('vn-icon[icon="desktop_windows"]')
             .wait('vn-card.summary')
@@ -520,3 +485,13 @@ Object.keys(actions).forEach(function(name) {
     let fn = actions[name];
     Nightmare.action(name, fn);
 });
+
+for (let name in asyncActions) {
+    let fn = asyncActions[name];
+
+    Nightmare.action(name, function(...args) {
+        let done = args[args.length - 1];
+        fn.apply(this, args)
+            .then(res => done(null, res), done);
+    });
+}
diff --git a/e2e/helpers/nightmare.js b/e2e/helpers/nightmare.js
index a76b50093..f93523856 100644
--- a/e2e/helpers/nightmare.js
+++ b/e2e/helpers/nightmare.js
@@ -1,4 +1,6 @@
 const Nightmare = require('nightmare');
+const config = require('./config.js');
+
 let nightmare;
 
 module.exports = function createNightmare(width = 1280, height = 720) {
@@ -22,5 +24,5 @@ module.exports = function createNightmare(width = 1280, height = 720) {
     });
 
     nightmare.header('Accept-Language', 'en');
-    return nightmare;
+    return nightmare.goto(config.url);
 };
diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index 81ad3a0dc..5a3f131a8 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -420,7 +420,6 @@ export default {
         firstSaleQuantity: 'vn-input-number[ng-model="sale.quantity"]:nth-child(1) input',
         firstSaleQuantityCell: 'vn-ticket-sale vn-tr:nth-child(1) > vn-td-editable:nth-child(5)',
         firstSaleQuantityClearInput: 'vn-textfield[ng-model="sale.quantity"] div.suffix > i',
-        firstSaleIdInput: 'vn-ticket-sale vn-table vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(4) > vn-autocomplete input',
         firstSaleIdAutocomplete: 'vn-ticket-sale vn-table vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(4) > vn-autocomplete',
         idAutocompleteFirstResult: '.vn-popover.shown .vn-drop-down li',
         firstSalePrice: 'vn-ticket-sale vn-table vn-tr:nth-child(1) > vn-td:nth-child(7) > span',
diff --git a/e2e/paths/01-login/01_login.spec.js b/e2e/paths/01-login/01_login.spec.js
index a33be0c25..e5a70703e 100644
--- a/e2e/paths/01-login/01_login.spec.js
+++ b/e2e/paths/01-login/01_login.spec.js
@@ -1,5 +1,4 @@
 import createNightmare from '../../helpers/nightmare';
-import config from '../../helpers/config.js';
 
 
 describe('Login path', () => {
@@ -10,7 +9,6 @@ describe('Login path', () => {
         const password = 'nightmare';
 
         const result = await nightmare
-            .goto(`${config.url}/#!/login`)
             .wait(`vn-login input[name=user]`)
             .write(`vn-login input[name=user]`, username)
             .write(`vn-login input[name=password]`, password)
diff --git a/front/core/components/autocomplete/index.html b/front/core/components/autocomplete/index.html
index 2e5cc39f6..c0caf061b 100755
--- a/front/core/components/autocomplete/index.html
+++ b/front/core/components/autocomplete/index.html
@@ -1,6 +1,6 @@
 <div
     class="container"
-    ng-click="$ctrl.onContainerMouseDown($event)"
+    ng-click="$ctrl.onContainerClick($event)"
     ng-keydown="$ctrl.onContainerKeyDown($event)">
     <div
         ng-transclude="prepend"
@@ -48,5 +48,5 @@
     vn-id="drop-down"
     on-select="$ctrl.onDropDownSelect(item)"
     on-data-ready="$ctrl.onDataReady()"
-    on-close="$ctrl.focus()">
+    on-close-start="$ctrl.focus()">
 </vn-drop-down>
\ No newline at end of file
diff --git a/front/core/components/autocomplete/index.js b/front/core/components/autocomplete/index.js
index 69114d028..49dd14b07 100755
--- a/front/core/components/autocomplete/index.js
+++ b/front/core/components/autocomplete/index.js
@@ -228,7 +228,7 @@ export default class Autocomplete extends Field {
         event.preventDefault();
     }
 
-    onContainerMouseDown(event) {
+    onContainerClick(event) {
         if (event.defaultPrevented) return;
         event.preventDefault();
         this.showDropDown();
@@ -260,6 +260,7 @@ export default class Autocomplete extends Field {
     }
 
     showDropDown(search) {
+        if (this.readonly) return;
         this.assignDropdownProps();
         this.$.dropDown.show(this.container, search);
     }
diff --git a/front/core/components/autocomplete/style.scss b/front/core/components/autocomplete/style.scss
index af45902cc..6be42c3bc 100755
--- a/front/core/components/autocomplete/style.scss
+++ b/front/core/components/autocomplete/style.scss
@@ -20,4 +20,7 @@ vn-autocomplete.vn-field {
             }
         }
     }
+    &.readonly > .container > .icons.post {
+        display: none;
+    }
 }
diff --git a/front/core/components/date-picker/index.js b/front/core/components/date-picker/index.js
index e46cde17e..933123485 100644
--- a/front/core/components/date-picker/index.js
+++ b/front/core/components/date-picker/index.js
@@ -1,15 +1,40 @@
 import ngModule from '../../module';
 import Field from '../field';
-import {Flatpickr} from '../../vendor';
 import './style.scss';
 
 class DatePicker extends Field {
-    constructor($element, $scope, $compile, $translate) {
+    constructor($element, $scope, $compile, $translate, $filter) {
         super($element, $scope, $compile);
         this.$translate = $translate;
+        this.$filter = $filter;
 
-        this.input = $compile(`<input type="text"></input>`)($scope)[0];
-        this.initPicker();
+        this.input = $compile(`<input type="date"></input>`)($scope)[0];
+        this.input.addEventListener('change', () => this.onValueUpdate());
+    }
+
+    onValueUpdate() {
+        let date = null;
+        let value = this.input.value;
+
+        if (value) {
+            date = new Date(value);
+
+            if (this.field) {
+                let orgDate = this.field instanceof Date
+                    ? this.field
+                    : new Date(this.field);
+
+                date.setHours(
+                    orgDate.getHours(),
+                    orgDate.getMinutes(),
+                    orgDate.getSeconds(),
+                    orgDate.getMilliseconds()
+                );
+            }
+        }
+
+        super.field = date;
+        this.$.$applyAsync();
     }
 
     get field() {
@@ -18,69 +43,10 @@ class DatePicker extends Field {
 
     set field(value) {
         super.field = value;
-
-        let date = value;
-        if (date && !(date instanceof Date))
-            date = new Date(date);
-
-        this.picker.setDate(fixDate(date));
-    }
-
-    set options(value) {
-        let selectedDates = this.picker.selectedDates || [];
-        this._options = value;
-        this.initPicker();
-        this.picker.setDate(selectedDates[0]);
-    }
-
-    get options() {
-        return this._options;
-    }
-
-    initPicker() {
-        let locale = this.$translate.use();
-        let format = locale == 'es' ? 'd-m-Y' : 'Y-m-d';
-
-        let options = this.options || {};
-        let defaultOptions = {
-            locale: locale,
-            dateFormat: format,
-            enableTime: false,
-            disableMobile: true,
-            onValueUpdate: () => this.onValueUpdate()
-        };
-
-        if (options.enableTime) {
-            Object.assign(defaultOptions, {
-                dateFormat: `${format} h:i`,
-                time_24hr: true
-            });
-        }
-
-        let mergedOptions = Object.assign({},
-            defaultOptions,
-            options
-        );
-
-        if (this.picker) this.picker.destroy();
-        this.picker = new Flatpickr(this.input, mergedOptions);
-    }
-
-    onValueUpdate() {
-        let date = null;
-
-        if (this.picker.selectedDates.length)
-            date = this.picker.selectedDates[0];
-
-        super.field = fixDate(date, -1);
-        this.$.$applyAsync();
-    }
-
-    $onDestroy() {
-        this.picker.destroy();
+        this.input.value = this.$filter('dateTime')(value, 'yyyy-MM-dd');
     }
 }
-DatePicker.$inject = ['$element', '$scope', '$compile', '$translate'];
+DatePicker.$inject = ['$element', '$scope', '$compile', '$translate', '$filter'];
 
 ngModule.vnComponent('vnDatePicker', {
     controller: DatePicker,
@@ -88,12 +54,3 @@ ngModule.vnComponent('vnDatePicker', {
         options: '<?'
     }
 });
-
-function fixDate(date, mult = 1) {
-    if (date) {
-        let offset = date.getTimezoneOffset() * 60000;
-        date.setTime(date.getTime() + (offset * mult));
-    }
-
-    return date;
-}
diff --git a/front/core/components/date-picker/index.spec.js b/front/core/components/date-picker/index.spec.js
index 9e76bceb2..b6f6fbd2f 100644
--- a/front/core/components/date-picker/index.spec.js
+++ b/front/core/components/date-picker/index.spec.js
@@ -2,7 +2,6 @@ describe('Component vnDatePicker', () => {
     let $filter;
     let $element;
     let $ctrl;
-    let today;
 
     beforeEach(angular.mock.module('vnCore', $translateProvider => {
         $translateProvider.translations('en', {});
@@ -13,9 +12,6 @@ describe('Component vnDatePicker', () => {
 
         $element = $compile(`<vn-date-picker></vn-date-picker>`)($rootScope);
         $ctrl = $element.controller('vnDatePicker');
-
-        today = new Date();
-        today.setUTCHours(0, 0, 0, 0);
     }));
 
     afterEach(() => {
@@ -24,22 +20,14 @@ describe('Component vnDatePicker', () => {
 
     describe('field() setter', () => {
         it(`should display the formated the date`, () => {
-            $ctrl.field = today;
+            let today;
+            today = new Date();
+            today.setUTCHours(0, 0, 0, 0);
 
+            $ctrl.field = today;
             let displayed = $filter('dateTime')(today, 'yyyy-MM-dd');
 
             expect($ctrl.value).toEqual(displayed);
         });
     });
-
-    describe('options() setter', () => {
-        it(`should display the date with the new format`, () => {
-            $ctrl.options = {dateFormat: 'Y-m'};
-            $ctrl.field = today;
-
-            let displayed = $filter('dateTime')(today, 'yyyy-MM');
-
-            expect($ctrl.value).toEqual(displayed);
-        });
-    });
 });
diff --git a/front/core/components/drop-down/drop-down.html b/front/core/components/drop-down/drop-down.html
index e9a37a675..2e4db921d 100755
--- a/front/core/components/drop-down/drop-down.html
+++ b/front/core/components/drop-down/drop-down.html
@@ -1,7 +1,8 @@
 <vn-popover
     vn-id="popover"
     on-open="$ctrl.onOpen()"
-    on-close="$ctrl.onClose()">
+    on-close="$ctrl.onClose()"
+    on-close-start="$ctrl.emit('closeStart')">
     <div class="vn-drop-down">
         <div ng-show="$ctrl.showFilter" class="filter">
             <vn-textfield
diff --git a/front/core/components/drop-down/drop-down.js b/front/core/components/drop-down/drop-down.js
index e57de0b6d..4b3530251 100755
--- a/front/core/components/drop-down/drop-down.js
+++ b/front/core/components/drop-down/drop-down.js
@@ -193,7 +193,7 @@ export default class DropDown extends Component {
     onOpen() {
         this.document.addEventListener('keydown', this.docKeyDownHandler);
         this.$.list.scrollTop = 0;
-        this.$.input.focus();
+        setTimeout(() => this.$.input.focus());
         this.emit('open');
     }
 
diff --git a/front/core/components/field/index.js b/front/core/components/field/index.js
index bc60af0d3..1004aeb05 100644
--- a/front/core/components/field/index.js
+++ b/front/core/components/field/index.js
@@ -69,10 +69,12 @@ export default class Field extends FormInput {
     }
 
     set name(value) {
+        // super.name = value;
         this.input.name = value;
     }
 
     get name() {
+        // return super.name;
         return this.input.name;
     }
 
@@ -181,8 +183,8 @@ export default class Field extends FormInput {
     }
 
     onClick() {
-        if (event.defaultPrevented) return;
-        event.preventDefault();
+        // if (event.defaultPrevented) return;
+        // event.preventDefault();
 
         if (this.input !== document.activeElement)
             this.focus();
diff --git a/front/core/components/field/style.scss b/front/core/components/field/style.scss
index 30b33a5df..9d45da3d2 100644
--- a/front/core/components/field/style.scss
+++ b/front/core/components/field/style.scss
@@ -64,12 +64,33 @@
                     color: inherit;
                     box-sizing: border-box;
                     min-height: 56px;
-    
+                }
+                & > input {
+                    position: relative;
+
+                    &[type=time],
+                    &[type=date],
+                    &[type=password] {
+                        opacity: 0;
+                        transition: opacity 200ms ease-in-out;
+                        cursor: pointer;
+                    }
                     &[type=time],
                     &[type=date] {
                         clip-path: inset(0 20px 0 0);
-                        opacity: 0;
-                        transition: opacity 200ms ease-in-out;
+
+                        &::-webkit-inner-spin-button,
+                        &::-webkit-clear-button {
+                            display: none;
+                            -webkit-appearance: none;
+                        }
+                        &::-webkit-calendar-picker-indicator {
+                            position: absolute;
+                            height: 100%;
+                            width: 100%;
+                            opacity: 0;
+                            cursor: pointer;
+                        }
                     }
                     &[type=number] {
                         -moz-appearance: textfield;
@@ -83,6 +104,15 @@
                     &:invalid {
                         box-shadow: none;
                     }
+                    &:-internal-autofill-selected {
+                        &,
+                        &:hover,
+                        &:focus,
+                        &:active,
+                        &:valid {
+                            box-shadow: 0 0 0 40px $color-bg-panel inset;
+                        }
+                    }
                 }
             }
         }
@@ -172,7 +202,8 @@
             }
             & > .control > * {
                 &[type=time],
-                &[type=date] {
+                &[type=date],
+                &[type=password] {
                     opacity: 1;
                 }
             }
diff --git a/front/core/components/input-time/index.js b/front/core/components/input-time/index.js
index 9c6ae0e4a..3dc01e0c7 100644
--- a/front/core/components/input-time/index.js
+++ b/front/core/components/input-time/index.js
@@ -25,7 +25,10 @@ export default class InputTime extends Field {
 
         if (value) {
             let split = value.split(':').map(i => parseInt(i) || null);
-            date = new Date(this.field || null);
+
+            date = this.field instanceof Date
+                ? this.field
+                : new Date(this.field || null);
             date.setHours(split[0], split[1], 0, 0);
         }
 
diff --git a/front/core/components/popover/popover.js b/front/core/components/popover/popover.js
index af6edb79a..39b44e206 100644
--- a/front/core/components/popover/popover.js
+++ b/front/core/components/popover/popover.js
@@ -109,6 +109,7 @@ export default class Popover extends Component {
             this.showTimeout = null;
             this.element.style.display = 'none';
             this.document.body.removeChild(this.element);
+            this.emit('close');
         }, 250);
 
         this.document.removeEventListener('keydown', this.docKeyDownHandler);
@@ -118,7 +119,7 @@ export default class Popover extends Component {
         this.bgMouseDownHandler = null;
 
         if (this.deregisterCallback) this.deregisterCallback();
-        this.emit('close');
+        this.emit('closeStart');
     }
 
     /**
diff --git a/front/core/components/searchbar/searchbar.js b/front/core/components/searchbar/searchbar.js
index 9384b712b..b2275af0d 100644
--- a/front/core/components/searchbar/searchbar.js
+++ b/front/core/components/searchbar/searchbar.js
@@ -69,7 +69,7 @@ export default class Controller extends Component {
 
         this.$panelScope = this.$.$new();
         this.$panel = this.$compile(`<${this.panel}/>`)(this.$panelScope);
-        let panel = this.$panel.isolateScope().$ctrl;
+        let panel = this.$panel[0].$ctrl;
         if (this.shownFilter)
             panel.filter = JSON.parse(JSON.stringify(this.shownFilter));
         panel.onSubmit = filter => this.onPanelSubmit(filter);
diff --git a/front/core/directives/focus.js b/front/core/directives/focus.js
index b57241078..55e7d3496 100644
--- a/front/core/directives/focus.js
+++ b/front/core/directives/focus.js
@@ -1,6 +1,11 @@
 import ngModule from '../module';
 
+const regex = /Android|webOS|iPhone|iPad|iPod|BlackBerry|Windows Phone/i;
+export const isMobile = regex.test(navigator.userAgent);
+
 export function focus(input) {
+    if (isMobile) return;
+
     const element = input;
     let selector = 'input, textarea, button, submit';
 
@@ -14,7 +19,6 @@ export function focus(input) {
             view: window
         });
         element.dispatchEvent(focusEvent);
-
         return;
     }
 
diff --git a/front/core/vendor.js b/front/core/vendor.js
index ac4364feb..bd368dac2 100644
--- a/front/core/vendor.js
+++ b/front/core/vendor.js
@@ -22,10 +22,3 @@ import 'material-design-lite/dist/material.orange-deep_orange.min.css';
 
 import * as validator from 'validator';
 export {validator};
-
-import Flatpickr from 'flatpickr';
-import 'flatpickr/dist/flatpickr.css';
-import 'flatpickr/dist/themes/material_orange.css';
-import l10ns from 'flatpickr/dist/l10n';
-Flatpickr.l10ns = l10ns;
-export {Flatpickr};
diff --git a/front/package-lock.json b/front/package-lock.json
index 15ac9e49c..31fc844b9 100644
--- a/front/package-lock.json
+++ b/front/package-lock.json
@@ -88,21 +88,6 @@
       "resolved": "https://registry.npmjs.org/flatpickr/-/flatpickr-4.5.2.tgz",
       "integrity": "sha512-jDy4QYGpmiy7+Qk8QvKJ4spjDdxcx9cxMydmq1x427HkKWBw0qizLYeYM2F6tMcvvqGjU5VpJS55j4LnsaBblA=="
     },
-    "fs-extra": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
-      "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      }
-    },
-    "graceful-fs": {
-      "version": "4.1.10",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.10.tgz",
-      "integrity": "sha1-8tcgwiCS90Mih3XHXjYSYyUB8TE="
-    },
     "js-yaml": {
       "version": "3.13.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
@@ -112,14 +97,6 @@
         "esprima": "^4.0.0"
       }
     },
-    "jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-      "requires": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
     "material-design-lite": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/material-design-lite/-/material-design-lite-1.3.0.tgz",
@@ -3229,11 +3206,6 @@
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
     },
-    "universalify": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
-      "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc="
-    },
     "validator": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/validator/-/validator-6.3.0.tgz",
diff --git a/front/package.json b/front/package.json
index bfd8edfc4..82798b28c 100644
--- a/front/package.json
+++ b/front/package.json
@@ -18,7 +18,6 @@
 		"angular-translate": "^2.18.1",
 		"angular-translate-loader-partial": "^2.18.1",
 		"flatpickr": "^4.5.2",
-		"fs-extra": "^5.0.0",
 		"js-yaml": "^3.13.1",
 		"material-design-lite": "^1.3.0",
 		"mg-crud": "^1.1.2",
diff --git a/modules/claim/front/basic-data/index.html b/modules/claim/front/basic-data/index.html
index 953441581..289f8f197 100644
--- a/modules/claim/front/basic-data/index.html
+++ b/modules/claim/front/basic-data/index.html
@@ -8,23 +8,18 @@
 <form name="form" ng-submit="$ctrl.onSubmit()" compact>
     <vn-card class="vn-pa-lg">
         <vn-horizontal>
-            <vn-autocomplete
+            <vn-textfield
                 vn-one
-                disabled="true"
-                ng-model="$ctrl.claim.clientFk"
-                url="/client/api/Clients"
-                show-field="name"
-                value-field="id"
                 label="Client"
-                order="id">
-            </vn-autocomplete>
-            <vn-date-picker
+                ng-model="$ctrl.claim.client.name"
+                readonly="true">
+            </vn-textfield>
+            <vn-textfield
                 vn-one
-                disabled="true"
                 label="Created" 
-                ng-model="$ctrl.claim.created"
-                options="{enableTime: true}">
-            </vn-date-picker>
+                field="::$ctrl.claim.created | dateTime:'yyyy-MM-dd hh:mm'"
+                readonly="true">
+            </vn-textfield>
         </vn-horizontal>
         <vn-horizontal>
             <vn-autocomplete 
diff --git a/modules/client/front/fiscal-data/index.html b/modules/client/front/fiscal-data/index.html
index 2c502e9d9..ccfc253e7 100644
--- a/modules/client/front/fiscal-data/index.html
+++ b/modules/client/front/fiscal-data/index.html
@@ -32,21 +32,26 @@
             </vn-textfield>
         </vn-horizontal>
         <vn-horizontal>
-            <vn-autocomplete vn-id="country"
+            <vn-autocomplete
                 vn-one
+                vn-id="country"
                 ng-model="$ctrl.client.countryFk"
                 url="/api/Countries"
                 show-field="country"
                 value-field="id"
-                label="Country">
+                label="Country"
+                rule>
             </vn-autocomplete>
-            <vn-autocomplete vn-id="province" vn-one
+            <vn-autocomplete
+                vn-one
+                vn-id="province"
                 ng-model="$ctrl.client.provinceFk"
                 url="/api/Provinces"
                 where="{countryFk: country.selection.id}"
                 show-field="name"
                 value-field="id"
-                label="Province">
+                label="Province"
+                rule>
             </vn-autocomplete>
         </vn-horizontal>
         <vn-horizontal>
diff --git a/modules/order/front/filter/index.js b/modules/order/front/filter/index.js
index 4305f2506..780bf798b 100644
--- a/modules/order/front/filter/index.js
+++ b/modules/order/front/filter/index.js
@@ -151,7 +151,7 @@ class Controller {
 
         this.$panelScope = this.$scope.$new();
         this.$panel = this.$compile(`<vn-order-catalog-search-panel/>`)(this.$panelScope);
-        const panel = this.$panel.isolateScope().$ctrl;
+        const panel = this.$panel[0].$ctrl;
         panel.filter = this.filter;
         panel.onSubmit = filter => this.onPanelSubmit(filter);
 
diff --git a/modules/ticket/front/basic-data/step-one/index.html b/modules/ticket/front/basic-data/step-one/index.html
index f545e7131..95cbcccf6 100644
--- a/modules/ticket/front/basic-data/step-one/index.html
+++ b/modules/ticket/front/basic-data/step-one/index.html
@@ -26,9 +26,12 @@
                 value-field="id" 
                 ng-model="$ctrl.addressId"
                 order="isActive DESC">
-                <tpl-item ng-class="::{notActive: isActive === false}">
-                    <span class="inactive" translate>{{::isActive ? '' : 'INACTIVE'}}</span> {{::nickname}} 
-                    <span ng-show="city || province || street">- {{::street}} - {{::city}} - {{::province.name}} - {{::agencyMode.name}}</span>
+                <tpl-item class="address" ng-class="::{inactive: !isActive}">
+                    <span class="inactive" translate>{{::!isActive ? '(Inactive)' : ''}}</span>
+                    {{::nickname}}
+                    <span ng-show="city || province || street">
+                        , {{::street}}, {{::city}}, {{::province.name}} - {{::agencyMode.name}}
+                    </span>
                 </tpl-item>
             </vn-autocomplete>
             <vn-autocomplete vn-one
@@ -43,15 +46,22 @@
             <vn-date-picker
                 vn-one
                 label="Shipped" 
-                ng-model="$ctrl.shipped"
-                options="{enableTime: true}">
+                ng-model="$ctrl.shipped">
             </vn-date-picker>
+            <vn-input-time
+                vn-one
+                label="Shipped hour" 
+                ng-model="$ctrl.shipped">
+            </vn-input-time>
             <vn-date-picker
                 vn-one
                 label="Landed" 
                 ng-model="$ctrl.landed">
             </vn-date-picker>
-            <vn-autocomplete vn-one
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-autocomplete
+                vn-one
                 url="/api/Companies"
                 label="Company"
                 show-field="code"
@@ -59,16 +69,16 @@
                 ng-model="$ctrl.ticket.companyFk"
                 initial-data="$ctrl.ticket.companyFk">
             </vn-autocomplete>
-        </vn-horizontal>
-        <vn-horizontal>
-            <vn-autocomplete vn-one
+            <vn-autocomplete
+                vn-one
                 url="/api/AgencyModes/isActive"
                 label="Agency"
                 show-field="name"
                 value-field="id"
                 ng-model="$ctrl.agencyModeId">
             </vn-autocomplete>
-            <vn-autocomplete vn-one
+            <vn-autocomplete
+                vn-one
                 data="zones"
                 label="Zone"
                 show-field="name"
diff --git a/modules/ticket/front/basic-data/step-one/style.scss b/modules/ticket/front/basic-data/step-one/style.scss
index fff383a52..756d662fd 100644
--- a/modules/ticket/front/basic-data/step-one/style.scss
+++ b/modules/ticket/front/basic-data/step-one/style.scss
@@ -1,13 +1,8 @@
 @import "variables";
 
-tpl-item{ 
-    &.notActive {
-        background-color: $color-bg;
+.vn-popover {
+    .address.inactive {
         color: $color-font-secondary;
         width: 100%;
     }
-
-    & > .inactive {
-        text-transform: uppercase;
-    }
 }
diff --git a/webpack.config.js b/webpack.config.js
index 227c0ada2..79ea19e50 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -107,8 +107,8 @@ let baseConfig = {
     ],
     devtool: 'source-map',
     stats: {
-        modules: false,
         assets: false,
+        modules: false,
         children: false,
         entrypoints: false,
         colors: true

From c33906ca103b843864c7ba0ec5150a2f1f61cdef Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Tue, 15 Oct 2019 08:50:11 +0200
Subject: [PATCH 08/41] descuadre de horas #1766 rollback

---
 .../worker/back/methods/worker-time-control/addTime.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/worker/back/methods/worker-time-control/addTime.js b/modules/worker/back/methods/worker-time-control/addTime.js
index 9864142bf..5548654bc 100644
--- a/modules/worker/back/methods/worker-time-control/addTime.js
+++ b/modules/worker/back/methods/worker-time-control/addTime.js
@@ -33,7 +33,13 @@ module.exports = Self => {
 
         const subordinate = await Worker.findById(data.workerFk);
 
-        return Self.rawSql('CALL vn.workerTimeControl_add(?, ?, ?, ?)', [
-            subordinate.userFk, null, data.timed, true]);
+        return Self.create({
+            userFk: subordinate.userFk,
+            timed: data.timed,
+            manual: 1
+        });
+
+        /* return Self.rawSql('CALL vn.workerTimeControl_add(?, ?, ?, ?)', [
+            subordinate.userFk, null, data.timed, true]); */
     };
 };

From b37e308a4b4b5e2ed32f7816bbe265e260526687 Mon Sep 17 00:00:00 2001
From: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
Date: Wed, 16 Oct 2019 08:01:34 +0200
Subject: [PATCH 09/41] #1811 send.js unit test

---
 modules/client/back/methods/sms/send.spec.js | 74 ++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 modules/client/back/methods/sms/send.spec.js

diff --git a/modules/client/back/methods/sms/send.spec.js b/modules/client/back/methods/sms/send.spec.js
new file mode 100644
index 000000000..19dd8589f
--- /dev/null
+++ b/modules/client/back/methods/sms/send.spec.js
@@ -0,0 +1,74 @@
+const app = require('vn-loopback/server/server');
+const soap = require('soap');
+
+describe('sms send()', () => {
+    it('should return the expected message and status code', async() => {
+        const code = 200;
+        const smsConfig = await app.models.SmsConfig.findOne();
+        const soapClient = await soap.createClientAsync(smsConfig.uri);
+        spyOn(soap, 'createClientAsync').and.returnValue(soapClient);
+        spyOn(soapClient, 'sendSMSAsync').and.returnValue([{
+            result: {
+                $value:
+                       `<xtratelecom-sms-response>
+                            <sms>
+                                <codigo>
+                                    ${code}
+                                </codigo>
+                                <descripcion>
+                                    Envio en procesamiento
+                                </descripcion>
+                                <messageId>
+                                    1
+                                </messageId>
+                            </sms>
+                            <procesoId>
+                                444328681
+                            </procesoId>
+                        </xtratelecom-sms-response>`
+            }
+        }]);
+        let ctx = {req: {accessToken: {userId: 1}}};
+        let result = await app.models.Sms.send(ctx, 105, 'destination', 'My SMS Body');
+
+        expect(result.statusCode).toEqual(200);
+        expect(result.status).toContain('Envio en procesamiento');
+    });
+
+    it(`should throw if the response code isn't 200`, async() => {
+        let error;
+        const code = 400;
+        const smsConfig = await app.models.SmsConfig.findOne();
+        const soapClient = await soap.createClientAsync(smsConfig.uri);
+        spyOn(soap, 'createClientAsync').and.returnValue(soapClient);
+        spyOn(soapClient, 'sendSMSAsync').and.returnValue([{
+            result: {
+                $value:
+                       `<xtratelecom-sms-response>
+                            <sms>
+                                <codigo>
+                                    ${code}
+                                </codigo>
+                                <descripcion>
+                                    Envio en procesamiento
+                                </descripcion>
+                                <messageId>
+                                    1
+                                </messageId>
+                            </sms>
+                            <procesoId>
+                                444328681
+                            </procesoId>
+                        </xtratelecom-sms-response>`
+            }
+        }]);
+        let ctx = {req: {accessToken: {userId: 1}}};
+        try {
+            await app.models.Sms.send(ctx, 105, 'destination', 'My SMS Body');
+        } catch (err) {
+            error = err;
+        }
+
+        expect(error.message).toEqual(`We weren't able to send this SMS`);
+    });
+});

From 061e978a26b8fc448890eb32cb0cc27bde72f9dd Mon Sep 17 00:00:00 2001
From: Bernat <bernat.verdnatura@gmail.com>
Date: Wed, 16 Oct 2019 08:08:10 +0200
Subject: [PATCH 10/41] =?UTF-8?q?#1758=20=20A=C3=B1adir=20los=20alias=20co?=
 =?UTF-8?q?mo=20prefijos=20en=20los=20filtros?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/invoiceOut/back/methods/invoiceOut/filter.js | 1 +
 modules/route/back/methods/route/filter.js           | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/invoiceOut/back/methods/invoiceOut/filter.js b/modules/invoiceOut/back/methods/invoiceOut/filter.js
index a0da914f8..8b6d00763 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/filter.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/filter.js
@@ -92,6 +92,7 @@ module.exports = Self => {
             case 'companyFk':
             case 'issued':
             case 'dued':
+                param = `i.${param}`;
                 return {[param]: value};
             }
         });
diff --git a/modules/route/back/methods/route/filter.js b/modules/route/back/methods/route/filter.js
index 1ea962bed..eeeef1dac 100644
--- a/modules/route/back/methods/route/filter.js
+++ b/modules/route/back/methods/route/filter.js
@@ -85,10 +85,13 @@ module.exports = Self => {
                 return {'r.m3': value};
             case 'description':
                 return {'r.description': {like: `%${value}%`}};
-            case 'workerFk':
             case 'warehouseFk':
+                param = `v.${param}`;
+                return {[param]: value};
+            case 'workerFk':
             case 'vehicleFk':
             case 'agencyModeFk':
+                param = `r.${param}`;
                 return {[param]: value};
             }
         });

From 7aaa8f4a5e3d83a8cd84929f78a347b04083bfe1 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Wed, 16 Oct 2019 08:56:13 +0200
Subject: [PATCH 11/41] refactor drag & drop treeview

---
 front/core/components/treeview/child.html     |  20 +++
 .../treeview/{content.js => child.js}         |  30 +++-
 front/core/components/treeview/childs.html    |  33 +----
 front/core/components/treeview/index.js       | 129 ++++++++++++++++--
 front/core/components/treeview/style.scss     |  41 +++---
 front/core/directives/draggable.js            |  43 ------
 front/core/directives/droppable.js            |  93 +++++--------
 front/core/directives/droppable.scss          |  18 ++-
 front/core/directives/index.js                |   1 -
 front/core/lib/event-emitter.js               |  15 +-
 loopback/locale/es.json                       |   4 +-
 modules/claim/front/dms/index/index.html      |   2 +-
 modules/claim/front/dms/index/index.js        |   5 +-
 .../back/methods/department/moveChild.js      |  42 ++++++
 modules/worker/back/models/department.js      |   1 +
 modules/worker/back/models/department.json    |   9 ++
 modules/worker/front/department/index.html    |   5 +-
 modules/worker/front/department/index.js      |  29 ++--
 18 files changed, 331 insertions(+), 189 deletions(-)
 create mode 100644 front/core/components/treeview/child.html
 rename front/core/components/treeview/{content.js => child.js} (51%)
 delete mode 100644 front/core/directives/draggable.js
 create mode 100644 modules/worker/back/methods/department/moveChild.js

diff --git a/front/core/components/treeview/child.html b/front/core/components/treeview/child.html
new file mode 100644
index 000000000..1b928d5ea
--- /dev/null
+++ b/front/core/components/treeview/child.html
@@ -0,0 +1,20 @@
+<div class="node clickable">
+    <vn-icon
+        class="arrow"
+        ng-class="{invisible: !$ctrl.item.sons}"
+        icon="keyboard_arrow_down"
+        translate-attr="::{title: 'Toggle'}">
+    </vn-icon>
+    <section class="content"></section>
+    <section class="buttons" ng-if="::!$ctrl.treeview.readOnly">
+        <vn-icon-button translate-attr="::{title: 'Remove'}"
+            icon="delete"
+            ng-click="$ctrl.treeview.onRemove($ctrl.item)"
+            ng-if="$ctrl.item.parent">
+        </vn-icon-button>
+        <vn-icon-button translate-attr="::{title: 'Create'}"
+            icon="add_circle"
+            ng-click="$ctrl.treeview.onCreate($ctrl.item)">
+        </vn-icon-button>
+    </section>
+</div>
diff --git a/front/core/components/treeview/content.js b/front/core/components/treeview/child.js
similarity index 51%
rename from front/core/components/treeview/content.js
rename to front/core/components/treeview/child.js
index 506117d4f..9e4edef35 100644
--- a/front/core/components/treeview/content.js
+++ b/front/core/components/treeview/child.js
@@ -2,22 +2,33 @@ import ngModule from '../../module';
 
 class Controller {
     constructor($element, $scope, $compile) {
-        this.$element = $element;
         this.$scope = $scope;
         this.$compile = $compile;
+        this.element = $element[0];
+
+        this.element.$ctrl = this;
+        this.element.droppable = true;
+        this.dropCount = 0;
+        this.element.classList.add('vn-droppable');
     }
 
     $onInit() {
+        const transcludeElement = this.element.querySelector('.content');
+        const content = angular.element(transcludeElement);
+
         if (this.item.parent) {
             this.treeview.$transclude(($clone, $scope) => {
                 this.$contentScope = $scope;
                 $scope.item = this.item;
-                this.$element.append($clone);
+                content.append($clone);
             });
+
+            this.element.draggable = true;
+            this.element.classList.add('vn-draggable');
         } else {
             let template = `<span translate>{{$ctrl.treeview.rootLabel}}</span>`;
             let $clone = this.$compile(template)(this.$scope);
-            this.$element.append($clone);
+            content.append($clone);
         }
     }
 
@@ -25,10 +36,21 @@ class Controller {
         if (this.$contentScope)
             this.$contentScope.$destroy();
     }
+
+    dragEnter() {
+        this.dropCount++;
+
+        if (element != this.dropping) {
+            this.undrop();
+            if (element) element.classList.add('dropping');
+            this.dropping = element;
+        }
+    }
 }
 Controller.$inject = ['$element', '$scope', '$compile'];
 
-ngModule.component('vnTreeviewContent', {
+ngModule.component('vnTreeviewChild', {
+    template: require('./child.html'),
     controller: Controller,
     bindings: {
         item: '<'
diff --git a/front/core/components/treeview/childs.html b/front/core/components/treeview/childs.html
index 2dd7e77ef..de69ffb89 100644
--- a/front/core/components/treeview/childs.html
+++ b/front/core/components/treeview/childs.html
@@ -1,34 +1,11 @@
 
 <ul ng-if="$ctrl.items">
-    <li ng-repeat="item in $ctrl.items" >
-        <div
-            ng-class="{expanded: item.active}"
-            ng-click="$ctrl.onClick($event, item)"
-            class="node clickable">
-            <vn-icon
-                class="arrow"
-                ng-class="{invisible: !item.sons}"
-                icon="keyboard_arrow_down"
-                translate-attr="::{title: 'Toggle'}">
-            </vn-icon>
-            <vn-treeview-content
-                item="::item">
-            </vn-treeview-content>
-            <section class="buttons" ng-if="::!$ctrl.treeview.readOnly">
-                <vn-icon-button translate-attr="::{title: 'Remove'}"
-                    icon="delete"
-                    ng-click="$ctrl.treeview.onRemove(item)"
-                    ng-if="item.parent">
-                </vn-icon-button>
-                <vn-icon-button translate-attr="::{title: 'Create'}"
-                    icon="add_circle"
-                    ng-click="$ctrl.treeview.onCreate(item)">
-                </vn-icon-button>
-            </section>
-        </div>
+    <li ng-repeat="item in $ctrl.items">
+        <vn-treeview-child item="item" ng-class="{expanded: item.active}"
+            ng-click="$ctrl.onClick($event, item)">
+        </vn-treeview-child>
         <vn-treeview-childs
-            items="item.childs"
-            parent="::item">
+            items="item.childs">
         </vn-treeview-childs>
     </li>
 </ul>
\ No newline at end of file
diff --git a/front/core/components/treeview/index.js b/front/core/components/treeview/index.js
index d9da39215..22d6739f7 100644
--- a/front/core/components/treeview/index.js
+++ b/front/core/components/treeview/index.js
@@ -1,18 +1,113 @@
 import ngModule from '../../module';
 import Component from '../../lib/component';
 import './style.scss';
-
 import './childs';
-import './content';
+import './child';
 
 /**
  * Treeview
  */
 export default class Treeview extends Component {
-    constructor($element, $scope, $transclude) {
+    constructor($element, $scope, $transclude, $window) {
         super($element, $scope);
         this.$transclude = $transclude;
+        this.$window = $window;
         this.readOnly = true;
+
+        this.element.addEventListener('dragstart',
+            event => this.dragStart(event));
+        this.element.addEventListener('dragend',
+            event => this.dragEnd(event));
+
+        this.element.addEventListener('dragover',
+            event => this.dragOver(event));
+        this.element.addEventListener('drop',
+            event => this.drop(event));
+        this.element.addEventListener('dragenter',
+            event => this.dragEnter(event));
+        this.element.addEventListener('dragleave',
+            event => this.dragLeave(event));
+
+        this.dropCount = 0;
+    }
+
+    undrop() {
+        if (!this.dropping) return;
+        this.dropping.classList.remove('dropping');
+        this.dropping = null;
+    }
+
+    findDroppable(event) {
+        let element = event.target;
+        while (element != this.element && !element.droppable)
+            element = element.parentNode;
+        if (element == this.element)
+            return null;
+        return element;
+    }
+
+    dragOver(event) {
+        let scrollY = this.$window.scrollY;
+
+        if (event.clientY < this.draggingY)
+            scrollY -= 2;
+        else scrollY += 2;
+
+        this.draggingY = event.clientY;
+        this.$window.scrollTo(0, scrollY);
+
+        // Prevents page reload
+        event.preventDefault();
+    }
+
+    dragStart(event) {
+        event.target.classList.add('dragging');
+        event.dataTransfer.setData('text', event.target.id);
+
+        const element = this.findDroppable(event);
+        this.dragging = element;
+    }
+
+    dragEnd(event) {
+        event.target.classList.remove('dragging');
+        this.undrop();
+        this.dropCount = 0;
+        this.dragging = null;
+    }
+
+    dragEnter(event) {
+        let element = this.findDroppable(event);
+        if (element) this.dropCount++;
+
+        if (element != this.dropping) {
+            this.undrop();
+            if (element) element.classList.add('dropping');
+            this.dropping = element;
+        }
+    }
+
+    dragLeave(event) {
+        let element = this.findDroppable(event);
+
+        if (element) {
+            this.dropCount--;
+            if (this.dropCount == 0) this.undrop();
+        }
+    }
+
+    drop(event) {
+        event.preventDefault();
+        this.element.classList.remove('dropping');
+
+        const $dropped = this.dropping.$ctrl.item;
+        const $dragged = this.dragging.$ctrl.item;
+
+        if (!$dropped.active && $dropped.sons) {
+            this.unfold($dropped).then(() => {
+                this.emit('drop', {$dropped, $dragged});
+            });
+        } else
+            this.emit('drop', {$dropped, $dragged});
     }
 
     get data() {
@@ -100,8 +195,14 @@ export default class Treeview extends Component {
     }
 
     onCreate(parent) {
-        if (this.createFunc)
-            this.createFunc({$parent: parent});
+        if (this.createFunc) {
+            if (!parent.active && parent.sons) {
+                this.unfold(parent).then(() => {
+                    this.createFunc({$parent: parent});
+                });
+            } else
+                this.createFunc({$parent: parent});
+        }
     }
 
     create(item) {
@@ -120,12 +221,24 @@ export default class Treeview extends Component {
         if (parent) parent.sons++;
     }
 
-    onDrop(item, dragged, dropped) {
-        this.emit('drop', {item, dragged, dropped});
+    move(item, newParent) {
+        if (newParent == item) return;
+
+        if (item.parent) {
+            const parent = item.parent;
+            const childs = parent.childs;
+            const index = childs.indexOf(item);
+            parent.sons--;
+
+            childs.splice(index, 1);
+        }
+
+        item.parent = newParent;
+        this.create(item);
     }
 }
 
-Treeview.$inject = ['$element', '$scope', '$transclude'];
+Treeview.$inject = ['$element', '$scope', '$transclude', '$window'];
 
 ngModule.component('vnTreeview', {
     template: require('./index.html'),
diff --git a/front/core/components/treeview/style.scss b/front/core/components/treeview/style.scss
index b3724a9f1..e39d1708d 100644
--- a/front/core/components/treeview/style.scss
+++ b/front/core/components/treeview/style.scss
@@ -10,22 +10,6 @@ vn-treeview-childs {
         li {
             list-style: none;
 
-            & > .node {
-                @extend %clickable;
-                display: flex;
-                padding: 5px;
-                align-items: center;
-            }
-
-            & > div > .arrow {
-                min-width: 24px;
-                margin-right: 10px;
-                transition: transform 200ms;
-            }
-
-            & > div.expanded > .arrow {
-                transform: rotate(180deg);
-            }
             ul {
                 padding-left: 2.2em;
             }
@@ -45,8 +29,27 @@ vn-treeview-childs {
     .node:hover > .buttons {
         display: block
     }
+
+    .content {
+        flex-grow: 1
+    }
 }
 
-vn-treeview-content {
-    flex-grow: 1
-}
\ No newline at end of file
+vn-treeview-child {
+    display: block;
+
+    .node {
+        @extend %clickable;
+        display: flex;
+        padding: 5px;
+        align-items: center;
+    }
+    & > div > .arrow {
+        min-width: 24px;
+        margin-right: 10px;
+        transition: transform 200ms;
+    }
+    &.expanded > div > .arrow {
+        transform: rotate(180deg);
+    }
+} 
\ No newline at end of file
diff --git a/front/core/directives/draggable.js b/front/core/directives/draggable.js
deleted file mode 100644
index 3b68a6cb6..000000000
--- a/front/core/directives/draggable.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import ngModule from '../module';
-
-/**
- * Enables a draggable element and his drag events
- *
- * @return {Object} The directive
- */
-export function directive() {
-    return {
-        restrict: 'A',
-        link: function($scope, $element, $attrs) {
-            const element = $element[0];
-            const isDraggable = $attrs.vnDraggable === 'true';
-
-            if (!isDraggable) return;
-
-            // Set draggable style properties
-            element.style.cursor = 'move';
-
-
-            // Enable as draggable element
-            element.setAttribute('draggable', true);
-
-            /**
-             * Fires when a drag event starts
-             */
-            element.addEventListener('dragstart', event => {
-                element.style.opacity = 0.5;
-                event.stopPropagation();
-            });
-
-            /**
-             * Fires when a drag event ends
-             */
-            element.addEventListener('dragend', event => {
-                element.style.opacity = 1;
-                event.stopPropagation();
-            });
-        }
-    };
-}
-
-ngModule.directive('vnDraggable', directive);
diff --git a/front/core/directives/droppable.js b/front/core/directives/droppable.js
index 483282418..929b64be7 100644
--- a/front/core/directives/droppable.js
+++ b/front/core/directives/droppable.js
@@ -1,68 +1,43 @@
 import ngModule from '../module';
 import './droppable.scss';
 
-export function directive($parse) {
-    return {
-        restrict: 'A',
-        link: function($scope, $element, $attrs) {
-            const element = $element[0];
-            const onDropEvent = $parse($attrs.onDrop);
-            const isDroppable = $attrs.vnDroppable === 'true';
+class Controller {
+    constructor($element, $, $attrs) {
+        this.element = $element[0];
+        this.$ = $;
+        this.$attrs = $attrs;
 
-            if (!isDroppable) return;
+        this.element.addEventListener('dragover',
+            event => event.preventDefault()); // Prevents page reload
+        this.element.addEventListener('drop',
+            event => this.drop(event));
+        this.element.addEventListener('dragenter',
+            event => this.dragEnter(event));
+        this.element.addEventListener('dragleave',
+            event => this.dragLeave(event));
+    }
 
-            /**
-             * Captures current dragging element
-             */
-            element.addEventListener('dragstart', () => {
-                this.dragged = element;
-            });
+    dragEnter(event) {
+        this.droppedElement = event.target;
+        this.element.classList.add('dropping');
+    }
 
-            /**
-             * Enter droppable area event
-             */
-            element.addEventListener('dragenter', event => {
-                element.classList.add('active');
+    dragLeave(event) {
+        if (this.droppedElement === event.target)
+            this.element.classList.remove('dropping');
+    }
 
-                event.stopImmediatePropagation();
-                event.preventDefault();
-            }, false);
-
-
-            /**
-             * Exit droppable area event
-             */
-            element.addEventListener('dragleave', event => {
-                element.classList.remove('active');
-
-                event.stopImmediatePropagation();
-                event.preventDefault();
-            });
-
-            /**
-             * Prevent dragover for allowing
-             * dispatch drop event
-             */
-            element.addEventListener('dragover', event => {
-                event.stopPropagation();
-                event.preventDefault();
-            });
-
-            /**
-             * Fires when a drop events
-             */
-            element.addEventListener('drop', event => {
-                element.classList.remove('active');
-
-                onDropEvent($scope, {event});
-
-                event.stopPropagation();
-                event.preventDefault();
-            });
-        }
-    };
+    drop(event) {
+        if (event.defaultPrevented) return;
+        event.preventDefault();
+        this.element.classList.remove('dropping');
+        this.$.$eval(this.$attrs.vnDroppable, {$event: event});
+    }
 }
+Controller.$inject = ['$element', '$scope', '$attrs'];
 
-directive.$inject = ['$parse'];
-
-ngModule.directive('vnDroppable', directive);
+ngModule.directive('vnDroppable', () => {
+    return {
+        controller: Controller
+    };
+});
diff --git a/front/core/directives/droppable.scss b/front/core/directives/droppable.scss
index 749bc9a12..97e6f8a19 100644
--- a/front/core/directives/droppable.scss
+++ b/front/core/directives/droppable.scss
@@ -1,11 +1,25 @@
 @import "./variables";
 
+
+.vn-droppable,
+.vn-draggable,
 [vn-droppable] {
     border: 2px dashed transparent;
+    border-radius: 0.5em;
     transition: all 0.5s;
+}
 
-    &.active {
+.vn-droppable,
+[vn-droppable] {
+    display: block;
+
+    &.dropping {
         background-color: $color-hover-cd;
-        border: 2px dashed $color-bg-dark;
+        border-color: $color-bg-dark;
     }
+}
+
+.vn-draggable.dragging {
+    background-color: $color-main-light;
+    border-color: $color-main;
 }
\ No newline at end of file
diff --git a/front/core/directives/index.js b/front/core/directives/index.js
index 08adfac07..7ee63220b 100644
--- a/front/core/directives/index.js
+++ b/front/core/directives/index.js
@@ -11,7 +11,6 @@ import './bind';
 import './repeat-last';
 import './title';
 import './uvc';
-import './draggable';
 import './droppable';
 import './http-click';
 import './http-submit';
diff --git a/front/core/lib/event-emitter.js b/front/core/lib/event-emitter.js
index 2dede42ab..022e4e98c 100644
--- a/front/core/lib/event-emitter.js
+++ b/front/core/lib/event-emitter.js
@@ -24,10 +24,12 @@ export default class EventEmitter {
      */
     off(callback) {
         if (!this.$events) return;
-        for (let event in this.$events)
-            for (let i = 0; i < event.length; i++)
+        for (let event in this.$events) {
+            for (let i = 0; i < event.length; i++) {
                 if (event[i].callback === callback)
                     event.splice(i--, 1);
+            }
+        }
     }
 
     /**
@@ -37,10 +39,12 @@ export default class EventEmitter {
      */
     disconnect(thisArg) {
         if (!this.$events) return;
-        for (let event in this.$events)
-            for (let i = 0; i < event.length; i++)
+        for (let event in this.$events) {
+            for (let i = 0; i < event.length; i++) {
                 if (event[i].thisArg === thisArg)
                     event.splice(i--, 1);
+            }
+        }
     }
 
     /**
@@ -72,9 +76,10 @@ export default class EventEmitter {
             if (this[prop])
                 this[prop].disconnect(this);
             this[prop] = value;
-            if (value)
+            if (value) {
                 for (let event in handlers)
                     value.on(event, handlers[event], this);
+            }
         }
     }
 }
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 07c95af32..aa135d520 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -108,5 +108,7 @@
 	"This postal code is not valid": "This postal code is not valid",
 	"is invalid": "is invalid",
 	"The postcode doesn't exists. Ensure you put the correct format": "El código postal no existe. Asegúrate de ponerlo con el formato correcto",
-	"The department name can't be repeated": "El nombre del departamento no puede repetirse"
+	"The department name can't be repeated": "El nombre del departamento no puede repetirse",
+	"You cannot move a parent to any of its sons": "You cannot move a parent to any of its sons",
+	"You cannot move a parent to its own sons": "You cannot move a parent to its own sons"
 }
\ No newline at end of file
diff --git a/modules/claim/front/dms/index/index.html b/modules/claim/front/dms/index/index.html
index 10e35e58e..81bd088a7 100644
--- a/modules/claim/front/dms/index/index.html
+++ b/modules/claim/front/dms/index/index.html
@@ -5,7 +5,7 @@
     data="$ctrl.photos">
 </vn-crud-model>
 
-<section class="drop-zone" vn-droppable="true" on-drop="$ctrl.onDrop(event)">
+<section class="drop-zone" vn-droppable="$ctrl.onDrop($event)">
     <section><vn-icon icon="add_circle"></vn-icon></section>
     <section translate>Drag & Drop files here...</section>
 </section>
diff --git a/modules/claim/front/dms/index/index.js b/modules/claim/front/dms/index/index.js
index f60feab6c..f382e4d67 100644
--- a/modules/claim/front/dms/index/index.js
+++ b/modules/claim/front/dms/index/index.js
@@ -35,8 +35,9 @@ class Controller {
         }
     }
 
-    onDrop(event) {
-        const files = event.dataTransfer.files;
+    onDrop($event) {
+        console.log($event);
+        const files = $event.dataTransfer.files;
         this.setDefaultParams().then(() => {
             this.dms.files = files;
             this.create();
diff --git a/modules/worker/back/methods/department/moveChild.js b/modules/worker/back/methods/department/moveChild.js
new file mode 100644
index 000000000..97206f198
--- /dev/null
+++ b/modules/worker/back/methods/department/moveChild.js
@@ -0,0 +1,42 @@
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    Self.remoteMethod('moveChild', {
+        description: 'Changes the parent of a child department',
+        accessType: 'WRITE',
+        accepts: [{
+            arg: 'id',
+            type: 'Number',
+            description: 'The department id',
+            http: {source: 'path'}
+        }, {
+            arg: 'parentId',
+            type: 'Number',
+            description: 'New parent id',
+        }],
+        returns: {
+            type: 'Object',
+            root: true
+        },
+        http: {
+            path: `/:id/moveChild`,
+            verb: 'POST'
+        }
+    });
+
+    Self.moveChild = async(id, parentId = null) => {
+        const models = Self.app.models;
+        const child = await models.Department.findById(id);
+
+        if (id == parentId) return;
+
+        if (parentId) {
+            const parent = await models.Department.findById(parentId);
+
+            if (child.lft < parent.lft && child.rgt > parent.rgt)
+                throw new UserError('You cannot move a parent to its own sons');
+        }
+
+        return child.updateAttribute('parentFk', parentId);
+    };
+};
diff --git a/modules/worker/back/models/department.js b/modules/worker/back/models/department.js
index e6905d273..5a927fc64 100644
--- a/modules/worker/back/models/department.js
+++ b/modules/worker/back/models/department.js
@@ -2,4 +2,5 @@ module.exports = Self => {
     require('../methods/department/getLeaves')(Self);
     require('../methods/department/createChild')(Self);
     require('../methods/department/removeChild')(Self);
+    require('../methods/department/moveChild')(Self);
 };
diff --git a/modules/worker/back/models/department.json b/modules/worker/back/models/department.json
index bb5d5e943..7de76e039 100644
--- a/modules/worker/back/models/department.json
+++ b/modules/worker/back/models/department.json
@@ -16,6 +16,15 @@
         },
         "parentFk": {
             "type": "Number"
+        },
+        "lft": {
+            "type": "Number"
+        },
+        "rgt": {
+            "type": "Number"
+        },
+        "sons": {
+            "type": "Number"
         }
     }
 }
diff --git a/modules/worker/front/department/index.html b/modules/worker/front/department/index.html
index 773662032..c7abaf3f8 100644
--- a/modules/worker/front/department/index.html
+++ b/modules/worker/front/department/index.html
@@ -10,7 +10,10 @@
                 fetch-func="$ctrl.onFetch($item)"
                 remove-func="$ctrl.onRemove($item)"
                 create-func="$ctrl.onCreate($parent)"
-                sort-func="$ctrl.onSort($a, $b)">
+                sort-func="$ctrl.onSort($a, $b)"
+                on-drop="$ctrl.onDrop($dropped, $dragged)"
+                on-drag-start="$ctrl.onDragStart(item)"
+                on-drag-end="$ctrl.onDragEnd(item)">
                 {{::item.name}}
             </vn-treeview>
         </vn-card>
diff --git a/modules/worker/front/department/index.js b/modules/worker/front/department/index.js
index 1a72681bc..b103efff9 100644
--- a/modules/worker/front/department/index.js
+++ b/modules/worker/front/department/index.js
@@ -23,19 +23,21 @@ class Controller {
         return a.name.localeCompare(b.name);
     }
 
-    /* onDrop(item, dragged, dropped) {
-        if (dropped.scope.item) {
-            const droppedItem = dropped.scope.item;
-            const draggedItem = dragged.scope.item;
+    onDrop(dropped, dragged) {
+        if (!dropped.active) {
+            this.$.treeview.unfold(dropped).then(() =>
+                this.move(dropped, dragged));
+        } else
+            this.move(dropped, dragged);
+    }
 
-            if (droppedItem.childs)
-                droppedItem.childs.push(Object.assign({}, draggedItem));
-
-            dragged.element.remove();
-
-            this.$scope.$apply();
-        }
-    } */
+    move(dropped, dragged) {
+        const params = dropped ? {parentId: dropped.id} : null;
+        const query = `/api/departments/${dragged.id}/moveChild`;
+        this.$http.post(query, params).then(() => {
+            this.$.treeview.move(dragged, dropped);
+        });
+    }
 
     onCreate(parent) {
         this.newChild = {
@@ -62,9 +64,6 @@ class Controller {
                 if (parent && parent.id)
                     params.parentId = parent.id;
 
-                if (!parent.active)
-                    this.$.treeview.unfold(parent);
-
                 const query = `/api/departments/createChild`;
                 this.$http.post(query, params).then(res => {
                     const parent = this.newChild.parent;

From 6d159c50a082076248460ceabb78a9d52c19de27 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Wed, 16 Oct 2019 09:52:46 +0200
Subject: [PATCH 12/41] css fixes

---
 front/core/components/treeview/index.js   | 47 +++++++++++------------
 front/core/components/treeview/style.scss |  1 +
 modules/agency/front/location/style.scss  |  6 +--
 modules/worker/front/department/index.js  |  9 -----
 4 files changed, 27 insertions(+), 36 deletions(-)

diff --git a/front/core/components/treeview/index.js b/front/core/components/treeview/index.js
index 22d6739f7..9ecbf52e6 100644
--- a/front/core/components/treeview/index.js
+++ b/front/core/components/treeview/index.js
@@ -47,25 +47,25 @@ export default class Treeview extends Component {
     }
 
     dragOver(event) {
-        let scrollY = this.$window.scrollY;
-
-        if (event.clientY < this.draggingY)
-            scrollY -= 2;
-        else scrollY += 2;
-
-        this.draggingY = event.clientY;
-        this.$window.scrollTo(0, scrollY);
+        this.dragClientY = event.clientY;
 
         // Prevents page reload
         event.preventDefault();
     }
 
+    onDragInterval() {
+        if (this.dragClientY > 0 && this.dragClientY < 75)
+            this.$window.scrollTo(0, this.$window.scrollY - 25);
+    }
+
     dragStart(event) {
         event.target.classList.add('dragging');
         event.dataTransfer.setData('text', event.target.id);
 
         const element = this.findDroppable(event);
         this.dragging = element;
+
+        this.interval = setInterval(() => this.onDragInterval(), 100);
     }
 
     dragEnd(event) {
@@ -73,6 +73,7 @@ export default class Treeview extends Component {
         this.undrop();
         this.dropCount = 0;
         this.dragging = null;
+        clearInterval(this.interval);
     }
 
     dragEnter(event) {
@@ -102,12 +103,7 @@ export default class Treeview extends Component {
         const $dropped = this.dropping.$ctrl.item;
         const $dragged = this.dragging.$ctrl.item;
 
-        if (!$dropped.active && $dropped.sons) {
-            this.unfold($dropped).then(() => {
-                this.emit('drop', {$dropped, $dragged});
-            });
-        } else
-            this.emit('drop', {$dropped, $dragged});
+        this.emit('drop', {$dropped, $dragged});
     }
 
     get data() {
@@ -195,14 +191,8 @@ export default class Treeview extends Component {
     }
 
     onCreate(parent) {
-        if (this.createFunc) {
-            if (!parent.active && parent.sons) {
-                this.unfold(parent).then(() => {
-                    this.createFunc({$parent: parent});
-                });
-            } else
-                this.createFunc({$parent: parent});
-        }
+        if (this.createFunc)
+            this.createFunc({$parent: parent});
     }
 
     create(item) {
@@ -210,7 +200,10 @@ export default class Treeview extends Component {
         let childs = parent.childs;
         if (!childs) childs = [];
 
-        childs.push(item);
+        if (!parent.active)
+            this.unfold(parent);
+        else
+            childs.push(item);
 
         if (this.sortFunc) {
             childs = childs.sort((a, b) =>
@@ -234,7 +227,13 @@ export default class Treeview extends Component {
         }
 
         item.parent = newParent;
-        this.create(item);
+
+        if (!newParent.active) {
+            this.unfold(newParent).then(() => {
+                item.parent.sons++;
+            });
+        } else
+            this.create(item);
     }
 }
 
diff --git a/front/core/components/treeview/style.scss b/front/core/components/treeview/style.scss
index e39d1708d..bd6175021 100644
--- a/front/core/components/treeview/style.scss
+++ b/front/core/components/treeview/style.scss
@@ -36,6 +36,7 @@ vn-treeview-childs {
 }
 
 vn-treeview-child {
+    font-size: 16px;
     display: block;
 
     .node {
diff --git a/modules/agency/front/location/style.scss b/modules/agency/front/location/style.scss
index a3b237b13..d1597e460 100644
--- a/modules/agency/front/location/style.scss
+++ b/modules/agency/front/location/style.scss
@@ -1,14 +1,14 @@
 @import "variables";
 
-vn-treeview-content {
-    & > vn-check:not(.indeterminate) {
+vn-treeview-child {
+    .content > vn-check:not(.indeterminate) {
         color: $color-main;
 
         & > .btn {
             border-color: $color-main;
         }
     }
-    & > vn-check.checked {
+    .content > vn-check.checked {
         color: $color-main;
     }
 }
\ No newline at end of file
diff --git a/modules/worker/front/department/index.js b/modules/worker/front/department/index.js
index b103efff9..383fee74b 100644
--- a/modules/worker/front/department/index.js
+++ b/modules/worker/front/department/index.js
@@ -24,14 +24,6 @@ class Controller {
     }
 
     onDrop(dropped, dragged) {
-        if (!dropped.active) {
-            this.$.treeview.unfold(dropped).then(() =>
-                this.move(dropped, dragged));
-        } else
-            this.move(dropped, dragged);
-    }
-
-    move(dropped, dragged) {
         const params = dropped ? {parentId: dropped.id} : null;
         const query = `/api/departments/${dragged.id}/moveChild`;
         this.$http.post(query, params).then(() => {
@@ -66,7 +58,6 @@ class Controller {
 
                 const query = `/api/departments/createChild`;
                 this.$http.post(query, params).then(res => {
-                    const parent = this.newChild.parent;
                     const item = res.data;
                     item.parent = parent;
 

From dbe6161c69b1961446f0d5670e0df6f70ef83fc8 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Wed, 16 Oct 2019 09:54:02 +0200
Subject: [PATCH 13/41] Tests fixed

---
 e2e/helpers/extensions.js                     | 25 +++++++++++++------
 e2e/helpers/selectors.js                      |  4 +--
 .../05-ticket-module/12_descriptor.spec.js    |  2 +-
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/e2e/helpers/extensions.js b/e2e/helpers/extensions.js
index 022b282d3..ee964b534 100644
--- a/e2e/helpers/extensions.js
+++ b/e2e/helpers/extensions.js
@@ -12,6 +12,7 @@ let asyncActions = {
     clickIfExists: async function(selector) {
         let exists = await this.exists(selector);
         if (exists) await this.click(selector);
+        return exists;
     },
 
     // Salix specific extensions
@@ -29,8 +30,16 @@ let asyncActions = {
 
     login: async function(userName) {
         if (currentUser !== userName) {
-            this.clickIfExists('#logout')
-                .clickIfExists('.vn-dialog.shown button[response=ACCEPT]');
+            let logoutClicked = await this.clickIfExists('#logout');
+
+            if (logoutClicked) {
+                let buttonSelector = '.vn-dialog.shown button[response=ACCEPT]';
+                this.wait(buttonSelector => {
+                    return document.querySelector(buttonSelector) != null
+                        || location.hash == '#!/login';
+                }, buttonSelector);
+                await this.clickIfExists(buttonSelector);
+            }
 
             try {
                 await this.waitForURL('#!/login');
@@ -86,7 +95,7 @@ let asyncActions = {
     pickTime: async function(selector, time) {
         await this.wait(selector)
             .evaluate((selector, time) => {
-                let input = document.querySelector(selector);
+                let input = document.querySelector(selector).$ctrl.input;
                 input.value = time;
                 input.dispatchEvent(new Event('change'));
             }, selector, time);
@@ -481,11 +490,6 @@ let actions = {
     },
 };
 
-Object.keys(actions).forEach(function(name) {
-    let fn = actions[name];
-    Nightmare.action(name, fn);
-});
-
 for (let name in asyncActions) {
     let fn = asyncActions[name];
 
@@ -495,3 +499,8 @@ for (let name in asyncActions) {
             .then(res => done(null, res), done);
     });
 }
+
+Object.keys(actions).forEach(function(name) {
+    let fn = actions[name];
+    Nightmare.action(name, fn);
+});
diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index 4d1c4f3e9..bc68f96e4 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -363,7 +363,7 @@ export default {
         moreMenuMakeInvoice: '.vn-popover.shown .vn-drop-down li[name="Make invoice"]',
         moreMenuChangeShippedHour: '.vn-popover.shown .vn-drop-down li[name="Change shipped hour"]',
         changeShippedHourDialog: 'vn-ticket-descriptor vn-dialog[vn-id="changeShippedDialog"]',
-        changeShippedHourInput: 'vn-ticket-descriptor vn-dialog[vn-id="changeShippedDialog"] vn-input-time[vn-id="newShipped"]',
+        changeShippedHourInput: 'vn-dialog[vn-id="changeShippedDialog"] [ng-model="$ctrl.newShipped"]',
         addStowawayDialogFirstTicket: 'vn-ticket-descriptor > vn-add-stowaway > vn-dialog vn-table vn-tbody vn-tr',
         shipButton: 'vn-ticket-descriptor > div > div.body > div.quicklinks vn-icon[icon="icon-stowaway"]',
         thursdayButton: 'vn-ticket-descriptor > vn-dialog > div > form > div.body > tpl-body > div > vn-tool-bar > vn-button:nth-child(4)',
@@ -671,7 +671,7 @@ export default {
         saveButton: 'vn-worker-pbx vn-submit[label="Save"] input'
     },
     workerTimeControl: {
-        timeDialogInput: 'vn-worker-time-control > vn-dialog input',
+        timeDialogInput: '.vn-dialog.shown [ng-model="$ctrl.newTime"]',
         mondayAddTimeButton: 'vn-worker-time-control > div > vn-card > div > vn-horizontal > vn-table > div > vn-tfoot > vn-tr:nth-child(2) > vn-td:nth-child(1) > vn-icon-button > button > vn-icon',
         tuesdayAddTimeButton: 'vn-worker-time-control > div > vn-card > div > vn-horizontal > vn-table > div > vn-tfoot > vn-tr:nth-child(2) > vn-td:nth-child(2) > vn-icon-button > button > vn-icon',
         wednesdayAddTimeButton: 'vn-worker-time-control > div > vn-card > div > vn-horizontal > vn-table > div > vn-tfoot > vn-tr:nth-child(2) > vn-td:nth-child(3) > vn-icon-button > button > vn-icon',
diff --git a/e2e/paths/05-ticket-module/12_descriptor.spec.js b/e2e/paths/05-ticket-module/12_descriptor.spec.js
index 5c80bbfe8..b9c6c7c87 100644
--- a/e2e/paths/05-ticket-module/12_descriptor.spec.js
+++ b/e2e/paths/05-ticket-module/12_descriptor.spec.js
@@ -34,7 +34,7 @@ describe('Ticket descriptor path', () => {
             const result = await nightmare
                 .waitToClick(selectors.ticketDescriptor.moreMenu)
                 .waitToClick(selectors.ticketDescriptor.moreMenuChangeShippedHour)
-                .write(selectors.ticketDescriptor.changeShippedHourInput, '08:15')
+                .pickTime(selectors.ticketDescriptor.changeShippedHourInput, '08:15')
                 .waitToClick(selectors.ticketDescriptor.acceptChangeHourButton)
                 .waitForLastSnackbar();
 

From e0d9f69aefbcb082b6fca92ec390080bffbaa8db Mon Sep 17 00:00:00 2001
From: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
Date: Wed, 16 Oct 2019 10:59:42 +0200
Subject: [PATCH 14/41] corrected a description

---
 modules/ticket/front/routes.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ticket/front/routes.json b/modules/ticket/front/routes.json
index cda0b7536..55922fdde 100644
--- a/modules/ticket/front/routes.json
+++ b/modules/ticket/front/routes.json
@@ -216,7 +216,7 @@
             "url" : "/create",
             "state": "ticket.card.request.create",
             "component": "vn-ticket-request-create",
-            "description": "Purchase request",
+            "description": "New purchase request",
             "acl": ["salesPerson"]
         }, {
             "url": "/create?clientFk",

From 79f9e616d21a2b8fcd9a745df5d2c8a3fcccd163 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Thu, 17 Oct 2019 11:08:40 +0200
Subject: [PATCH 15/41] added treeview unit tests

---
 front/core/components/treeview/childs.js     |   4 -
 front/core/components/treeview/index.js      |   3 +-
 front/core/components/treeview/index.spec.js | 260 +++++++++++++++++++
 modules/claim/front/action/index.html        |   2 +
 4 files changed, 264 insertions(+), 5 deletions(-)
 create mode 100644 front/core/components/treeview/index.spec.js

diff --git a/front/core/components/treeview/childs.js b/front/core/components/treeview/childs.js
index a9bd42077..d94c88df9 100644
--- a/front/core/components/treeview/childs.js
+++ b/front/core/components/treeview/childs.js
@@ -7,10 +7,6 @@ class Controller extends Component {
         event.preventDefault();
         this.treeview.onToggle(item);
     }
-
-    onDrop(item, dragged, dropped) {
-        this.treeview.onDrop(item, dragged, dropped);
-    }
 }
 
 ngModule.component('vnTreeviewChilds', {
diff --git a/front/core/components/treeview/index.js b/front/core/components/treeview/index.js
index 9ecbf52e6..728ea182e 100644
--- a/front/core/components/treeview/index.js
+++ b/front/core/components/treeview/index.js
@@ -103,7 +103,8 @@ export default class Treeview extends Component {
         const $dropped = this.dropping.$ctrl.item;
         const $dragged = this.dragging.$ctrl.item;
 
-        this.emit('drop', {$dropped, $dragged});
+        if ($dropped != $dragged.parent)
+            this.emit('drop', {$dropped, $dragged});
     }
 
     get data() {
diff --git a/front/core/components/treeview/index.spec.js b/front/core/components/treeview/index.spec.js
new file mode 100644
index 000000000..75c35fb25
--- /dev/null
+++ b/front/core/components/treeview/index.spec.js
@@ -0,0 +1,260 @@
+describe('Component vnTreeview', () => {
+    let controller;
+    let $element;
+
+    beforeEach(angular.mock.module('vnCore', $translateProvider => {
+        $translateProvider.translations('en', {});
+    }));
+
+    beforeEach(inject(($compile, $rootScope) => {
+        $element = $compile(`<vn-treeview></vn-treeview>`)($rootScope);
+        controller = $element.controller('vnTreeview');
+
+        const promise = new Promise(() => {
+            return {name: 'My item'};
+        });
+
+        controller.fetchFunc = () => {
+            return promise;
+        };
+
+        controller.createFunc = () => {
+            return promise;
+        };
+
+        controller.removeFunc = () => {
+            return promise;
+        };
+
+        controller.sortFunc = () => {
+            return promise;
+        };
+    }));
+
+    afterEach(() => {
+        $element.remove();
+    });
+
+    // See how to test DOM element in Jest
+    xdescribe('undrop()', () => {
+        it(`should reset all drop events and properties`, () => {
+            controller.dropping = angular.element(`<vn-treeview-child class="dropping"></vn-treeview-child>`);
+            spyOn(controller.dropping.classList, 'remove');
+
+            controller.undrop();
+
+            expect(controller.dropping).toBeNull();
+        });
+    });
+
+    describe('dragOver()', () => {
+        it(`should set the dragClientY property`, () => {
+            const event = new Event('dragover');
+            event.clientY = 100;
+
+            controller.dragOver(event);
+
+            expect(controller.dragClientY).toEqual(100);
+        });
+    });
+
+    describe('data() setter', () => {
+        it(`should set the items property nested into a root element`, () => {
+            const items = [{name: 'Item1'}, {name: 'Item2'}];
+            controller.data = items;
+
+            const rootItem = controller.items[0];
+
+            expect(rootItem.childs).toEqual(items);
+        });
+    });
+
+    describe('fetch()', () => {
+        it(`should call the fetchFunc() method`, () => {
+            spyOn(controller, 'fetchFunc').and.returnValue(
+                new Promise(resolve => resolve())
+            );
+            controller.fetch().then(() => {
+                expect(controller.data).toBeDefined();
+            });
+
+            expect(controller.fetchFunc).toHaveBeenCalledWith();
+        });
+    });
+
+    describe('setParent()', () => {
+        it(`should set the parent property recursively to each element of an item list`, () => {
+            spyOn(controller, 'setParent').and.callThrough();
+            const items = [{name: 'Item1'}, {name: 'Item2', childs: [
+                {name: 'Item3'}
+            ]}];
+            const rootItem = {name: 'Nested tree', sons: items};
+            controller.setParent(rootItem, items);
+
+            expect(items[0].parent).toEqual(rootItem);
+            expect(items[1].parent).toEqual(rootItem);
+            expect(controller.setParent).toHaveBeenCalledWith(rootItem, items[1].childs);
+        });
+    });
+
+    describe('onToggle()', () => {
+        it(`should call the fold() or unfold() methods`, () => {
+            spyOn(controller, 'fold');
+            spyOn(controller, 'unfold');
+
+            const item = {name: 'My item'};
+
+            controller.onToggle(item);
+            item.active = true;
+            controller.onToggle(item);
+
+            expect(controller.unfold).toHaveBeenCalledWith(item);
+            expect(controller.fold).toHaveBeenCalledWith(item);
+        });
+    });
+
+    describe('fold()', () => {
+        it(`should remove the childs and set the active property to false`, () => {
+            const item = {name: 'My item', childs: [{name: 'Item 1'}], active: true};
+
+            controller.fold(item);
+
+            expect(item.childs).toBeUndefined();
+            expect(item.active).toBeFalsy();
+        });
+    });
+
+    describe('unfold()', () => {
+        it(`should unfold a parent item`, () => {
+            const expectedResponse = [{name: 'Item 1'}, {name: 'Item 2'}];
+            spyOn(controller, 'fetchFunc').and.returnValue(
+                new Promise(resolve => resolve(expectedResponse))
+            );
+            spyOn(controller, 'setParent');
+            spyOn(controller, 'sortFunc');
+            const parent = {name: 'My item', sons: 1};
+            const child = {name: 'Item 1'};
+            child.parent = parent;
+            parent.childs = [child];
+
+            controller.unfold(parent).then(() => {
+                expect(controller.fetchFunc).toHaveBeenCalledWith({$item: parent});
+                expect(controller.setParent).toHaveBeenCalledWith(parent, expectedResponse);
+                expect(controller.sortFunc).toHaveBeenCalledWith(jasmine.any(Object));
+                expect(parent.active).toBeTruthy();
+            });
+        });
+    });
+
+    describe('onRemove()', () => {
+        it(`should call the removeFunc() method`, () => {
+            spyOn(controller, 'removeFunc');
+            const item = {name: 'My item'};
+            controller.onRemove(item);
+
+            expect(controller.removeFunc).toHaveBeenCalledWith({$item: item});
+        });
+    });
+
+    describe('remove()', () => {
+        it(`should remove a child element`, () => {
+            const parent = {name: 'My item', sons: 1};
+            const child = {name: 'Item 1'};
+            child.parent = parent;
+            parent.childs = [child];
+
+            controller.remove(child);
+
+            expect(parent.childs).toEqual([]);
+            expect(parent.sons).toEqual(0);
+        });
+    });
+
+    describe('onCreate()', () => {
+        it(`should call the createFunc() method`, () => {
+            spyOn(controller, 'createFunc');
+            const parent = {name: 'My item'};
+            controller.onCreate(parent);
+
+            expect(controller.createFunc).toHaveBeenCalledWith({$parent: parent});
+        });
+    });
+
+    describe('create()', () => {
+        it(`should unfold an inactive parent and then create a child`, () => {
+            spyOn(controller, 'unfold');
+            spyOn(controller, 'sortFunc');
+            const parent = {name: 'My item', sons: 2, childs: [
+                {name: 'Item 1'},
+                {name: 'Item 2'}
+            ]};
+            const child = {name: 'Item 3'};
+            child.parent = parent;
+            parent.childs.push(child);
+
+            controller.create(child);
+
+            expect(parent.sons).toEqual(3);
+            expect(controller.unfold).toHaveBeenCalledWith(parent);
+            expect(controller.sortFunc).toHaveBeenCalledWith(jasmine.any(Object));
+            expect(controller.sortFunc).toHaveBeenCalledTimes(2);
+        });
+
+        it(`should create a child on an active parent`, () => {
+            spyOn(controller, 'unfold');
+            spyOn(controller, 'sortFunc');
+            const parent = {name: 'My item', sons: 2, childs: [
+                {name: 'Item 1'},
+                {name: 'Item 2'}
+            ], active: true};
+            const child = {name: 'Item 3'};
+            child.parent = parent;
+
+            controller.create(child);
+
+            expect(parent.sons).toEqual(3);
+            expect(controller.unfold).not.toHaveBeenCalledWith(parent);
+            expect(controller.sortFunc).toHaveBeenCalledWith(jasmine.any(Object));
+            expect(controller.sortFunc).toHaveBeenCalledTimes(2);
+        });
+    });
+
+    describe('move()', () => {
+        it(`should move an item to anocher parent and then unfold the parent`, () => {
+            spyOn(controller, 'unfold').and.returnValue(
+                new Promise(resolve => resolve())
+            );
+            const newParent = {name: 'My item 2', sons: 0};
+            const parent = {name: 'My item', sons: 3, childs: [
+                {name: 'Item 1'},
+                {name: 'Item 2'}
+            ]};
+            const child = {name: 'Item 3'};
+            child.parent = parent;
+            parent.childs.push(child);
+
+            controller.move(child, newParent);
+
+            expect(parent.sons).toEqual(2);
+            expect(controller.unfold).toHaveBeenCalledWith(newParent);
+        });
+
+        it(`should move an item to anocher parent`, () => {
+            spyOn(controller, 'unfold');
+            spyOn(controller, 'create');
+            const newParent = {name: 'My item 2', sons: 0, active: true};
+            const parent = {name: 'My item', sons: 3, childs: [
+                {name: 'Item 1'},
+                {name: 'Item 2'}
+            ]};
+            const child = {name: 'Item 3'};
+            child.parent = parent;
+            parent.childs.push(child);
+
+            controller.move(child, newParent);
+
+            expect(parent.sons).toEqual(2);
+            expect(controller.unfold).not.toHaveBeenCalledWith(newParent);
+        });
+    });
+});
diff --git a/modules/claim/front/action/index.html b/modules/claim/front/action/index.html
index 65467d349..35a0e56e2 100644
--- a/modules/claim/front/action/index.html
+++ b/modules/claim/front/action/index.html
@@ -50,6 +50,7 @@
                     </vn-check>
                 </vn-one>
             </vn-horizontal>
+            <vn-data-viewer model="model">
             <vn-table model="model">
                 <vn-thead>
                     <vn-tr>
@@ -114,6 +115,7 @@
                     </vn-tr>
                 </vn-tbody>
             </vn-table>
+           </vn-data-viewer>
         </vn-vertical>
     </vn-card>
     <vn-button-bar>

From b2b76b05d81fd42a460ec9afd2aeafad40e5fd08 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Thu, 17 Oct 2019 13:27:50 +0200
Subject: [PATCH 16/41] css fixes + back unit tests

---
 front/core/components/treeview/index.spec.js  |   2 +-
 modules/claim/front/action/index.html         | 227 +++++++++---------
 modules/claim/front/action/style.scss         |  15 ++
 modules/ticket/front/services/index.spec.js   |   2 +-
 .../department/specs/createChild.spec.js      |  18 ++
 .../department/specs/moveChild.spec.js        |  23 ++
 .../department/specs/removeChild.spec.js      |  21 ++
 7 files changed, 187 insertions(+), 121 deletions(-)
 create mode 100644 modules/worker/back/methods/department/specs/createChild.spec.js
 create mode 100644 modules/worker/back/methods/department/specs/moveChild.spec.js
 create mode 100644 modules/worker/back/methods/department/specs/removeChild.spec.js

diff --git a/front/core/components/treeview/index.spec.js b/front/core/components/treeview/index.spec.js
index 75c35fb25..12cdc16e7 100644
--- a/front/core/components/treeview/index.spec.js
+++ b/front/core/components/treeview/index.spec.js
@@ -72,7 +72,7 @@ describe('Component vnTreeview', () => {
     describe('fetch()', () => {
         it(`should call the fetchFunc() method`, () => {
             spyOn(controller, 'fetchFunc').and.returnValue(
-                new Promise(resolve => resolve())
+                new Promise(resolve => resolve([{name: 'My item'}]))
             );
             controller.fetch().then(() => {
                 expect(controller.data).toBeDefined();
diff --git a/modules/claim/front/action/index.html b/modules/claim/front/action/index.html
index 35a0e56e2..d12399c55 100644
--- a/modules/claim/front/action/index.html
+++ b/modules/claim/front/action/index.html
@@ -1,123 +1,116 @@
-<vn-crud-model auto-load="false"
+<vn-crud-model auto-load="true"
     vn-id="model"
     url="claim/api/ClaimEnds"
     filter="$ctrl.filter"
     data="$ctrl.salesClaimed">
 </vn-crud-model>
-<vn-vertical compact>
-    <vn-card class="vn-pa-lg">
-        <vn-vertical>
-            <vn-horizontal>
-                <div class="totalBox" ng-show="$ctrl.salesClaimed.length > 0">
-                    <vn-label-value label="Total claimed" 
-                        value="{{$ctrl.claimedTotal | currency: 'EUR':2}}">
-                    </vn-label-value>
-                </div>
-            </vn-horizontal>
-            <vn-horizontal>
-                <vn-tool-bar class="vn-mb-md">
-                    <vn-button
-                        label="Import claim" 
-                        disabled="$ctrl.claim.claimStateFk == $ctrl.resolvedState"
-                        vn-http-click="$ctrl.importToNewRefundTicket()"p
-                        vn-tooltip="Imports claim details">
-                    </vn-button>
-                    <vn-button
-                        label="Import ticket" 
-                        disabled="$ctrl.claim.claimStateFk == $ctrl.resolvedState"
-                        ng-click="$ctrl.showLastTickets($event)"
-                        vn-tooltip="Imports ticket lines">
-                    </vn-button>
-                    <vn-input-range
-                        vn-one 
-                        label="Responsability"
-                        value="$ctrl.claim.responsibility"
-                        max="$ctrl.maxResponsibility"
-                        min="1"
-                        step="1"
-                        vn-acl="salesAssistant"
-                        on-change="$ctrl.saveResponsibility(value)">
-                    </vn-input-range>
-                </vn-tool-bar>
-                <vn-one
-                    style = "text-align:right">
-                    <vn-check
-                        vn-one
-                        label="Is paid with mana"
-                        ng-model="$ctrl.claim.isChargedToMana"
-                        vn-acl="salesAssistant"
-                        on-change="$ctrl.saveMana(value)">
-                    </vn-check>
-                </vn-one>
-            </vn-horizontal>
-            <vn-data-viewer model="model">
-            <vn-table model="model">
-                <vn-thead>
-                    <vn-tr>
-                        <vn-th number>Id</vn-th>
-                        <vn-th number>Ticket</vn-th>
-                        <vn-th>Destination</vn-th>
-                        <vn-th>Landed</vn-th>
-                        <vn-th number>Quantity</vn-th>
-                        <vn-th>Description</vn-th>
-                        <vn-th number>Price</vn-th>
-                        <vn-th number>Disc.</vn-th>
-                        <vn-th number>Total</vn-th>
-                    </vn-tr>
-                </vn-thead>
-                <vn-tbody>
-                    <vn-tr
-                        ng-repeat="saleClaimed in $ctrl.salesClaimed"
-                        vn-repeat-last on-last="$ctrl.focusLastInput()">
-                        <vn-td number>
-                                <span 
-                                    ng-click="$ctrl.showDescriptor($event, saleClaimed.sale.itemFk)"
-                                    class="link">
-                                    {{saleClaimed.sale.itemFk | zeroFill:6}}
-                                </span>
-                        </vn-td>
-                        <vn-td number>
-                            <span
-                                class="link" 
-                                ng-click="$ctrl.showTicketDescriptor($event, saleClaimed.sale.ticketFk)">
-                                {{::saleClaimed.sale.ticketFk}}
+
+<vn-card class="vn-mb-md vn-pa-lg vn-w-lg" style="text-align: right" 
+    ng-if="$ctrl.salesClaimed.length > 0">
+    <vn-label-value label="Total claimed" 
+        value="{{$ctrl.claimedTotal | currency: 'EUR':2}}">
+    </vn-label-value>
+</vn-card>
+
+<vn-card class="vn-pa-lg vn-w-lg">
+    <section class="header">
+        <vn-tool-bar class="vn-mb-md">
+            <vn-button
+                label="Import claim" 
+                disabled="$ctrl.claim.claimStateFk == $ctrl.resolvedState"
+                vn-http-click="$ctrl.importToNewRefundTicket()"p
+                translate-attr="{title: 'Imports claim details'}">
+            </vn-button>
+            <vn-button
+                label="Import ticket" 
+                disabled="$ctrl.claim.claimStateFk == $ctrl.resolvedState"
+                ng-click="$ctrl.showLastTickets($event)"
+                translate-attr="{title: 'Imports ticket lines'}">
+            </vn-button>
+            <vn-input-range vn-none 
+                label="Responsability"
+                value="$ctrl.claim.responsibility"
+                max="$ctrl.maxResponsibility"
+                min="1"
+                step="1"
+                vn-acl="salesAssistant"
+                on-change="$ctrl.saveResponsibility(value)">
+            </vn-input-range>
+        </vn-tool-bar>
+        <vn-check vn-one
+            label="Is paid with mana"
+            ng-model="$ctrl.claim.isChargedToMana"
+            vn-acl="salesAssistant"
+            on-change="$ctrl.saveMana(value)">
+        </vn-check>
+    </section>
+
+    <vn-data-viewer model="model">
+        <vn-table model="model">
+            <vn-thead>
+                <vn-tr>
+                    <vn-th number>Id</vn-th>
+                    <vn-th number>Ticket</vn-th>
+                    <vn-th>Destination</vn-th>
+                    <vn-th>Landed</vn-th>
+                    <vn-th number>Quantity</vn-th>
+                    <vn-th>Description</vn-th>
+                    <vn-th number>Price</vn-th>
+                    <vn-th number>Disc.</vn-th>
+                    <vn-th number>Total</vn-th>
+                </vn-tr>
+            </vn-thead>
+            <vn-tbody>
+                <vn-tr
+                    ng-repeat="saleClaimed in $ctrl.salesClaimed"
+                    vn-repeat-last on-last="$ctrl.focusLastInput()">
+                    <vn-td number>
+                            <span 
+                                ng-click="$ctrl.showDescriptor($event, saleClaimed.sale.itemFk)"
+                                class="link">
+                                {{::saleClaimed.sale.itemFk | zeroFill:6}}
                             </span>
-                        </vn-td>
-                        <vn-td>
-                            <vn-autocomplete
-                                vn-one
-                                id="claimDestinationFk"
-                                ng-model="saleClaimed.claimDestinationFk"
-                                url="/claim/api/ClaimDestinations"
-                                fields="['id','description']"
-                                value-field="id"
-                                show-field="description"
-                                on-change="$ctrl.setClaimDestination(saleClaimed.id, value)">
-                            </vn-autocomplete>
-                        </vn-td>
-                        <vn-td>{{saleClaimed.sale.ticket.landed | dateTime: 'dd/MM/yyyy'}}</vn-td>
-                        <vn-td number>{{saleClaimed.sale.quantity}}</vn-td>
-                        <vn-td expand>{{saleClaimed.sale.concept}}</vn-td>
-                        <vn-td number>{{saleClaimed.sale.price | currency: 'EUR':2}}</vn-td>
-                        <vn-td number>{{saleClaimed.sale.discount}} %</vn-td>
-                        <vn-td number>
-                            {{saleClaimed.sale.quantity * saleClaimed.sale.price *
-                                ((100 - saleClaimed.sale.discount) / 100) | currency: 'EUR':2}}
-                        </vn-td>
-                        <vn-td shrink>
-                            <vn-icon-button
-                                vn-tooltip="Remove line"
-                                icon="delete"
-                                ng-click="$ctrl.deleteClaimedSale(saleClaimed.id)"
-                                tabindex="-1">
-                            </vn-icon-button>
-                        </vn-td>
-                    </vn-tr>
-                </vn-tbody>
-            </vn-table>
-           </vn-data-viewer>
-        </vn-vertical>
-    </vn-card>
+                    </vn-td>
+                    <vn-td number>
+                        <span
+                            class="link" 
+                            ng-click="$ctrl.showTicketDescriptor($event, saleClaimed.sale.ticketFk)">
+                            {{::saleClaimed.sale.ticketFk}}
+                        </span>
+                    </vn-td>
+                    <vn-td>
+                        <vn-autocomplete vn-one
+                            id="claimDestinationFk"
+                            ng-model="saleClaimed.claimDestinationFk"
+                            url="/claim/api/ClaimDestinations"
+                            fields="['id','description']"
+                            value-field="id"
+                            show-field="description"
+                            on-change="$ctrl.setClaimDestination(saleClaimed.id, value)">
+                        </vn-autocomplete>
+                    </vn-td>
+                    <vn-td>{{::saleClaimed.sale.ticket.landed | dateTime: 'dd/MM/yyyy'}}</vn-td>
+                    <vn-td number>{{::saleClaimed.sale.quantity}}</vn-td>
+                    <vn-td expand>{{::saleClaimed.sale.concept}}</vn-td>
+                    <vn-td number>{{::saleClaimed.sale.price | currency: 'EUR':2}}</vn-td>
+                    <vn-td number>{{::saleClaimed.sale.discount}} %</vn-td>
+                    <vn-td number>
+                        {{saleClaimed.sale.quantity * saleClaimed.sale.price *
+                            ((100 - saleClaimed.sale.discount) / 100) | currency: 'EUR':2}}
+                    </vn-td>
+                    <vn-td shrink>
+                        <vn-icon-button
+                            vn-tooltip="Remove line"
+                            icon="delete"
+                            ng-click="$ctrl.deleteClaimedSale(saleClaimed.id)"
+                            tabindex="-1">
+                        </vn-icon-button>
+                    </vn-td>
+                </vn-tr>
+            </vn-tbody>
+        </vn-table>
+    </vn-data-viewer>
+
     <vn-button-bar>
         <vn-button 
             label="Regularize" 
@@ -125,11 +118,7 @@
             vn-http-click="$ctrl.regularize()">
         </vn-button>
     </vn-button-bar>
-    <!-- WIP
-    <a ng-click="$ctrl.openAddSalesDialog()" vn-tooltip="New item" vn-bind="+" fixed-bottom-right>
-        <vn-float-button icon="add"></vn-float-button>
-    </a>
-    -->
+</vn-card>
 
 <!-- Add Lines Dialog -->
 <vn-dialog vn-id="addSales">
diff --git a/modules/claim/front/action/style.scss b/modules/claim/front/action/style.scss
index 3d54485e7..0124b716b 100644
--- a/modules/claim/front/action/style.scss
+++ b/modules/claim/front/action/style.scss
@@ -1,4 +1,19 @@
 vn-claim-action {
+    .header {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        align-content: center;
+
+        vn-tool-bar {
+            flex: 1
+        }
+
+        vn-check {
+            flex: none;
+        }
+    }
+
     vn-dialog[vn-id=addSales] {
         tpl-body {
             width: 950px;
diff --git a/modules/ticket/front/services/index.spec.js b/modules/ticket/front/services/index.spec.js
index 97ce890d9..cf416f84d 100644
--- a/modules/ticket/front/services/index.spec.js
+++ b/modules/ticket/front/services/index.spec.js
@@ -1,6 +1,6 @@
 import './index.js';
 
-fdescribe('Ticket component vnTicketService', () => {
+describe('Ticket component vnTicketService', () => {
     let controller;
     let $httpBackend;
     let $httpParamSerializer;
diff --git a/modules/worker/back/methods/department/specs/createChild.spec.js b/modules/worker/back/methods/department/specs/createChild.spec.js
new file mode 100644
index 000000000..305732f58
--- /dev/null
+++ b/modules/worker/back/methods/department/specs/createChild.spec.js
@@ -0,0 +1,18 @@
+const app = require('vn-loopback/server/server');
+
+describe('department createChild()', () => {
+    let createdChild;
+
+    afterAll(async done => {
+        await createdChild.destroy();
+        done();
+    });
+
+    it('should create a new child', async() => {
+        const parentId = null;
+        createdChild = await app.models.Department.createChild(parentId, 'My new department');
+
+        expect(createdChild.name).toEqual('My new department');
+        expect(createdChild.parentFk).toBeNull();
+    });
+});
diff --git a/modules/worker/back/methods/department/specs/moveChild.spec.js b/modules/worker/back/methods/department/specs/moveChild.spec.js
new file mode 100644
index 000000000..3358ebf77
--- /dev/null
+++ b/modules/worker/back/methods/department/specs/moveChild.spec.js
@@ -0,0 +1,23 @@
+const app = require('vn-loopback/server/server');
+
+describe('department moveChild()', () => {
+    let updatedChild;
+
+    afterAll(async done => {
+        const child = await app.models.Department.findById(updatedChild.id);
+        await child.updateAttribute('parentFk', null);
+        done();
+    });
+
+    it('should move a child department to a new parent', async() => {
+        const childId = 22;
+        const parentId = 1;
+
+        const child = await app.models.Department.findById(childId);
+
+        expect(child.parentFk).toBeNull();
+        updatedChild = await app.models.Department.moveChild(childId, parentId);
+
+        expect(updatedChild.parentFk).toEqual(1);
+    });
+});
diff --git a/modules/worker/back/methods/department/specs/removeChild.spec.js b/modules/worker/back/methods/department/specs/removeChild.spec.js
new file mode 100644
index 000000000..1fe3d10ef
--- /dev/null
+++ b/modules/worker/back/methods/department/specs/removeChild.spec.js
@@ -0,0 +1,21 @@
+const app = require('vn-loopback/server/server');
+
+describe('department removeChild()', () => {
+    let removedChild;
+
+    afterAll(async done => {
+        await app.models.Department.create(removedChild);
+        done();
+    });
+
+    it('should remove a child department', async() => {
+        const childId = 1;
+
+        removedChild = await app.models.Department.findById(childId);
+        const result = await app.models.Department.removeChild(childId);
+        const existsChild = await app.models.Department.findById(childId);
+
+        expect(result.count).toEqual(1);
+        expect(existsChild).toBeNull();
+    });
+});

From e1cea99cc09f093d693cc971fad95b417e7d8901 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Thu, 17 Oct 2019 14:01:23 +0200
Subject: [PATCH 17/41] insert timeControl from procedure

---
 .../back/methods/worker-time-control/addTime.js      | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/modules/worker/back/methods/worker-time-control/addTime.js b/modules/worker/back/methods/worker-time-control/addTime.js
index 5548654bc..516519359 100644
--- a/modules/worker/back/methods/worker-time-control/addTime.js
+++ b/modules/worker/back/methods/worker-time-control/addTime.js
@@ -32,14 +32,12 @@ module.exports = Self => {
             throw new UserError(`You don't have enough privileges`);
 
         const subordinate = await Worker.findById(data.workerFk);
+        const timed = new Date(data.timed);
 
-        return Self.create({
-            userFk: subordinate.userFk,
-            timed: data.timed,
-            manual: 1
-        });
+        let offset = timed.getTimezoneOffset() * 60000;
+        timed.setTime(timed.getTime() - offset);
 
-        /* return Self.rawSql('CALL vn.workerTimeControl_add(?, ?, ?, ?)', [
-            subordinate.userFk, null, data.timed, true]); */
+        return Self.rawSql('CALL vn.workerTimeControl_add(?, ?, ?, ?)', [
+            subordinate.userFk, null, timed, true]);
     };
 };

From 6f691353a384cee36e7831494e6c9a68014126e4 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Thu, 17 Oct 2019 14:01:23 +0200
Subject: [PATCH 18/41] solved conflicts

---
 .../back/methods/worker-time-control/addTime.js       | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/worker/back/methods/worker-time-control/addTime.js b/modules/worker/back/methods/worker-time-control/addTime.js
index cb639f9af..516519359 100644
--- a/modules/worker/back/methods/worker-time-control/addTime.js
+++ b/modules/worker/back/methods/worker-time-control/addTime.js
@@ -32,11 +32,12 @@ module.exports = Self => {
             throw new UserError(`You don't have enough privileges`);
 
         const subordinate = await Worker.findById(data.workerFk);
+        const timed = new Date(data.timed);
 
-        return Self.create({
-            userFk: subordinate.userFk,
-            timed: data.timed,
-            manual: 1
-        });
+        let offset = timed.getTimezoneOffset() * 60000;
+        timed.setTime(timed.getTime() - offset);
+
+        return Self.rawSql('CALL vn.workerTimeControl_add(?, ?, ?, ?)', [
+            subordinate.userFk, null, timed, true]);
     };
 };

From 43a2c2e939b7dcf2fe4b2378b6566fd818e58ee1 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Thu, 17 Oct 2019 14:01:23 +0200
Subject: [PATCH 19/41] insert timeControl from procedure

---
 .../back/methods/worker-time-control/addTime.js      | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/modules/worker/back/methods/worker-time-control/addTime.js b/modules/worker/back/methods/worker-time-control/addTime.js
index 5548654bc..516519359 100644
--- a/modules/worker/back/methods/worker-time-control/addTime.js
+++ b/modules/worker/back/methods/worker-time-control/addTime.js
@@ -32,14 +32,12 @@ module.exports = Self => {
             throw new UserError(`You don't have enough privileges`);
 
         const subordinate = await Worker.findById(data.workerFk);
+        const timed = new Date(data.timed);
 
-        return Self.create({
-            userFk: subordinate.userFk,
-            timed: data.timed,
-            manual: 1
-        });
+        let offset = timed.getTimezoneOffset() * 60000;
+        timed.setTime(timed.getTime() - offset);
 
-        /* return Self.rawSql('CALL vn.workerTimeControl_add(?, ?, ?, ?)', [
-            subordinate.userFk, null, data.timed, true]); */
+        return Self.rawSql('CALL vn.workerTimeControl_add(?, ?, ?, ?)', [
+            subordinate.userFk, null, timed, true]);
     };
 };

From bdbadaf61afed8cea94f7ad5489b080e34112620 Mon Sep 17 00:00:00 2001
From: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
Date: Thu, 17 Oct 2019 14:30:52 +0200
Subject: [PATCH 20/41] #1819 fixtures

---
 db/dump/fixtures.sql                          | 68 +++++++++----------
 .../03-worker-module/02_time_control.spec.js  |  2 +-
 .../06_basic_data_steps.spec.js               |  1 +
 .../back/methods/route/specs/filter.spec.js   |  2 +-
 .../methods/route/specs/getTickets.spec.js    |  2 +-
 .../methods/route/specs/guessPriority.spec.js | 24 +++----
 .../back/methods/route/specs/summary.spec.js  |  4 +-
 .../methods/route/specs/updateVolume.spec.js  | 13 ++--
 8 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index 2624f1768..3aec7d82c 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -351,16 +351,6 @@ INSERT INTO `vn`.`creditInsurance`(`id`, `creditClassification`, `credit`, `crea
         (2, 2, 6000,  DATE_ADD(CURDATE(), INTERVAL -2 MONTH), NULL),
         (3, 3, 10000, DATE_ADD(CURDATE(), INTERVAL -3 MONTH), NULL);
 
-INSERT INTO `vn`.`route`(`id`, `time`, `workerFk`, `created`, `vehicleFk`, `agencyModeFk`, `description`, `m3`, `cost`, `started`, `finished`)
-    VALUES
-        (1, '1899-12-30 12:15:00', 56, CURDATE(), 1, 7,    'first route',   2.7,  10, CURDATE(), CURDATE()),
-        (2, '1899-12-30 13:20:00', 56, CURDATE(), 1, 7,    'second route',  0.9,  20, CURDATE(), CURDATE()),
-        (3, '1899-12-30 14:30:00', 56, CURDATE(), 2, 7,    'third route',   1.1,  30, CURDATE(), CURDATE()),
-        (4, '1899-12-30 15:45:00', 56, CURDATE(), 3, 7,    'fourth route',  0.1,  40, CURDATE(), CURDATE()),
-        (5, '1899-12-30 16:00:00', 56, CURDATE(), 4, 8,    'fifth route',   NULL, 50, CURDATE(), CURDATE()),
-        (6, NULL,                  57, CURDATE(), 5, 8,    'sixth route',   NULL, 60, CURDATE(), CURDATE()),
-        (7, NULL,                  57, CURDATE(), 6, NULL, 'seventh route', NULL, 70, CURDATE(), CURDATE());
-
 INSERT INTO `vn2008`.`empresa_grupo`(`empresa_grupo_id`, `grupo`)
     VALUES
         (1, 'Wayne Industries');
@@ -456,32 +446,42 @@ INSERT INTO `vn`.`zone` (`id`, `name`, `hour`, `warehouseFk`, `agencyModeFk`, `t
         (12, 'Zone entanglement',   CONCAT(CURRENT_DATE(), ' ', TIME('22:00')), 4, 4,  0, 0,    0),
         (13, 'Zone quantum break',  CONCAT(CURRENT_DATE(), ' ', TIME('22:00')), 5, 5,  0, 0,    0);
 
+INSERT INTO `vn`.`route`(`id`, `time`, `workerFk`, `created`, `vehicleFk`, `agencyModeFk`, `description`, `m3`, `cost`, `started`, `finished`, `zoneFk`)
+    VALUES
+        (1, '1899-12-30 12:15:00', 56, CURDATE(), 1, 1, 'first route',   1.8,   10, CURDATE(), CURDATE(), 1),
+        (2, '1899-12-30 13:20:00', 56, CURDATE(), 1, 2, 'second route',  0.2,   20, CURDATE(), CURDATE(), 9),
+        (3, '1899-12-30 14:30:00', 56, CURDATE(), 2, 3, 'third route',   0.5,   30, CURDATE(), CURDATE(), 10),
+        (4, '1899-12-30 15:45:00', 56, CURDATE(), 3, 4, 'fourth route',  0,     40, CURDATE(), CURDATE(), 12),
+        (5, '1899-12-30 16:00:00', 56, CURDATE(), 4, 5, 'fifth route',   0.1,   50, CURDATE(), CURDATE(), 13),
+        (6, NULL,                  57, CURDATE(), 5, 7, 'sixth route',   1.7,   60, CURDATE(), CURDATE(), 3),
+        (7, NULL,                  57, CURDATE(), 6, 8, 'seventh route', 0,     70, CURDATE(), CURDATE(), 5);
+
 INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeFk`, `shipped`, `landed`, `clientFk`,`nickname`, `addressFk`, `refFk`, `isDeleted`, `zoneFk`, `created`)
     VALUES
-        (1 , 3,     1,  1, 1,    DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 101, 'Bat cave',              121, 'T1111111', 0, 1,  DATE_ADD(CURDATE(), INTERVAL -1 MONTH)),
-        (2 , 1,     1,  1, 1,    DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 104, 'Stark tower',           124, 'T1111111', 0, 1,  DATE_ADD(CURDATE(), INTERVAL -1 MONTH)),
-        (3 , 1,     7,  1, 1,    DATE_ADD(CURDATE(), INTERVAL -2 MONTH), DATE_ADD(DATE_ADD(CURDATE(),INTERVAL -2 MONTH), INTERVAL +1 DAY), 104, 'Stark tower',           124, 'T2222222', 0, 3,  DATE_ADD(CURDATE(), INTERVAL -2 MONTH)),
-        (4 , 3,     2,  1, 1,    DATE_ADD(CURDATE(), INTERVAL -3 MONTH), DATE_ADD(DATE_ADD(CURDATE(),INTERVAL -3 MONTH), INTERVAL +1 DAY), 104, 'Stark tower',           124, 'T3333333', 0, 9,  DATE_ADD(CURDATE(), INTERVAL -3 MONTH)),
-        (5 , 3,     3,  3, 1,    DATE_ADD(CURDATE(), INTERVAL -4 MONTH), DATE_ADD(DATE_ADD(CURDATE(),INTERVAL -4 MONTH), INTERVAL +1 DAY), 104, 'Stark tower',           124, 'T4444444', 0, 10, DATE_ADD(CURDATE(), INTERVAL -4 MONTH)),
-        (6 , 1,     3,  3, 1,    DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 101, 'Mountain Drive Gotham', 1,   'A1111111', 0, 10, DATE_ADD(CURDATE(), INTERVAL -1 MONTH)),
-        (7 , NULL,  7,  1, 2,    CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            101, 'Mountain Drive Gotham', 1,   NULL,       0, 3,  CURDATE()),
-        (8 , NULL,  7,  1, 2,    CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            101, 'Bat cave',              121, NULL,       0, 3,  CURDATE()),
-        (9 , NULL,  7,  1, 2,    CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            104, 'Stark tower',           124, NULL,       0, 3,  CURDATE()),
-        (10, 1,     1,  5, 3,    CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            102, 'Ingram Street',         2,   NULL,       0, 11, CURDATE()),
-        (11, 1,     7,  1, 3,    CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            102, 'NY roofs',              122, NULL,       0, 3,  CURDATE()),
-        (12, 1,     1,  1, 3,    CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            103, 'Phone Box',             123, NULL,       0, 1,  CURDATE()),
-        (13, 1,     7,  1, 2,    CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            103, 'Phone Box',             123, NULL,       0, 1,  CURDATE()),
-        (14, 1,     2,  1, 3,    CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            104, 'Malibu Point',          4,   NULL,       0, 9,  CURDATE()),
-        (15, 1,     7,  1, 3,    CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            105, 'Plastic Cell',          125, NULL,       0, 3,  CURDATE()),
-        (16, 1,     7,  1, 3,    CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            106, 'Many Places',           126, NULL,       0, 3,  CURDATE()),
-        (17, 1,     7,  2, 3,    CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            106, 'Many Places',           126, NULL,       0, 3,  CURDATE()),
-        (18, 1,     4,  4, 3,    CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            108, 'Cerebro',               128, NULL,       0, 12, CURDATE()),
-        (19, 1,     5,  5, 3,    CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            109, 'Somewhere in Thailand', 129, NULL,       1, 13, CURDATE()),
-        (20, 1,     5,  5, 3,    DATE_ADD(CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 109, 'Somewhere in Thailand', 129, NULL,       0, 13, DATE_ADD(CURDATE(), INTERVAL +1 MONTH)),
-        (21, NULL,  5,  5, NULL, DATE_ADD(CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 109, 'Somewhere in Holland',  102, NULL,       0, 13, DATE_ADD(CURDATE(), INTERVAL +1 MONTH)),
-        (22, NULL,  5,  5, NULL, DATE_ADD(CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 109, 'Somewhere in Japan',    103, NULL,       0, 13, DATE_ADD(CURDATE(), INTERVAL +1 MONTH)),
-        (23, NULL,  10, 1, NULL, CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            101, 'address 21',            121, NULL,       0, 8,  CURDATE()),
-        (24 ,NULL,  10, 1, NULL, CURDATE(),                              CURDATE(),                                                        101, 'Bruce Wayne',           1,   NULL,       0, 8,  CURDATE());
+        (1 , 3,     1,  1, 1,       DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 101, 'Bat cave',              121, 'T1111111', 0, 1,  DATE_ADD(CURDATE(), INTERVAL -1 MONTH)),
+        (2 , 1,     1,  1, 1,       DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 104, 'Stark tower',           124, 'T1111111', 0, 1,  DATE_ADD(CURDATE(), INTERVAL -1 MONTH)),
+        (3 , 1,     7,  1, 6,       DATE_ADD(CURDATE(), INTERVAL -2 MONTH), DATE_ADD(DATE_ADD(CURDATE(),INTERVAL -2 MONTH), INTERVAL +1 DAY), 104, 'Stark tower',           124, 'T2222222', 0, 3,  DATE_ADD(CURDATE(), INTERVAL -2 MONTH)),
+        (4 , 3,     2,  1, 2,       DATE_ADD(CURDATE(), INTERVAL -3 MONTH), DATE_ADD(DATE_ADD(CURDATE(),INTERVAL -3 MONTH), INTERVAL +1 DAY), 104, 'Stark tower',           124, 'T3333333', 0, 9,  DATE_ADD(CURDATE(), INTERVAL -3 MONTH)),
+        (5 , 3,     3,  3, 3,       DATE_ADD(CURDATE(), INTERVAL -4 MONTH), DATE_ADD(DATE_ADD(CURDATE(),INTERVAL -4 MONTH), INTERVAL +1 DAY), 104, 'Stark tower',           124, 'T4444444', 0, 10, DATE_ADD(CURDATE(), INTERVAL -4 MONTH)),
+        (6 , 1,     3,  3, 3,       DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 101, 'Mountain Drive Gotham', 1,   'A1111111', 0, 10, DATE_ADD(CURDATE(), INTERVAL -1 MONTH)),
+        (7 , NULL,  7,  1, 6,       CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            101, 'Mountain Drive Gotham', 1,   NULL,       0, 3,  CURDATE()),
+        (8 , NULL,  7,  1, 6,       CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            101, 'Bat cave',              121, NULL,       0, 3,  CURDATE()),
+        (9 , NULL,  7,  1, 6,       CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            104, 'Stark tower',           124, NULL,       0, 3,  CURDATE()),
+        (10, 1,     1,  5, 1,       CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            102, 'Ingram Street',         2,   NULL,       0, 1,  CURDATE()),
+        (11, 1,     7,  1, 6,       CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            102, 'NY roofs',              122, NULL,       0, 3,  CURDATE()),
+        (12, 1,     1,  1, 1,       CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            103, 'Phone Box',             123, NULL,       0, 1,  CURDATE()),
+        (13, 1,     7,  1, 6,       CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            103, 'Phone Box',             123, NULL,       0, 3,  CURDATE()),
+        (14, 1,     2,  1, NULL,    CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            104, 'Malibu Point',          4,   NULL,       0, 9,  CURDATE()),
+        (15, 1,     7,  1, 6,       CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            105, 'Plastic Cell',          125, NULL,       0, 3,  CURDATE()),
+        (16, 1,     7,  1, 6,       CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            106, 'Many Places',           126, NULL,       0, 3,  CURDATE()),
+        (17, 1,     7,  2, 6,       CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            106, 'Many Places',           126, NULL,       0, 3,  CURDATE()),
+        (18, 1,     4,  4, 4,       CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            108, 'Cerebro',               128, NULL,       0, 12, CURDATE()),
+        (19, 1,     5,  5, 3,       CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            109, 'Somewhere in Thailand', 129, NULL,       1, 13, CURDATE()),
+        (20, 1,     5,  5, 3,       DATE_ADD(CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 109, 'Somewhere in Thailand', 129, NULL,       0, 13, DATE_ADD(CURDATE(), INTERVAL +1 MONTH)),
+        (21, NULL,  5,  5, 5,       DATE_ADD(CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 109, 'Somewhere in Holland',  102, NULL,       0, 13, DATE_ADD(CURDATE(), INTERVAL +1 MONTH)),
+        (22, NULL,  5,  5, 5,       DATE_ADD(CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 109, 'Somewhere in Japan',    103, NULL,       0, 13, DATE_ADD(CURDATE(), INTERVAL +1 MONTH)),
+        (23, NULL,  8,  1, 7,       CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            101, 'address 21',            121, NULL,       0, 5,  CURDATE()),
+        (24 ,NULL,  8,  1, 7,       CURDATE(),                              CURDATE(),                                                        101, 'Bruce Wayne',           1,   NULL,       0, 5,  CURDATE());
 
 INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `description`)
     VALUES
diff --git a/e2e/paths/03-worker-module/02_time_control.spec.js b/e2e/paths/03-worker-module/02_time_control.spec.js
index 42be3e9e0..be48b13dd 100644
--- a/e2e/paths/03-worker-module/02_time_control.spec.js
+++ b/e2e/paths/03-worker-module/02_time_control.spec.js
@@ -358,7 +358,7 @@ describe('Worker time control path', () => {
             it(`should check Hank Pym doesn't have hours set on the next months first week`, async() => {
                 const wholeWeekHours = await nightmare
                     .waitToClick(selectors.workerTimeControl.nextMonthButton)
-                    .waitToClick(selectors.workerTimeControl.nextMonthButton)
+                    .waitForTextInElement(selectors.workerTimeControl.weekWorkedHours, '00:00 Hours')
                     .waitToGetProperty(selectors.workerTimeControl.weekWorkedHours, 'innerText');
 
                 expect(wholeWeekHours).toEqual('00:00 Hours');
diff --git a/e2e/paths/05-ticket-module/06_basic_data_steps.spec.js b/e2e/paths/05-ticket-module/06_basic_data_steps.spec.js
index 0f02c6af7..3dcac0765 100644
--- a/e2e/paths/05-ticket-module/06_basic_data_steps.spec.js
+++ b/e2e/paths/05-ticket-module/06_basic_data_steps.spec.js
@@ -30,6 +30,7 @@ describe('Ticket Edit basic data path', () => {
 
     it(`should confirm the zone autocomplete is enabled for the role productionBoss`, async() => {
         const disabled = await nightmare
+            .waitForSpinnerLoad()
             .wait(selectors.ticketBasicData.zoneAutocomplete)
             .evaluate(selector => {
                 return document.querySelector(selector).disabled;
diff --git a/modules/route/back/methods/route/specs/filter.spec.js b/modules/route/back/methods/route/specs/filter.spec.js
index ba32c956c..a4742c128 100644
--- a/modules/route/back/methods/route/specs/filter.spec.js
+++ b/modules/route/back/methods/route/specs/filter.spec.js
@@ -117,6 +117,6 @@ describe('Route filter()', () => {
 
         let result = await app.models.Route.filter(ctx);
 
-        expect(result.length).toEqual(4);
+        expect(result.length).toEqual(1);
     });
 });
diff --git a/modules/route/back/methods/route/specs/getTickets.spec.js b/modules/route/back/methods/route/specs/getTickets.spec.js
index 3888156b6..15028309f 100644
--- a/modules/route/back/methods/route/specs/getTickets.spec.js
+++ b/modules/route/back/methods/route/specs/getTickets.spec.js
@@ -4,6 +4,6 @@ describe('route getTickets()', () => {
     it('should return the tickets for a given route', async() => {
         let result = await app.models.Route.getTickets(2);
 
-        expect(result.length).toEqual(4);
+        expect(result.length).toEqual(1);
     });
 });
diff --git a/modules/route/back/methods/route/specs/guessPriority.spec.js b/modules/route/back/methods/route/specs/guessPriority.spec.js
index cc536787a..075ea05c8 100644
--- a/modules/route/back/methods/route/specs/guessPriority.spec.js
+++ b/modules/route/back/methods/route/specs/guessPriority.spec.js
@@ -1,7 +1,7 @@
 const app = require('vn-loopback/server/server');
 
 describe('route guessPriority()', () => {
-    const targetRouteId = 2;
+    const targetRouteId = 7;
     let routeTicketsToRestore;
 
     afterAll(async done => {
@@ -17,25 +17,23 @@ describe('route guessPriority()', () => {
     it('should confirm the tickets in the target route have no priority yet', async() => {
         routeTicketsToRestore = await app.models.Ticket.find({where: {routeFk: targetRouteId}});
 
-        expect(routeTicketsToRestore.length).toEqual(4);
+        expect(routeTicketsToRestore.length).toEqual(2);
+
+        expect(routeTicketsToRestore[0].id).toEqual(23);
         expect(routeTicketsToRestore[0].priority).toBeNull();
-        expect(routeTicketsToRestore[0].id).toEqual(7);
+        expect(routeTicketsToRestore[1].id).toEqual(24);
         expect(routeTicketsToRestore[1].priority).toBeNull();
-        expect(routeTicketsToRestore[1].id).toEqual(8);
-        expect(routeTicketsToRestore[2].priority).toBeNull();
-        expect(routeTicketsToRestore[2].id).toEqual(9);
     });
 
     it('should call guessPriority() and then check the tickets in the target route now have their priorities defined', async() => {
         await app.models.Route.guessPriority(targetRouteId);
         let routeTickets = await app.models.Ticket.find({where: {routeFk: targetRouteId}, fields: ['id', 'priority']});
 
-        expect(routeTickets.length).toEqual(4);
-        expect(routeTickets[0].priority).toEqual(1);
-        expect(routeTickets[0].id).toEqual(7);
-        expect(routeTickets[1].priority).toEqual(3);
-        expect(routeTickets[1].id).toEqual(8);
-        expect(routeTickets[2].priority).toEqual(2);
-        expect(routeTickets[2].id).toEqual(9);
+        expect(routeTickets.length).toEqual(2);
+
+        expect(routeTickets[0].id).toEqual(23);
+        expect(routeTickets[0].priority).toEqual(3);
+        expect(routeTickets[1].id).toEqual(24);
+        expect(routeTickets[1].priority).toEqual(1);
     });
 });
diff --git a/modules/route/back/methods/route/specs/summary.spec.js b/modules/route/back/methods/route/specs/summary.spec.js
index 5b31ff19f..ba976ae94 100644
--- a/modules/route/back/methods/route/specs/summary.spec.js
+++ b/modules/route/back/methods/route/specs/summary.spec.js
@@ -11,7 +11,7 @@ describe('route summary()', () => {
         const result = await app.models.Route.summary(1);
         const agency = result.route.agencyMode();
 
-        expect(agency.name).toEqual('Silla247');
+        expect(agency.name).toEqual('inhouse pickup');
     });
 
     it(`should return a summary object containing it's vehicle`, async() => {
@@ -31,6 +31,6 @@ describe('route summary()', () => {
     it(`should return a summary object containing data from the tickets`, async() => {
         const result = await app.models.Route.summary(2);
 
-        expect(result.tickets.length).toEqual(4);
+        expect(result.tickets.length).toEqual(1);
     });
 });
diff --git a/modules/route/back/methods/route/specs/updateVolume.spec.js b/modules/route/back/methods/route/specs/updateVolume.spec.js
index 75ee3c139..a1ff67acc 100644
--- a/modules/route/back/methods/route/specs/updateVolume.spec.js
+++ b/modules/route/back/methods/route/specs/updateVolume.spec.js
@@ -10,8 +10,8 @@ describe('route updateVolume()', () => {
 
 
     afterAll(async done => {
-        await originalRoute.updateAttributes({m3: 2.7});
-        await ticketToRestore.updateAttributes({routeFk: 2});
+        await originalRoute.updateAttributes({m3: 1.8});
+        await ticketToRestore.updateAttributes({routeFk: null});
         await app.models.RouteLog.destroyById(logIdToDestroy);
         done();
     });
@@ -19,12 +19,12 @@ describe('route updateVolume()', () => {
     it('should confirm the original volume of the route is the expected', async() => {
         originalRoute = await app.models.Route.findById(routeId);
 
-        expect(originalRoute.m3).toEqual(2.7);
+        expect(originalRoute.m3).toEqual(1.8);
     });
 
     it('should confirm the route volume is updated when a ticket is added', async() => {
-        ticketToRestore = await app.models.Ticket.findById(8);
-        let updatedTicket = await app.models.Ticket.findById(8);
+        ticketToRestore = await app.models.Ticket.findById(14);
+        let updatedTicket = await app.models.Ticket.findById(14);
 
         await updatedTicket.updateAttributes({routeFk: routeId});
         await app.models.Route.updateVolume(ctx, routeId);
@@ -36,8 +36,9 @@ describe('route updateVolume()', () => {
 
     it('should confirm the change is logged', async() => {
         let logs = await app.models.RouteLog.find({fields: ['id', 'newInstance']});
+
         let m3Log = logs.filter(log => {
-            return log.newInstance.m3 === 3.1;
+            return log.newInstance.m3 === 1.9;
         });
         logIdToDestroy = m3Log[0].id;
 

From 7a89ab533567b29e0999587d27d513e403721905 Mon Sep 17 00:00:00 2001
From: Bernat <bernat.verdnatura@gmail.com>
Date: Fri, 18 Oct 2019 08:36:33 +0200
Subject: [PATCH 21/41] #1778 Refactor worker.phone

---
 back/model-config.json                        |  9 ++++
 .../worker/back => back}/models/user-log.json |  0
 .../back => back}/models/user-phone-type.json |  0
 back/models/user-phone.js                     |  9 ++++
 .../back => back}/models/user-phone.json      |  9 +++-
 db/changes/10100-AllSaints/00-userLog.sql     |  4 +-
 db/changes/10100-AllSaints/01-userPhone.sql   |  4 +-
 db/dump/fixtures.sql                          | 44 ++++++++++++++-
 loopback/locale/es.json                       |  3 +-
 modules/item/front/tags/index.js              |  2 +-
 modules/worker/back/model-config.json         |  9 ----
 modules/worker/back/models/worker.json        |  6 +++
 modules/worker/front/basic-data/index.html    |  8 ---
 modules/worker/front/card/index.js            |  6 +++
 modules/worker/front/descriptor/index.html    |  5 +-
 modules/worker/front/index.js                 |  1 +
 modules/worker/front/phones/index.html        | 54 +++++++++++++++++++
 modules/worker/front/phones/index.js          | 46 ++++++++++++++++
 modules/worker/front/phones/locale/es.yml     |  4 ++
 modules/worker/front/routes.json              | 12 ++++-
 modules/worker/front/summary/index.html       |  5 +-
 modules/worker/front/summary/index.js         |  6 +++
 22 files changed, 215 insertions(+), 31 deletions(-)
 rename {modules/worker/back => back}/models/user-log.json (100%)
 rename {modules/worker/back => back}/models/user-phone-type.json (100%)
 create mode 100644 back/models/user-phone.js
 rename {modules/worker/back => back}/models/user-phone.json (75%)
 create mode 100644 modules/worker/front/phones/index.html
 create mode 100644 modules/worker/front/phones/index.js
 create mode 100644 modules/worker/front/phones/locale/es.yml

diff --git a/back/model-config.json b/back/model-config.json
index b24226507..89f517812 100644
--- a/back/model-config.json
+++ b/back/model-config.json
@@ -52,6 +52,15 @@
     },
     "Postcode": {
         "dataSource": "vn"
+    },
+    "UserPhoneType": {
+        "dataSource": "vn"
+    },
+    "UserPhone": {
+        "dataSource": "vn"
+    },
+    "UserLog": {
+        "dataSource": "vn"
     }
 }
 
diff --git a/modules/worker/back/models/user-log.json b/back/models/user-log.json
similarity index 100%
rename from modules/worker/back/models/user-log.json
rename to back/models/user-log.json
diff --git a/modules/worker/back/models/user-phone-type.json b/back/models/user-phone-type.json
similarity index 100%
rename from modules/worker/back/models/user-phone-type.json
rename to back/models/user-phone-type.json
diff --git a/back/models/user-phone.js b/back/models/user-phone.js
new file mode 100644
index 000000000..6f6c20049
--- /dev/null
+++ b/back/models/user-phone.js
@@ -0,0 +1,9 @@
+let UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    Self.rewriteDbError(function(err) {
+        if (err.code === 'ER_DUP_ENTRY')
+            return new UserError(`This phone already exists`);
+        return err;
+    });
+};
diff --git a/modules/worker/back/models/user-phone.json b/back/models/user-phone.json
similarity index 75%
rename from modules/worker/back/models/user-phone.json
rename to back/models/user-phone.json
index c869a808d..f264ff28f 100644
--- a/modules/worker/back/models/user-phone.json
+++ b/back/models/user-phone.json
@@ -2,7 +2,8 @@
     "name": "UserPhone",
     "base": "Loggable",
 	"log": {
-		"model":"UserLog"
+        "model":"UserLog",
+        "relation": "user"
 	},
     "options": {
         "mysql": {
@@ -12,11 +13,15 @@
     "properties": {
         "id": {
             "id": true,
-            "type": "String"
+            "type": "Number"
         },
         "phone": {
             "type": "Number",
             "required": true
+        },
+        "typeFk": {
+            "type": "String",
+            "required": true
         }
     },
 	"relations": {
diff --git a/db/changes/10100-AllSaints/00-userLog.sql b/db/changes/10100-AllSaints/00-userLog.sql
index 2e541eaf4..f6972796d 100644
--- a/db/changes/10100-AllSaints/00-userLog.sql
+++ b/db/changes/10100-AllSaints/00-userLog.sql
@@ -1,6 +1,6 @@
 CREATE TABLE `vn`.`userLog` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `originFk` int(11) NOT NULL,
+  `originFk` int(10) unsigned NOT NULL,
   `userFk` int(10) unsigned DEFAULT NULL,
   `action` set('insert','update','delete') COLLATE utf8_unicode_ci NOT NULL,
   `creationDate` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
@@ -13,6 +13,6 @@ CREATE TABLE `vn`.`userLog` (
   PRIMARY KEY (`id`),
   KEY `originFk` (`originFk`),
   KEY `userFk` (`userFk`),
-  CONSTRAINT `userLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `client` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `userLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `userLog_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/db/changes/10100-AllSaints/01-userPhone.sql b/db/changes/10100-AllSaints/01-userPhone.sql
index 488bbb112..e82b48000 100644
--- a/db/changes/10100-AllSaints/01-userPhone.sql
+++ b/db/changes/10100-AllSaints/01-userPhone.sql
@@ -2,7 +2,7 @@ CREATE TABLE `vn`.`userPhone` (
   `id` INT NOT NULL AUTO_INCREMENT,
   `userFk` INT(10) UNSIGNED NOT NULL,
   `typeFk` VARCHAR(45) NOT NULL,
-  `phone` INT(15) NOT NULL,
+  `phone` VARCHAR(15) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE INDEX `UserFK_Phone` (`userFk` ASC, `phone` ASC));
 
@@ -22,7 +22,7 @@ ADD CONSTRAINT `fgnUserFk`
   ON UPDATE CASCADE;
   
 insert into vn.userPhone(userFk,typeFk,phone)
-	select id,'PersonalPhone', phone
+	select id,'personalPhone', phone
 		from vn.client
         where phone is not null;
 
diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index 2624f1768..619e5ae2c 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -1862,4 +1862,46 @@ INSERT INTO `vn`.`queuePriority`(`id`, `priority`)
     VALUES
         (1, 'Alta'),
         (2, 'Normal'),
-        (3, 'Baja');
\ No newline at end of file
+        (3, 'Baja');
+
+-- Fixtures para userPhone, #1814
+
+insert into vn.userPhone(userFk,typeFk,phone)
+	select id,'personalPhone', phone
+		from vn.client
+        where phone is not null;
+        
+insert into vn.userPhone(userFk,typeFk,phone)
+	select id,'businessPhone', phone
+		from vn.worker
+        where phone is not null AND phone > '';
+
+insert into vn.userPhone(userFk,typeFk,phone)
+    SELECT 
+        `w`.`userFk`,
+        'businessPhone',
+        `m`.`value` AS `mediaValue`
+    FROM
+        (((((`postgresql`.`person` `p`
+        JOIN `postgresql`.`profile` `po` ON ((`po`.`person_id` = `p`.`person_id`)))
+        JOIN `postgresql`.`profile_media` `pom` ON ((`pom`.`profile_id` = `po`.`profile_id`)))
+        JOIN `postgresql`.`media` `m` ON ((`m`.`media_id` = `pom`.`media_id`)))
+        JOIN `postgresql`.`media_type` `mt` ON ((`mt`.`media_type_id` = `m`.`media_type_id`)))
+        JOIN `vn`.`worker` `w` ON ((`w`.`id` = `p`.`id_trabajador`)))
+            WHERE
+        (`mt`.`name` = 'movil empresa');
+
+insert into vn.userPhone(userFk,typeFk,phone)
+    SELECT 
+        `w`.`userFk`,
+        'personalPhone',
+        `m`.`value` AS `mediaValue`
+    FROM
+        (((((`postgresql`.`person` `p`
+        JOIN `postgresql`.`profile` `po` ON ((`po`.`person_id` = `p`.`person_id`)))
+        JOIN `postgresql`.`profile_media` `pom` ON ((`pom`.`profile_id` = `po`.`profile_id`)))
+        JOIN `postgresql`.`media` `m` ON ((`m`.`media_id` = `pom`.`media_id`)))
+        JOIN `postgresql`.`media_type` `mt` ON ((`mt`.`media_type_id` = `m`.`media_type_id`)))
+        JOIN `vn`.`worker` `w` ON ((`w`.`id` = `p`.`id_trabajador`)))
+            WHERE
+        (`mt`.`name` = 'movil personal');
\ No newline at end of file
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index a6904074a..587d5e9c4 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -109,5 +109,6 @@
 	"is invalid": "is invalid",
 	"The postcode doesn't exists. Ensure you put the correct format": "El código postal no existe. Asegúrate de ponerlo con el formato correcto",
 	"The department name can't be repeated": "El nombre del departamento no puede repetirse",
-	"You can't create a claim for a removed ticket": "No puedes crear una reclamación para un ticket eliminado"
+	"You can't create a claim for a removed ticket": "No puedes crear una reclamación para un ticket eliminado",
+	"This phone already exists": "Este teléfono ya existe"
 }
\ No newline at end of file
diff --git a/modules/item/front/tags/index.js b/modules/item/front/tags/index.js
index b187e5baf..c5e120d82 100644
--- a/modules/item/front/tags/index.js
+++ b/modules/item/front/tags/index.js
@@ -66,7 +66,7 @@ class Controller {
         this.$scope.watcher.check();
         this.$scope.model.save().then(() => {
             this.$scope.watcher.notifySaved();
-            this.$scope.model.refresh();
+            this.$scope.watcher.updateOriginalData();
             this.card.reload();
         });
     }
diff --git a/modules/worker/back/model-config.json b/modules/worker/back/model-config.json
index df2b776fb..35a039d3c 100644
--- a/modules/worker/back/model-config.json
+++ b/modules/worker/back/model-config.json
@@ -49,14 +49,5 @@
     },
     "Device": {
         "dataSource": "vn"
-    },
-    "UserPhoneType": {
-        "dataSource": "vn"
-    },
-    "UserPhone": {
-        "dataSource": "vn"
-    },
-    "UserLog": {
-        "dataSource": "vn"
     }
 }
diff --git a/modules/worker/back/models/worker.json b/modules/worker/back/models/worker.json
index 7456a3caa..c5c770fcd 100644
--- a/modules/worker/back/models/worker.json
+++ b/modules/worker/back/models/worker.json
@@ -54,6 +54,12 @@
             "type": "hasMany",
             "model": "WorkerTeamCollegues",
             "foreignKey": "workerFk"
+        },
+        "phones": {
+            "type": "hasMany",
+            "model": "UserPhone",
+            "foreignKey": "userFk",
+            "primaryKey": "userFk"
         }
     }
 }
\ No newline at end of file
diff --git a/modules/worker/front/basic-data/index.html b/modules/worker/front/basic-data/index.html
index 7303bccc1..0ba32eff9 100644
--- a/modules/worker/front/basic-data/index.html
+++ b/modules/worker/front/basic-data/index.html
@@ -23,14 +23,6 @@
                     rule>
                 </vn-textfield>
             </vn-horizontal>
-            <vn-horizontal>
-                <vn-textfield
-                    vn-one 
-                    label="Phone" 
-                    ng-model="$ctrl.worker.phone"
-                    rule>
-                </vn-textfield>
-            </vn-horizontal>
         </vn-vertical>
     </vn-card>
     <vn-button-bar>
diff --git a/modules/worker/front/card/index.js b/modules/worker/front/card/index.js
index 5e1e33510..eefa6360a 100644
--- a/modules/worker/front/card/index.js
+++ b/modules/worker/front/card/index.js
@@ -40,6 +40,12 @@ class Controller {
                             relation: 'department'
                         }
                     }
+                }, {
+                    relation: 'phones',
+                    scope: {
+                        fields: ['phone'],
+                        order: 'typeFk ASC'
+                    }
                 }
             ]
         };
diff --git a/modules/worker/front/descriptor/index.html b/modules/worker/front/descriptor/index.html
index 5bb9b22e5..0ff8563c5 100644
--- a/modules/worker/front/descriptor/index.html
+++ b/modules/worker/front/descriptor/index.html
@@ -26,8 +26,9 @@
             <vn-label-value label="Department" 
                 value="{{$ctrl.worker.department.department.name}}">
             </vn-label-value>
-            <vn-label-value label="Phone" 
-                value="{{$ctrl.worker.phone}}">
+            <vn-label-value ng-repeat ="phone in $ctrl.worker.phones"
+                label="Phone" 
+                value="{{phone.phone}}">
             </vn-label-value>
             <vn-label-value label="Extension" 
                 value="{{$ctrl.worker.sip.extension}}">
diff --git a/modules/worker/front/index.js b/modules/worker/front/index.js
index 71c529ea8..6f4a7fe34 100644
--- a/modules/worker/front/index.js
+++ b/modules/worker/front/index.js
@@ -12,3 +12,4 @@ import './department';
 import './calendar';
 import './time-control';
 import './log';
+import './phones';
diff --git a/modules/worker/front/phones/index.html b/modules/worker/front/phones/index.html
new file mode 100644
index 000000000..2c172bc2f
--- /dev/null
+++ b/modules/worker/front/phones/index.html
@@ -0,0 +1,54 @@
+<vn-crud-model
+    url="/api/UserPhoneTypes"
+    data="phoneTypes"
+    auto-load="true">
+</vn-crud-model>
+<vn-crud-model
+    vn-id="model"
+    url="/api/UserPhones"
+    data="$ctrl.phones">
+</vn-crud-model>
+<vn-watcher
+    vn-id="watcher"
+    data="$ctrl.phones">
+</vn-watcher>
+<form name="form" ng-submit="$ctrl.onSubmit()" compact>
+    <vn-card class="vn-pa-lg">
+        <vn-horizontal ng-repeat="workerPhone in $ctrl.phones">
+            <vn-autocomplete
+            vn-one
+            ng-model="workerPhone.typeFk"
+            initial-data="workerPhone.typeFk"
+            data ="phoneTypes"
+            show-field="code"
+            value-field="code"
+            label="Type"
+            vn-focus>
+            </vn-autocomplete>
+            <vn-textfield
+                vn-one
+                label="Phone"
+                ng-model="workerPhone.phone">
+            </vn-textfield>
+            <vn-none>
+                <vn-icon-button
+                    vn-tooltip="Remove phone"
+                    icon="delete"
+                    ng-click="model.remove($index)"
+                    tabindex="-1">
+                </vn-icon-button>
+            </vn-none>
+        </vn-horizontal>
+        <vn-one>
+            <vn-icon-button
+                vn-bind="+"
+                vn-tooltip="Add phone"
+                icon="add_circle"
+                ng-click="$ctrl.add()">
+            </vn-icon-button>
+        </vn-one>
+    </vn-card>
+    <vn-button-bar>
+        <vn-submit label="Save"></vn-submit>
+    </vn-button-bar>
+</form>
diff --git a/modules/worker/front/phones/index.js b/modules/worker/front/phones/index.js
new file mode 100644
index 000000000..b4eb8df71
--- /dev/null
+++ b/modules/worker/front/phones/index.js
@@ -0,0 +1,46 @@
+import ngModule from '../module';
+
+class Controller {
+    constructor($scope, $stateParams) {
+        this.$scope = $scope;
+        this.$stateParams = $stateParams;
+    }
+
+    get worker() {
+        return this._worker;
+    }
+
+    set worker(value) {
+        this._worker = value;
+        if (value) {
+            this.$scope.$applyAsync(()=> {
+                this.$scope.model.link = {userFk: value.userFk};
+                this.$scope.model.refresh();
+            });
+        }
+    }
+
+    onSubmit() {
+        this.$scope.watcher.check();
+        this.$scope.model.save().then(() => {
+            this.$scope.watcher.updateOriginalData();
+            this.$scope.watcher.notifySaved();
+            this.card.reload();
+        });
+    }
+
+    add() {
+        this.$scope.model.insert();
+    }
+}
+
+Controller.$inject = ['$scope', '$stateParams'];
+
+ngModule.component('vnWorkerPhones', {
+    template: require('./index.html'),
+    controller: Controller,
+    require: {card: '^vnWorkerCard'},
+    bindings: {
+        worker: '<'
+    }
+});
diff --git a/modules/worker/front/phones/locale/es.yml b/modules/worker/front/phones/locale/es.yml
new file mode 100644
index 000000000..8628f38ee
--- /dev/null
+++ b/modules/worker/front/phones/locale/es.yml
@@ -0,0 +1,4 @@
+Phones: Teléfonos
+Type: Tipo
+Remove phone: Eliminar teléfono
+Add phone: Añadir teléfono
\ No newline at end of file
diff --git a/modules/worker/front/routes.json b/modules/worker/front/routes.json
index 1b4f9ec2a..c92ccc94d 100644
--- a/modules/worker/front/routes.json
+++ b/modules/worker/front/routes.json
@@ -7,7 +7,8 @@
         {"state": "worker.card.basicData", "icon": "settings"},
         {"state": "worker.card.pbx", "icon": "icon-pbx"},
         {"state": "worker.card.calendar", "icon": "icon-calendar"},
-        {"state": "worker.card.timeControl", "icon": "access_time"}
+        {"state": "worker.card.timeControl", "icon": "access_time"},
+        {"state": "worker.card.phones", "icon": "icon-pbx"}
     ],
     "routes": [
         {
@@ -79,6 +80,15 @@
             "state": "worker.department",
             "component": "vn-worker-department",
             "description": "Departments"
+        }, 
+        {
+            "url": "/phones",
+            "state": "worker.card.phones",
+            "component": "vn-worker-phones",
+            "description": "Phones",
+            "params": {
+                "worker": "$ctrl.worker"
+            }
         }
     ]
 }
\ No newline at end of file
diff --git a/modules/worker/front/summary/index.html b/modules/worker/front/summary/index.html
index e2c93ea48..de86c1f84 100644
--- a/modules/worker/front/summary/index.html
+++ b/modules/worker/front/summary/index.html
@@ -12,8 +12,9 @@
             <vn-label-value label="Department" 
                 value="{{worker.department.department.name}}">
             </vn-label-value>
-            <vn-label-value label="Phone" 
-                value="{{worker.phone}}">
+            <vn-label-value ng-repeat = "phone in worker.phones"
+                label="Phone"
+                value="{{phone.phone}}">
             </vn-label-value>
         </vn-one>
         <vn-one>
diff --git a/modules/worker/front/summary/index.js b/modules/worker/front/summary/index.js
index 24656d601..f9f4e688b 100644
--- a/modules/worker/front/summary/index.js
+++ b/modules/worker/front/summary/index.js
@@ -50,6 +50,12 @@ class Controller {
                             relation: 'department'
                         }
                     }
+                }, {
+                    relation: 'phones',
+                    scope: {
+                        fields: ['phone'],
+                        order: 'typeFk ASC'
+                    }
                 }
             ]
         };

From 18b0ae034c181710e771e77af248c92253efaca3 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Fri, 18 Oct 2019 09:53:30 +0200
Subject: [PATCH 22/41] #1815 - show summary correct photos on claim index

---
 e2e/helpers/selectors.js                  |   6 +-
 modules/claim/front/detail/index.html     | 152 +++++++--------
 modules/claim/front/summary/index.html    | 222 +++++++++++-----------
 modules/claim/front/summary/index.js      |  20 ++
 modules/claim/front/summary/index.spec.js |   2 +
 modules/worker/front/log/index.html       |   2 +-
 6 files changed, 215 insertions(+), 189 deletions(-)

diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index bc68f96e4..1abe93ace 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -530,13 +530,13 @@ export default {
         header: 'vn-claim-summary > vn-card > div > h5',
         state: 'vn-claim-summary vn-label-value[label="State"] > section > span',
         observation: 'vn-claim-summary vn-textarea[ng-model="$ctrl.summary.claim.observation"] textarea',
-        firstSaleItemId: 'vn-claim-summary vn-horizontal > vn-auto:nth-child(4) > vn-table > div > vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(1) > span',
+        firstSaleItemId: 'vn-claim-summary vn-horizontal > vn-auto:nth-child(4) vn-table > div > vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(1) > span',
         firstSaleDescriptorImage: '.vn-popover.shown vn-item-descriptor img',
         itemDescriptorPopover: '.vn-popover.shown vn-item-descriptor',
         itemDescriptorPopoverItemDiaryButton: '.vn-popover.shown vn-item-descriptor a[href="#!/item/2/diary"]',
-        firstDevelopmentWorker: 'vn-claim-summary vn-horizontal > vn-auto:nth-child(5) > vn-table > div > vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(4) > span',
+        firstDevelopmentWorker: 'vn-claim-summary vn-horizontal > vn-auto:nth-child(5) vn-table > div > vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(4) > span',
         firstDevelopmentWorkerGoToClientButton: '.vn-popover.shown vn-worker-descriptor div.quicklinks > a[href="#!/client/21/summary"]',
-        firstActionTicketId: 'vn-claim-summary > vn-card > div > vn-horizontal > vn-auto:nth-child(6) > vn-table > div > vn-tbody > vn-tr > vn-td:nth-child(2) > span',
+        firstActionTicketId: 'vn-claim-summary > vn-card > div > vn-horizontal > vn-auto:nth-child(6) vn-table > div > vn-tbody > vn-tr > vn-td:nth-child(2) > span',
         firstActionTicketDescriptor: '.vn-popover.shown vn-ticket-descriptor'
     },
     claimBasicData: {
diff --git a/modules/claim/front/detail/index.html b/modules/claim/front/detail/index.html
index 90e7b5914..4a5767194 100644
--- a/modules/claim/front/detail/index.html
+++ b/modules/claim/front/detail/index.html
@@ -1,84 +1,84 @@
-<vn-crud-model
-    auto-load="false"
-    vn-id="model"
+<vn-crud-model vn-id="model" 
+    auto-load="true"
     url="claim/api/ClaimBeginnings"
     filter="$ctrl.filter"
     data="$ctrl.salesClaimed"
     on-data-change="$ctrl.calculateTotals()">
 </vn-crud-model>
-<vn-vertical>
-    <vn-card class="vn-pa-lg">
-        <vn-vertical>
-            <vn-horizontal>
-                <div class="totalBox">
-                    <vn-label-value label="Total" 
-                        value="{{$ctrl.paidTotal | currency: 'EUR':2}}">
-                    </vn-label-value>
-                    <vn-label-value label="Total claimed" 
-                        value="{{$ctrl.claimedTotal | currency: 'EUR':2}}">
-                    </vn-label-value>
-                </div>
-            </vn-horizontal>
-            <vn-table model="model">
-                <vn-thead>
-                    <vn-tr>
-                        <vn-th center>Landed</vn-th>
-                        <vn-th number>Quantity</vn-th>
-                        <vn-th>Claimed</vn-th>
-                        <vn-th>Description</vn-th>
-                        <vn-th number>Price</vn-th>
-                        <vn-th number>Disc.</vn-th>
-                        <vn-th number>Total</vn-th>
-                        <vn-th></vn-th>
-                    </vn-tr>
-                </vn-thead>
-                <vn-tbody>
-                    <vn-tr ng-repeat="saleClaimed in $ctrl.salesClaimed" vn-repeat-last>
-                        <vn-td center>{{::saleClaimed.sale.ticket.landed | dateTime:'dd/MM/yyyy'}}</vn-td>
-                        <vn-td number>{{::saleClaimed.sale.quantity}}</vn-td>
-                        <vn-td>
-                            <vn-input-number
-                                vn-focus min="0"
-                                step="1"
-                                ng-model="saleClaimed.quantity"
-                                on-change="$ctrl.setClaimedQuantity(saleClaimed.id, saleClaimed.quantity)">
-                            </vn-input-number>
-                        </vn-td>
-                        <vn-td expand title="{{::saleClaimed.sale.concept}}">
-                            <span 
-                                class="link"
-                                ng-click="$ctrl.showItemDescriptor($event, saleClaimed.sale.itemFk)">
-                                {{::saleClaimed.sale.concept}}
-                            </span>
-                        </vn-td>
-                        <vn-td number>{{::saleClaimed.sale.price | currency: 'EUR':2}}</vn-td>
-                        <vn-td number>
-                            <span class="link"
-                                vn-tooltip="Edit discount"
-                                ng-click="$ctrl.showEditPopover($event, saleClaimed)">
-                                {{::saleClaimed.sale.discount}} %
-                            </span>
-                        </vn-td>
-                        <vn-td number>
-                            {{::$ctrl.getSaleTotal(saleClaimed.sale) | currency: 'EUR':2}}
-                        </vn-td>
-                        <vn-td shrink>
-                            <vn-icon-button
-                                vn-tooltip="Remove sale"
-                                icon="delete"
-                                ng-click="$ctrl.deleteClaimedSale($index)"
-                                tabindex="-1">
-                            </vn-icon-button>
-                        </vn-td>
-                    </vn-tr>
-                </vn-tbody>
-            </vn-table>
-        </vn-vertical>
-    </vn-card>
-    <a ng-click="$ctrl.openAddSalesDialog()" vn-tooltip="Add sale item" vn-bind="+" fixed-bottom-right>
-        <vn-float-button icon="add"></vn-float-button>
-    </a>
-</vn-vertical>
+
+<vn-card class="vn-mb-md vn-pa-lg vn-w-lg" style="text-align: right" 
+    ng-if="$ctrl.salesClaimed.length > 0">
+    <vn-label-value label="Total" 
+        value="{{$ctrl.paidTotal | currency: 'EUR':2}}">
+    </vn-label-value>
+    <vn-label-value label="Total claimed" 
+        value="{{$ctrl.claimedTotal | currency: 'EUR':2}}">
+    </vn-label-value>
+</vn-card>
+
+<vn-card class="vn-pa-lg">
+    <vn-data-viewer model="model">
+        <vn-table model="model">
+            <vn-thead>
+                <vn-tr>
+                    <vn-th center>Landed</vn-th>
+                    <vn-th number>Quantity</vn-th>
+                    <vn-th>Claimed</vn-th>
+                    <vn-th>Description</vn-th>
+                    <vn-th number>Price</vn-th>
+                    <vn-th number>Disc.</vn-th>
+                    <vn-th number>Total</vn-th>
+                    <vn-th></vn-th>
+                </vn-tr>
+            </vn-thead>
+            <vn-tbody>
+                <vn-tr ng-repeat="saleClaimed in $ctrl.salesClaimed" vn-repeat-last>
+                    <vn-td center>{{::saleClaimed.sale.ticket.landed | dateTime:'dd/MM/yyyy'}}</vn-td>
+                    <vn-td number>{{::saleClaimed.sale.quantity}}</vn-td>
+                    <vn-td>
+                        <vn-input-number
+                            vn-focus min="0"
+                            step="1"
+                            ng-model="saleClaimed.quantity"
+                            on-change="$ctrl.setClaimedQuantity(saleClaimed.id, saleClaimed.quantity)">
+                        </vn-input-number>
+                    </vn-td>
+                    <vn-td expand title="{{::saleClaimed.sale.concept}}">
+                        <span 
+                            class="link"
+                            ng-click="$ctrl.showItemDescriptor($event, saleClaimed.sale.itemFk)">
+                            {{::saleClaimed.sale.concept}}
+                        </span>
+                    </vn-td>
+                    <vn-td number>{{::saleClaimed.sale.price | currency: 'EUR':2}}</vn-td>
+                    <vn-td number>
+                        <span class="link"
+                            vn-tooltip="Edit discount"
+                            ng-click="$ctrl.showEditPopover($event, saleClaimed)">
+                            {{::saleClaimed.sale.discount}} %
+                        </span>
+                    </vn-td>
+                    <vn-td number>
+                        {{::$ctrl.getSaleTotal(saleClaimed.sale) | currency: 'EUR':2}}
+                    </vn-td>
+                    <vn-td shrink>
+                        <vn-icon-button
+                            vn-tooltip="Remove sale"
+                            icon="delete"
+                            ng-click="$ctrl.deleteClaimedSale($index)"
+                            tabindex="-1">
+                        </vn-icon-button>
+                    </vn-td>
+                </vn-tr>
+            </vn-tbody>
+        </vn-table>
+    </vn-data-viewer>
+</vn-card>
+
+<a ng-click="$ctrl.openAddSalesDialog()" vn-tooltip="Add sale item" vn-bind="+" fixed-bottom-right>
+    <vn-float-button icon="add"></vn-float-button>
+</a>
+
 <!-- Add Lines Dialog -->
 <vn-dialog vn-id="add-sales" class="modal-form">
     <tpl-body>
diff --git a/modules/claim/front/summary/index.html b/modules/claim/front/summary/index.html
index 314d71bc9..8d837dd73 100644
--- a/modules/claim/front/summary/index.html
+++ b/modules/claim/front/summary/index.html
@@ -1,11 +1,9 @@
-<vn-crud-model
+<vn-crud-model vn-id="model"
     url="/api/ClaimDms"
-    where="{claimFk: $ctrl.$stateParams.id}"
-    data="photos"
-    auto-load="true">
+    data="photos">
 </vn-crud-model>
 <vn-card class="summary">
-    <h5>{{$ctrl.summary.claim.id}} - {{$ctrl.summary.claim.client.name}}</h5>
+    <h5>{{::$ctrl.summary.claim.id}} - {{::$ctrl.summary.claim.client.name}}</h5>
     <vn-horizontal>
         <vn-one>
             <vn-label-value label="Created" 
@@ -43,41 +41,43 @@
         </vn-one>
         <vn-auto>
             <h4 translate>Detail</h4>
-            <vn-table model="model">
-                <vn-thead>
-                    <vn-tr>
-                        <vn-th number>Item</vn-th>
-                        <vn-th>Landed</vn-th>
-                        <vn-th number>Quantity</vn-th>
-                        <vn-th number>Claimed</vn-th>
-                        <vn-th>Description</vn-th>
-                        <vn-th number>Price</vn-th>
-                        <vn-th number>Disc.</vn-th>
-                        <vn-th number>Total</vn-th>
-                    </vn-tr>
-                </vn-thead>
-                <vn-tbody>
-                    <vn-tr ng-repeat="saleClaimed in $ctrl.summary.salesClaimed">
-                        <vn-td number>
-                            <span 
-                                ng-click="$ctrl.showItemDescriptor($event, saleClaimed.sale.itemFk)"
-                                class="link">
-                                {{saleClaimed.sale.itemFk | zeroFill:6}}
-                            </span>
-                        </vn-td>
-                        <vn-td>{{saleClaimed.sale.ticket.landed | dateTime: 'dd/MM/yyyy'}}</vn-td>
-                        <vn-td number>{{saleClaimed.sale.quantity}}</vn-td>
-                        <vn-td number>{{saleClaimed.quantity}}</vn-td>
-                        <vn-td expand>{{saleClaimed.sale.concept}}</vn-td>
-                        <vn-td number>{{saleClaimed.sale.price | currency: 'EUR':2}}</vn-td>
-                        <vn-td number>{{saleClaimed.sale.discount}} %</vn-td>
-                        <vn-td number>
-                            {{saleClaimed.sale.quantity * saleClaimed.sale.price * 
-                                ((100 - saleClaimed.sale.discount) / 100) | currency: 'EUR':2}}
-                        </vn-td>
-                    </vn-tr>
-                </vn-tbody>
-            </vn-table>
+            <vn-data-viewer data="::$ctrl.summary.salesClaimed">
+                <vn-table>
+                    <vn-thead>
+                        <vn-tr>
+                            <vn-th number>Item</vn-th>
+                            <vn-th>Landed</vn-th>
+                            <vn-th number>Quantity</vn-th>
+                            <vn-th number>Claimed</vn-th>
+                            <vn-th>Description</vn-th>
+                            <vn-th number>Price</vn-th>
+                            <vn-th number>Disc.</vn-th>
+                            <vn-th number>Total</vn-th>
+                        </vn-tr>
+                    </vn-thead>
+                    <vn-tbody>
+                        <vn-tr ng-repeat="saleClaimed in $ctrl.summary.salesClaimed">
+                            <vn-td number>
+                                <span 
+                                    ng-click="$ctrl.showItemDescriptor($event, saleClaimed.sale.itemFk)"
+                                    class="link">
+                                    {{::saleClaimed.sale.itemFk | zeroFill:6}}
+                                </span>
+                            </vn-td>
+                            <vn-td>{{::saleClaimed.sale.ticket.landed | dateTime: 'dd/MM/yyyy'}}</vn-td>
+                            <vn-td number>{{::saleClaimed.sale.quantity}}</vn-td>
+                            <vn-td number>{{::saleClaimed.quantity}}</vn-td>
+                            <vn-td expand>{{::saleClaimed.sale.concept}}</vn-td>
+                            <vn-td number>{{::saleClaimed.sale.price | currency: 'EUR':2}}</vn-td>
+                            <vn-td number>{{::saleClaimed.sale.discount}} %</vn-td>
+                            <vn-td number>
+                                {{saleClaimed.sale.quantity * saleClaimed.sale.price * 
+                                    ((100 - saleClaimed.sale.discount) / 100) | currency: 'EUR':2}}
+                            </vn-td>
+                        </vn-tr>
+                    </vn-tbody>
+                </vn-table>
+            </vn-data-viewer>
         </vn-auto>
         <vn-auto ng-if="photos.length > 0">
             <h4 translate>Photos</h4>
@@ -92,78 +92,82 @@
         </vn-auto>
         <vn-auto>
             <h4 translate>Development</h4>
-            <vn-table model="model">
-                <vn-thead>
-                    <vn-tr>
-                        <vn-th>Reason</vn-th>
-                        <vn-th>Result</vn-th>
-                        <vn-th>Responsible</vn-th>
-                        <vn-th>Worker</vn-th>
-                        <vn-th>Redelivery</vn-th>
-                    </vn-tr>
-                </vn-thead>
-                <vn-tbody>
-                    <vn-tr ng-repeat="development in $ctrl.summary.developments">
-                        <vn-td>{{development.claimReason.description}}</vn-td>
-                        <vn-td>{{development.claimResult.description}}</vn-td>
-                        <vn-td>{{development.claimResponsible.description}}</vn-td>
-                        <vn-td expand>
-                            <span 
-                                class="link" 
-                                ng-click="$ctrl.showWorkerDescriptor($event, development.workerFk)">
-                                {{::development.worker.user.nickname}}
-                            </span>
-                        </vn-td>
-                        <vn-td>{{development.claimRedelivery.description}}</vn-td>
-                    </vn-tr>
-                </vn-tbody>
-            </vn-table>
+            <vn-data-viewer data="::$ctrl.summary.developments">
+                <vn-table>
+                    <vn-thead>
+                        <vn-tr>
+                            <vn-th>Reason</vn-th>
+                            <vn-th>Result</vn-th>
+                            <vn-th>Responsible</vn-th>
+                            <vn-th>Worker</vn-th>
+                            <vn-th>Redelivery</vn-th>
+                        </vn-tr>
+                    </vn-thead>
+                    <vn-tbody>
+                        <vn-tr ng-repeat="development in $ctrl.summary.developments">
+                            <vn-td>{{::development.claimReason.description}}</vn-td>
+                            <vn-td>{{::development.claimResult.description}}</vn-td>
+                            <vn-td>{{::development.claimResponsible.description}}</vn-td>
+                            <vn-td expand>
+                                <span 
+                                    class="link" 
+                                    ng-click="$ctrl.showWorkerDescriptor($event, development.workerFk)">
+                                    {{::development.worker.user.nickname}}
+                                </span>
+                            </vn-td>
+                            <vn-td>{{::development.claimRedelivery.description}}</vn-td>
+                        </vn-tr>
+                    </vn-tbody>
+                </vn-table>
+            </vn-data-viewer>
         </vn-auto>
         <vn-auto>
             <h4 translate>Action</h4>
-            <vn-table model="model">
-                <vn-thead>
-                    <vn-tr>
-                        <vn-th number>Item</vn-th>
-                        <vn-th number>Ticket</vn-th>
-                        <vn-th>Destination</vn-th>
-                        <vn-th number>Landed</vn-th>
-                        <vn-th number>Quantity</vn-th>
-                        <vn-th>Description</vn-th>
-                        <vn-th number>Price</vn-th>
-                        <vn-th number>Disc.</vn-th>
-                        <vn-th number>Total</vn-th>
-                    </vn-tr>
-                </vn-thead>
-                <vn-tbody>
-                    <vn-tr ng-repeat="action in $ctrl.summary.actions">
-                        <vn-td number>
-                            <span 
-                                ng-click="$ctrl.showItemDescriptor($event, action.sale.itemFk)"
-                                class="link">
-                                {{action.sale.itemFk | zeroFill:6}}
-                            </span>
-                        </vn-td>
-                        <vn-td number>
-                            <span 
-                                ng-click="$ctrl.showTicketDescriptor($event, action.sale.ticket.id)"
-                                class="link">
-                                {{action.sale.ticket.id | zeroFill:6}}
-                            </span>
-                        </vn-td>
-                        <vn-td expand>{{action.claimBeggining.description}}</vn-td>
-                        <vn-td number>{{action.sale.ticket.landed | dateTime: 'dd/MM/yyyy'}}</vn-td>
-                        <vn-td number>{{action.sale.quantity}}</vn-td>
-                        <vn-td expand>{{action.sale.concept}}</vn-td>
-                        <vn-td number>{{action.sale.price}}</vn-td>
-                        <vn-td number>{{action.sale.discount}} %</vn-td>
-                        <vn-td number>
-                            {{action.sale.quantity * action.sale.price *
-                                ((100 - action.sale.discount) / 100) | currency: 'EUR':2}}
-                        </vn-td>
-                    </vn-tr>
-                </vn-tbody>
-            </vn-table>
+            <vn-data-viewer data="::$ctrl.summary.actions">
+                <vn-table>
+                    <vn-thead>
+                        <vn-tr>
+                            <vn-th number>Item</vn-th>
+                            <vn-th number>Ticket</vn-th>
+                            <vn-th>Destination</vn-th>
+                            <vn-th number>Landed</vn-th>
+                            <vn-th number>Quantity</vn-th>
+                            <vn-th>Description</vn-th>
+                            <vn-th number>Price</vn-th>
+                            <vn-th number>Disc.</vn-th>
+                            <vn-th number>Total</vn-th>
+                        </vn-tr>
+                    </vn-thead>
+                    <vn-tbody>
+                        <vn-tr ng-repeat="action in $ctrl.summary.actions">
+                            <vn-td number>
+                                <span 
+                                    ng-click="$ctrl.showItemDescriptor($event, action.sale.itemFk)"
+                                    class="link">
+                                    {{::action.sale.itemFk | zeroFill:6}}
+                                </span>
+                            </vn-td>
+                            <vn-td number>
+                                <span 
+                                    ng-click="$ctrl.showTicketDescriptor($event, action.sale.ticket.id)"
+                                    class="link">
+                                    {{::action.sale.ticket.id | zeroFill:6}}
+                                </span>
+                            </vn-td>
+                            <vn-td expand>{{::action.claimBeggining.description}}</vn-td>
+                            <vn-td number>{{::action.sale.ticket.landed | dateTime: 'dd/MM/yyyy'}}</vn-td>
+                            <vn-td number>{{::action.sale.quantity}}</vn-td>
+                            <vn-td expand>{{::action.sale.concept}}</vn-td>
+                            <vn-td number>{{::action.sale.price}}</vn-td>
+                            <vn-td number>{{::action.sale.discount}} %</vn-td>
+                            <vn-td number>
+                                {{action.sale.quantity * action.sale.price *
+                                    ((100 - action.sale.discount) / 100) | currency: 'EUR':2}}
+                            </vn-td>
+                        </vn-tr>
+                    </vn-tbody>
+                </vn-table>
+            </vn-data-viewer>
         </vn-auto>
     </vn-horizontal>
 </vn-card>
diff --git a/modules/claim/front/summary/index.js b/modules/claim/front/summary/index.js
index 257be55e0..7d9e3716f 100644
--- a/modules/claim/front/summary/index.js
+++ b/modules/claim/front/summary/index.js
@@ -9,6 +9,26 @@ class Controller {
         this.accessToken = vnToken.token;
     }
 
+    get claim() {
+        return this._claim;
+    }
+
+
+    set claim(value) {
+        this._claim = value;
+
+        // Get DMS on summary load
+        /*  if (value)
+            this.$.$applyAsync(() => this.loadDms()); */
+    }
+
+    loadDms() {
+        this.$.model.where = {
+            claimFk: this.claim.id
+        };
+        this.$.model.refresh();
+    }
+
     getSummary() {
         this.$http.get(`/claim/api/Claims/${this.claim.id}/getSummary`).then(response => {
             this.summary = response.data;
diff --git a/modules/claim/front/summary/index.spec.js b/modules/claim/front/summary/index.spec.js
index c56b91251..87b3caac0 100644
--- a/modules/claim/front/summary/index.spec.js
+++ b/modules/claim/front/summary/index.spec.js
@@ -1,4 +1,5 @@
 import './index.js';
+import crudModel from 'core/mocks/crud-model';
 
 describe('Claim', () => {
     describe('Component summary', () => {
@@ -13,6 +14,7 @@ describe('Claim', () => {
             $httpBackend = _$httpBackend_;
             controller = $componentController('vnClaimSummary');
             controller.claim = {id: 1};
+            controller.$.model = crudModel;
         }));
 
         describe('getSummary()', () => {
diff --git a/modules/worker/front/log/index.html b/modules/worker/front/log/index.html
index 4f170ac35..91166f045 100644
--- a/modules/worker/front/log/index.html
+++ b/modules/worker/front/log/index.html
@@ -88,7 +88,7 @@
                             ng-if="!log.newProperties"
                             id="description">
                             <div>
-                                <span>{{log.description}}</span>
+                                <span>{{::log.description}}</span>
                             </div>
                         </vn-one>
                     </vn-td>

From 85bcb356d4984377bd06b8f5c7e8e55911c02ac5 Mon Sep 17 00:00:00 2001
From: Bernat <bernat.verdnatura@gmail.com>
Date: Fri, 18 Oct 2019 13:52:15 +0200
Subject: [PATCH 23/41] 1778 Refactor worker.phone

---
 modules/worker/front/phones/index.js | 20 +++++++++++---------
 modules/worker/front/routes.json     |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/modules/worker/front/phones/index.js b/modules/worker/front/phones/index.js
index b4eb8df71..3810832d9 100644
--- a/modules/worker/front/phones/index.js
+++ b/modules/worker/front/phones/index.js
@@ -1,9 +1,8 @@
 import ngModule from '../module';
 
 class Controller {
-    constructor($scope, $stateParams) {
+    constructor($scope) {
         this.$scope = $scope;
-        this.$stateParams = $stateParams;
     }
 
     get worker() {
@@ -12,12 +11,15 @@ class Controller {
 
     set worker(value) {
         this._worker = value;
-        if (value) {
-            this.$scope.$applyAsync(()=> {
-                this.$scope.model.link = {userFk: value.userFk};
-                this.$scope.model.refresh();
-            });
-        }
+        if (value)
+            this.setLink(value);
+    }
+
+    setLink(value) {
+        this.$scope.$applyAsync(()=> {
+            this.$scope.model.link = {userFk: value.userFk};
+            this.$scope.model.refresh();
+        });
     }
 
     onSubmit() {
@@ -34,7 +36,7 @@ class Controller {
     }
 }
 
-Controller.$inject = ['$scope', '$stateParams'];
+Controller.$inject = ['$scope'];
 
 ngModule.component('vnWorkerPhones', {
     template: require('./index.html'),
diff --git a/modules/worker/front/routes.json b/modules/worker/front/routes.json
index c92ccc94d..e2fa9c165 100644
--- a/modules/worker/front/routes.json
+++ b/modules/worker/front/routes.json
@@ -8,7 +8,7 @@
         {"state": "worker.card.pbx", "icon": "icon-pbx"},
         {"state": "worker.card.calendar", "icon": "icon-calendar"},
         {"state": "worker.card.timeControl", "icon": "access_time"},
-        {"state": "worker.card.phones", "icon": "icon-pbx"}
+        {"state": "worker.card.phones", "icon": "contact_phone"}
     ],
     "routes": [
         {

From 457034daad102e5ae94e9d728c396dfae21c3abd Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Fri, 18 Oct 2019 21:36:30 +0200
Subject: [PATCH 24/41] Tests fixed

---
 e2e/helpers/components_selectors.js           |   6 -
 e2e/helpers/extensions.js                     |  44 +++--
 e2e/helpers/selectors.js                      | 179 +++++++++---------
 e2e/paths/01-login/01_login.spec.js           |  29 +--
 .../03_edit_fiscal_data.spec.js               |   4 +-
 .../12_lock_of_verified_data.spec.js          |   4 +-
 .../05-ticket-module/13_services.spec.js      |   4 +-
 e2e/paths/07-order-module/02_catalog.spec.js  |   2 +-
 .../01_descriptor.spec.js                     |   2 +-
 .../components/button-menu/button-menu.html   |  13 --
 front/core/components/button-menu/index.html  |  20 ++
 .../button-menu/{button-menu.js => index.js}  |  22 +--
 .../{button-menu.spec.js => index.spec.js}    |   0
 front/core/components/button-menu/style.scss  |  16 --
 front/core/components/button/button.html      |   6 -
 front/core/components/button/button.js        |  34 ----
 front/core/components/button/index.html       |  11 ++
 front/core/components/button/index.js         |  46 +++++
 front/core/components/button/style.scss       |  86 ++++++++-
 front/core/components/card/card.js            |   2 +-
 front/core/components/chip/index.html         |  15 +-
 front/core/components/chip/index.js           |  15 +-
 front/core/components/chip/index.spec.js      |  12 +-
 front/core/components/chip/style.scss         |  53 +++++-
 front/core/components/color-legend/index.html |   8 -
 front/core/components/color-legend/index.js   |  24 ---
 front/core/components/color-legend/style.scss |  13 --
 front/core/components/field/index.js          |  48 +----
 front/core/components/field/style.scss        |   4 +-
 .../components/float-button/float-button.html |   3 -
 .../components/float-button/float-button.js   |   8 -
 front/core/components/float-button/index.js   |  13 ++
 front/core/components/form-input/index.js     |  54 +++++-
 .../components/icon-button/icon-button.html   |   3 -
 .../components/icon-button/icon-button.js     |  39 ----
 front/core/components/icon-button/index.js    |  14 ++
 front/core/components/icon-button/style.scss  |  25 +--
 .../icon-focusable/icon-focusable.html        |   1 -
 .../icon-focusable/icon-focusable.js          |  29 ---
 .../core/components/icon-focusable/style.scss |  10 -
 .../core/components/icon-menu/icon-menu.html  |  11 --
 front/core/components/icon-menu/icon-menu.js  |  41 ----
 front/core/components/icon-menu/index.html    |  11 ++
 front/core/components/icon-menu/index.js      |  14 ++
 front/core/components/icon-menu/style.scss    |   8 -
 front/core/components/index.js                |  15 +-
 front/core/components/input-file/index.html   |  83 ++++----
 front/core/components/input-file/index.js     |  26 +--
 front/core/components/input-file/style.scss   | 156 +--------------
 front/core/components/input-range/index.html  |   9 -
 front/core/components/input-range/index.js    |  79 --------
 front/core/components/input-range/style.scss  |  14 --
 front/core/components/list/style.scss         |   3 +-
 .../components/multi-check/multi-check.js     |   4 +-
 front/core/components/range/index.html        |   4 +
 front/core/components/range/index.js          |  50 +++++
 front/core/components/range/style.scss        |  84 ++++++++
 .../core/components/scroll-up/scroll-up.html  |   9 +-
 front/core/components/scroll-up/style.scss    |   4 +-
 front/core/components/searchbar/style.scss    |   1 +
 front/core/components/spinner/spinner.html    |  12 +-
 front/core/components/spinner/spinner.js      |  11 +-
 front/core/components/spinner/spinner.spec.js |  36 ++--
 front/core/components/spinner/style.css       |   3 -
 front/core/components/spinner/style.scss      |  60 ++++++
 front/core/components/step-control/style.scss |   6 -
 front/core/components/submit/index.js         |  13 ++
 front/core/components/submit/submit.html      |   6 -
 front/core/components/submit/submit.js        |  25 ---
 front/core/components/td-editable/index.js    |   4 +-
 front/core/components/toggle/index.js         |  13 +-
 front/core/components/toggle/style.scss       |   3 +
 front/core/components/tooltip/tooltip.js      |   2 +-
 front/core/directives/acl.js                  | 113 +++--------
 front/core/directives/specs/acl.spec.js       | 105 +++++++---
 front/core/lib/input.js                       |  42 ----
 front/core/module.js                          |   4 +-
 front/core/styles/background.scss             |   6 +
 front/core/styles/font-family.scss            |  23 +++
 front/core/styles/global.scss                 |  40 ++++
 front/core/styles/index.js                    |   3 +-
 front/core/styles/mdl-override.scss           |  61 ------
 front/core/styles/text.scss                   |   2 -
 front/core/styles/util.scss                   |   6 +
 front/core/styles/variables.scss              |   2 +
 front/core/vendor.js                          |   7 +-
 front/package-lock.json                       |  41 ----
 front/package.json                            |   6 -
 front/salix/components/app/style.scss         |  41 ----
 front/salix/components/descriptor/index.html  |  24 +++
 front/salix/components/descriptor/index.js    |  11 ++
 front/salix/components/descriptor/style.scss  |  23 +--
 front/salix/components/home/home.html         |   2 +-
 front/salix/components/index.js               |  14 +-
 front/salix/components/login/login.html       |   2 -
 front/salix/components/main-menu/style.scss   |  12 +-
 front/salix/components/summary/style.scss     |   4 +-
 front/salix/styles/misc.scss                  |  70 ++++---
 modules/agency/front/index/index.html         |   3 +-
 modules/claim/front/action/index.html         |   8 +-
 modules/claim/front/descriptor/index.html     |  29 +--
 modules/claim/front/dms/index/index.html      |  11 +-
 modules/claim/front/summary/index.html        |   8 +-
 .../client/front/address/create/index.html    |   8 +-
 modules/client/front/basic-data/index.html    | 130 +++++++------
 .../insurance/create/index.html               |   8 +-
 modules/client/front/descriptor/index.html    |  29 +--
 .../invoiceOut/front/descriptor/index.html    |  21 +-
 modules/item/front/create/index.html          |  14 +-
 modules/item/front/descriptor/index.html      |  29 +--
 modules/item/front/index/index.html           |   3 +-
 modules/item/front/index/style.scss           |  11 --
 modules/item/front/last-entries/style.scss    |   4 -
 modules/item/front/search-panel/index.js      |   6 +-
 modules/order/front/descriptor/index.html     |  29 +--
 modules/order/front/filter/index.html         |  19 +-
 modules/order/front/filter/style.scss         |   4 +-
 modules/order/front/prices-popover/index.html |  35 +---
 modules/route/front/descriptor/index.html     |  29 +--
 modules/ticket/front/descriptor/index.html    |  38 +---
 modules/ticket/front/index/index.html         |   2 +-
 modules/ticket/front/index/style.scss         |  13 --
 modules/ticket/front/sale/index.html          |   2 -
 modules/ticket/front/sale/style.scss          |   7 -
 modules/ticket/front/services/index.html      |  17 +-
 modules/ticket/front/services/index.js        |   3 +-
 modules/ticket/front/services/index.spec.js   |   2 +-
 modules/ticket/front/summary/index.html       |   2 +
 modules/worker/front/calendar/index.html      |   9 +-
 modules/worker/front/descriptor/index.html    |   8 +-
 modules/worker/front/index/index.html         |   3 +-
 modules/worker/front/index/index.js           |   1 -
 modules/worker/front/index/style.scss         |  11 --
 133 files changed, 1259 insertions(+), 1702 deletions(-)
 delete mode 100644 e2e/helpers/components_selectors.js
 delete mode 100644 front/core/components/button-menu/button-menu.html
 create mode 100644 front/core/components/button-menu/index.html
 rename front/core/components/button-menu/{button-menu.js => index.js} (83%)
 rename front/core/components/button-menu/{button-menu.spec.js => index.spec.js} (100%)
 delete mode 100644 front/core/components/button/button.html
 delete mode 100644 front/core/components/button/button.js
 create mode 100644 front/core/components/button/index.html
 create mode 100644 front/core/components/button/index.js
 delete mode 100644 front/core/components/color-legend/index.html
 delete mode 100644 front/core/components/color-legend/index.js
 delete mode 100644 front/core/components/color-legend/style.scss
 delete mode 100644 front/core/components/float-button/float-button.html
 delete mode 100644 front/core/components/float-button/float-button.js
 create mode 100644 front/core/components/float-button/index.js
 delete mode 100644 front/core/components/icon-button/icon-button.html
 delete mode 100644 front/core/components/icon-button/icon-button.js
 create mode 100644 front/core/components/icon-button/index.js
 delete mode 100644 front/core/components/icon-focusable/icon-focusable.html
 delete mode 100644 front/core/components/icon-focusable/icon-focusable.js
 delete mode 100644 front/core/components/icon-focusable/style.scss
 delete mode 100644 front/core/components/icon-menu/icon-menu.html
 delete mode 100644 front/core/components/icon-menu/icon-menu.js
 create mode 100644 front/core/components/icon-menu/index.html
 create mode 100644 front/core/components/icon-menu/index.js
 delete mode 100644 front/core/components/icon-menu/style.scss
 delete mode 100644 front/core/components/input-range/index.html
 delete mode 100644 front/core/components/input-range/index.js
 delete mode 100644 front/core/components/input-range/style.scss
 create mode 100644 front/core/components/range/index.html
 create mode 100644 front/core/components/range/index.js
 create mode 100644 front/core/components/range/style.scss
 delete mode 100644 front/core/components/spinner/style.css
 create mode 100644 front/core/components/spinner/style.scss
 create mode 100644 front/core/components/submit/index.js
 delete mode 100644 front/core/components/submit/submit.html
 delete mode 100644 front/core/components/submit/submit.js
 delete mode 100644 front/core/lib/input.js
 create mode 100644 front/core/styles/global.scss
 delete mode 100644 front/core/styles/mdl-override.scss
 create mode 100644 front/core/styles/util.scss
 create mode 100644 front/salix/components/descriptor/index.html
 delete mode 100644 modules/worker/front/index/style.scss

diff --git a/e2e/helpers/components_selectors.js b/e2e/helpers/components_selectors.js
deleted file mode 100644
index 3e2715ba2..000000000
--- a/e2e/helpers/components_selectors.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export default {
-    vnTextfield: 'vn-textfield input',
-    vnInputNumber: 'vn-input-number input',
-    vnSubmit: 'vn-submit > input',
-    vnFloatButton: 'vn-float-button > button'
-};
diff --git a/e2e/helpers/extensions.js b/e2e/helpers/extensions.js
index ee964b534..4148a4a05 100644
--- a/e2e/helpers/extensions.js
+++ b/e2e/helpers/extensions.js
@@ -15,6 +15,16 @@ let asyncActions = {
         return exists;
     },
 
+    hasClass: async function(selector, className) {
+        return await this.evaluate((selector, className) => {
+            document.querySelector(selector).classList.contains(className);
+        }, selector, className);
+    },
+
+    parsedUrl: async function() {
+        return new URL(await this.url());
+    },
+
     // Salix specific extensions
 
     changeLanguageToEnglish: async function() {
@@ -28,6 +38,15 @@ let asyncActions = {
             await this.autocompleteSearch(langSelector, 'English');
     },
 
+    doLogin: async function(userName, password) {
+        if (password == null) password = 'nightmare';
+        await this.wait(`vn-login [name=user]`)
+            .clearInput(`vn-login [name=user]`)
+            .write(`vn-login [name=user]`, userName)
+            .write(`vn-login [name=password]`, password)
+            .click(`vn-login button[type=submit]`);
+    },
+
     login: async function(userName) {
         if (currentUser !== userName) {
             let logoutClicked = await this.clickIfExists('#logout');
@@ -47,11 +66,7 @@ let asyncActions = {
                 this.goto(`${config.url}/#!/login`);
             }
 
-            await this.wait(`vn-login input[name=user]`)
-                .clearInput(`vn-login input[name=user]`)
-                .write(`vn-login input[name=user]`, userName)
-                .write(`vn-login input[name=password]`, 'nightmare')
-                .click(`vn-login input[type=submit]`)
+            await this.doLogin(userName, null)
                 .waitForURL('#!/')
                 .changeLanguageToEnglish();
 
@@ -99,6 +114,10 @@ let asyncActions = {
                 input.value = time;
                 input.dispatchEvent(new Event('change'));
             }, selector, time);
+    },
+
+    isDisabled: async function(selector) {
+        return await this.hasClass(selector, 'disabled');
     }
 };
 
@@ -124,21 +143,6 @@ let actions = {
             .catch(done);
     },
 
-    resetLogin: function(done) {
-        this.then(() => {
-            currentUser = undefined;
-            done();
-        })
-            .catch(done);
-    },
-
-    parsedUrl: function(done) {
-        this.url()
-            .then(url => {
-                done(null, new URL(url));
-            }).catch(done);
-    },
-
     getProperty: function(selector, property, done) {
         this.evaluate_now((selector, property) => {
             return document.querySelector(selector)[property].replace(/\s+/g, ' ').trim();
diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index bc68f96e4..96c2fe768 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -1,4 +1,3 @@
-import components from './components_selectors.js';
 
 export default {
     globalItems: {
@@ -22,29 +21,29 @@ export default {
         acceptButton: 'vn-confirm button[response=ACCEPT]'
     },
     clientsIndex: {
-        searchClientInput: `${components.vnTextfield}`,
+        searchClientInput: `vn-textfield input`,
         searchButton: 'vn-searchbar vn-icon[icon="search"]',
         searchResult: 'vn-client-index .vn-list-item',
-        createClientButton: `${components.vnFloatButton}`,
+        createClientButton: `vn-float-button`,
         othersButton: 'vn-left-menu li[name="Others"] > a'
     },
     createClientView: {
-        name: `${components.vnTextfield}[name="name"]`,
-        taxNumber: `${components.vnTextfield}[name="fi"]`,
-        socialName: `${components.vnTextfield}[name="socialName"]`,
-        street: `${components.vnTextfield}[name="street"]`,
-        postcode: `${components.vnTextfield}[name="postcode"]`,
-        city: `${components.vnTextfield}[name="city"]`,
+        name: `vn-textfield input[name="name"]`,
+        taxNumber: `vn-textfield input[name="fi"]`,
+        socialName: `vn-textfield input[name="socialName"]`,
+        street: `vn-textfield input[name="street"]`,
+        postcode: `vn-textfield input[name="postcode"]`,
+        city: `vn-textfield input[name="city"]`,
         province: `vn-autocomplete[ng-model="$ctrl.client.provinceFk"]`,
         country: `vn-autocomplete[ng-model="$ctrl.client.countryFk"]`,
-        userName: `${components.vnTextfield}[name="userName"]`,
-        email: `${components.vnTextfield}[name="email"]`,
+        userName: `vn-textfield input[name="userName"]`,
+        email: `vn-textfield input[name="email"]`,
         salesPersonAutocomplete: `vn-autocomplete[ng-model="$ctrl.client.salesPersonFk"]`,
-        createButton: `${components.vnSubmit}`,
+        createButton: `button[type=submit]`,
         cancelButton: 'vn-button[href="#!/client/index"]'
     },
     clientDescriptor: {
-        moreMenu: 'vn-client-descriptor vn-icon-menu > div > vn-icon',
+        moreMenu: 'vn-client-descriptor vn-icon-menu[icon=more_vert]',
         simpleTicketButton: '.vn-popover.shown .vn-drop-down li'
     },
     clientBasicData: {
@@ -56,17 +55,17 @@ export default {
         emailInput: 'vn-textfield[ng-model="$ctrl.client.email"] input',
         salesPersonAutocomplete: 'vn-autocomplete[ng-model="$ctrl.client.salesPersonFk"]',
         channelAutocomplete: 'vn-autocomplete[ng-model="$ctrl.client.contactChannelFk"]',
-        saveButton: `${components.vnSubmit}`
+        saveButton: `button[type=submit]`
     },
     clientFiscalData: {
         fiscalDataButton: 'vn-left-menu a[ui-sref="client.card.fiscalData"]',
-        socialNameInput: `${components.vnTextfield}[name="socialName"]`,
-        fiscalIdInput: `${components.vnTextfield}[name="fi"]`,
+        socialNameInput: `vn-textfield input[name="socialName"]`,
+        fiscalIdInput: `vn-textfield input[name="fi"]`,
         equalizationTaxCheckbox: 'vn-check[label="Is equalizated"]',
         acceptPropagationButton: 'vn-client-fiscal-data > vn-confirm button[response=ACCEPT]',
-        addressInput: `${components.vnTextfield}[name="street"]`,
-        postcodeInput: `${components.vnTextfield}[name="postcode"]`,
-        cityInput: `${components.vnTextfield}[name="city"]`,
+        addressInput: `vn-textfield input[name="street"]`,
+        postcodeInput: `vn-textfield input[name="postcode"]`,
+        cityInput: `vn-textfield input[name="city"]`,
         provinceAutocomplete: 'vn-autocomplete[ng-model="$ctrl.client.provinceFk"]',
         countryAutocomplete: 'vn-autocomplete[ng-model="$ctrl.client.countryFk"]',
         activeCheckbox: 'vn-check[label="Active"]',
@@ -76,12 +75,12 @@ export default {
         hasToInvoiceCheckbox: 'vn-check[label="Has to invoice"]',
         invoiceByMailCheckbox: 'vn-check[label="Invoice by mail"]',
         viesCheckbox: 'vn-check[label="Vies"]',
-        saveButton: `${components.vnSubmit}`
+        saveButton: `button[type=submit]`
     },
     clientBillingData: {
         payMethodAutocomplete: 'vn-client-billing-data vn-autocomplete[ng-model="$ctrl.client.payMethodFk"]',
-        IBANInput: `vn-client-billing-data ${components.vnTextfield}[name="iban"]`,
-        dueDayInput: `vn-client-billing-data ${components.vnInputNumber}[name="dueDay"]`,
+        IBANInput: `vn-client-billing-data vn-textfield input[name="iban"]`,
+        dueDayInput: `vn-client-billing-data vn-input-number input[name="dueDay"]`,
         receivedCoreLCRCheckbox: 'vn-client-billing-data vn-check[label="Received LCR"]',
         receivedCoreVNLCheckbox: 'vn-client-billing-data vn-check[label="Received core VNL"]',
         receivedB2BVNLCheckbox: 'vn-client-billing-data vn-check[label="Received B2B VNL"]',
@@ -92,20 +91,20 @@ export default {
         newBankEntityBIC: 'vn-client-billing-data > vn-dialog vn-textfield[label="Swift / BIC"] input',
         newBankEntityCode: 'vn-client-billing-data > vn-dialog vn-textfield[label="Entity Code"] input',
         acceptBankEntityButton: 'vn-client-billing-data > vn-dialog button[response="ACCEPT"]',
-        saveButton: `${components.vnSubmit}`
+        saveButton: `button[type=submit]`
     },
     clientAddresses: {
         addressesButton: 'vn-left-menu a[ui-sref="client.card.address.index"]',
-        createAddress: `vn-client-address-index ${components.vnFloatButton}`,
+        createAddress: `vn-client-address-index vn-float-button`,
         defaultCheckboxInput: 'vn-check[label="Default"]',
-        consigneeInput: `${components.vnTextfield}[name="nickname"]`,
-        streetAddressInput: `${components.vnTextfield}[name="street"]`,
-        postcodeInput: `${components.vnTextfield}[name="postalCode"]`,
-        cityInput: `${components.vnTextfield}[name="city"]`,
+        consigneeInput: `vn-textfield input[name="nickname"]`,
+        streetAddressInput: `vn-textfield input[name="street"]`,
+        postcodeInput: `vn-textfield input[name="postalCode"]`,
+        cityInput: `vn-textfield input[name="city"]`,
         provinceAutocomplete: 'vn-autocomplete[ng-model="$ctrl.address.provinceFk"]',
         agencyAutocomplete: 'vn-autocomplete[ng-model="$ctrl.address.agencyModeFk"]',
-        phoneInput: `${components.vnTextfield}[name="phone"]`,
-        mobileInput: `${components.vnTextfield}[name="mobile"]`,
+        phoneInput: `vn-textfield input[name="phone"]`,
+        mobileInput: `vn-textfield input[name="mobile"]`,
         defaultAddress: 'vn-client-address-index div:nth-child(1) div[name="street"]',
         secondMakeDefaultStar: 'vn-client-address-index vn-card div:nth-child(2) vn-icon-button[icon="star_border"]',
         firstEditAddress: 'vn-client-address-index div:nth-child(1) > a',
@@ -117,34 +116,34 @@ export default {
         secondObservationTypeAutocomplete: 'vn-client-address-edit [name=observations] :nth-child(2) [ng-model="observation.observationTypeFk"]',
         secondObservationDescriptionInput: 'vn-client-address-edit [name=observations] :nth-child(2) [ng-model="observation.description"] input',
         addObservationButton: 'vn-client-address-edit div[name="observations"] vn-icon-button[icon="add_circle"]',
-        saveButton: `${components.vnSubmit}`,
+        saveButton: `button[type=submit]`,
         cancelCreateAddressButton: 'button[ui-sref="client.card.address.index"]',
         cancelEditAddressButton: 'vn-client-address-edit > form > vn-button-bar > vn-button > button'
     },
     clientWebAccess: {
         webAccessButton: 'vn-left-menu a[ui-sref="client.card.webAccess"]',
         enableWebAccessCheckbox: 'vn-check[label="Enable web access"]',
-        userNameInput: `${components.vnTextfield}[name="name"]`,
-        saveButton: `${components.vnSubmit}`
+        userNameInput: `vn-textfield input[name="name"]`,
+        saveButton: `button[type=submit]`
     },
     clientNotes: {
-        addNoteFloatButton: `${components.vnFloatButton}`,
+        addNoteFloatButton: `vn-float-button`,
         noteInput: 'vn-textarea[label="Note"]',
-        saveButton: `${components.vnSubmit}`,
+        saveButton: `button[type=submit]`,
         firstNoteText: 'vn-client-note .text'
     },
     clientCredit: {
-        addCreditFloatButton: `${components.vnFloatButton}`,
-        creditInput: `${components.vnInputNumber}[name="credit"]`,
-        saveButton: `${components.vnSubmit}`,
+        addCreditFloatButton: `vn-float-button`,
+        creditInput: `vn-input-number input[name="credit"]`,
+        saveButton: `button[type=submit]`,
         firstCreditText: 'vn-client-credit-index vn-card > div vn-table vn-tbody > vn-tr'
     },
     clientGreuge: {
-        addGreugeFloatButton: `${components.vnFloatButton}`,
-        amountInput: `${components.vnInputNumber}[name="amount"]`,
-        descriptionInput: `${components.vnTextfield}[name="description"]`,
+        addGreugeFloatButton: `vn-float-button`,
+        amountInput: `vn-input-number input[name="amount"]`,
+        descriptionInput: `vn-textfield input[name="description"]`,
         typeAutocomplete: 'vn-autocomplete[ng-model="$ctrl.greuge.greugeTypeFk"]',
-        saveButton: `${components.vnSubmit}`,
+        saveButton: `button[type=submit]`,
         firstGreugeText: 'vn-client-greuge-index vn-card > div vn-table vn-tbody > vn-tr'
     },
     clientMandate: {
@@ -163,7 +162,7 @@ export default {
     clientBalance: {
         balanceButton: 'vn-left-menu a[ui-sref="client.card.balance.index"]',
         companyAutocomplete: 'vn-client-balance-index vn-autocomplete[ng-model="$ctrl.companyFk"]',
-        newPaymentButton: `${components.vnFloatButton}`,
+        newPaymentButton: `vn-float-button`,
         newPaymentBank: 'vn-client-balance-create vn-autocomplete[ng-model="$ctrl.receipt.bankFk"]',
         newPaymentAmountInput: 'vn-client-balance-create vn-input-number[ng-model="$ctrl.receipt.amountPaid"] input',
         saveButton: 'vn-client-balance-create vn-button[label="Save"]',
@@ -182,7 +181,7 @@ export default {
     },
     itemsIndex: {
         searchIcon: 'vn-item-index vn-searchbar vn-icon[icon="search"]',
-        createItemButton: `${components.vnFloatButton}`,
+        createItemButton: `vn-float-button`,
         searchResult: 'vn-item-index a.vn-tr',
         searchResultPreviewButton: 'vn-item-index .buttons > [icon="desktop_windows"]',
         searchResultCloneButton: 'vn-item-index .buttons > [icon="icon-clone"]',
@@ -208,16 +207,16 @@ export default {
         saveFieldsButton: 'vn-item-index vn-dialog vn-horizontal:nth-child(16) > vn-button > button'
     },
     itemCreateView: {
-        temporalName: `${components.vnTextfield}[name="provisionalName"]`,
+        temporalName: `vn-textfield input[name="provisionalName"]`,
         typeAutocomplete: 'vn-autocomplete[ng-model="$ctrl.item.typeFk"]',
         intrastatAutocomplete: 'vn-autocomplete[ng-model="$ctrl.item.intrastatFk"]',
         originAutocomplete: 'vn-autocomplete[ng-model="$ctrl.item.originFk"]',
-        createButton: `${components.vnSubmit}`,
-        cancelButton: 'button[ui-sref="item.index"]'
+        createButton: `button[type=submit]`,
+        cancelButton: 'vn-button[ui-sref="item.index"]'
     },
     itemDescriptor: {
         goBackToModuleIndexButton: 'vn-item-descriptor a[href="#!/item/index"]',
-        moreMenu: 'vn-item-descriptor vn-icon-menu > div > vn-icon',
+        moreMenu: 'vn-item-descriptor vn-icon-menu[icon=more_vert]',
         moreMenuRegularizeButton: '.vn-popover.shown .vn-drop-down li[name="Regularize stock"]',
         regularizeQuantityInput: 'vn-item-descriptor vn-dialog tpl-body > div > vn-textfield input',
         regularizeWarehouseAutocomplete: 'vn-item-descriptor vn-dialog vn-autocomplete[ng-model="$ctrl.warehouseFk"]',
@@ -238,7 +237,7 @@ export default {
         longNameInput: 'vn-textfield[ng-model="$ctrl.item.longName"] input',
         isActiveCheckbox: 'vn-check[label="Active"]',
         priceInKgCheckbox: 'vn-check[label="Price in kg"]',
-        submitBasicDataButton: `${components.vnSubmit}`
+        submitBasicDataButton: `button[type=submit]`
     },
     itemTags: {
         goToItemIndexButton: 'vn-item-descriptor [ui-sref="item.index"]',
@@ -257,19 +256,19 @@ export default {
         seventhValueInput: 'vn-item-tags vn-horizontal:nth-child(7) > vn-textfield[label="Value"] input',
         seventhRelevancyInput: 'vn-item-tags vn-horizontal:nth-child(7) > vn-textfield[label="Relevancy"] input',
         addItemTagButton: 'vn-item-tags vn-icon-button[icon="add_circle"]',
-        submitItemTagsButton: `vn-item-tags ${components.vnSubmit}`
+        submitItemTagsButton: `vn-item-tags button[type=submit]`
     },
     itemTax: {
         undoChangesButton: 'vn-item-tax vn-button-bar > vn-button[label="Undo changes"]',
         firstClassAutocomplete: 'vn-item-tax vn-horizontal:nth-child(1) > vn-autocomplete[ng-model="tax.taxClassFk"]',
         secondClassAutocomplete: 'vn-item-tax vn-horizontal:nth-child(2) > vn-autocomplete[ng-model="tax.taxClassFk"]',
         thirdClassAutocomplete: 'vn-item-tax vn-horizontal:nth-child(3) > vn-autocomplete[ng-model="tax.taxClassFk"]',
-        submitTaxButton: `vn-item-tax ${components.vnSubmit}`
+        submitTaxButton: `vn-item-tax button[type=submit]`
     },
     itemBarcodes: {
         addBarcodeButton: 'vn-item-barcode vn-icon[icon="add_circle"]',
-        thirdCodeInput: `vn-item-barcode vn-horizontal:nth-child(3) > ${components.vnTextfield}`,
-        submitBarcodesButton: `vn-item-barcode ${components.vnSubmit}`,
+        thirdCodeInput: `vn-item-barcode vn-horizontal:nth-child(3) > vn-textfield input`,
+        submitBarcodesButton: `vn-item-barcode button[type=submit]`,
         firstCodeRemoveButton: 'vn-item-barcode vn-horizontal vn-none vn-icon[icon="delete"]'
     },
     itemNiches: {
@@ -281,13 +280,13 @@ export default {
         secondNicheRemoveButton: 'vn-item-niche vn-horizontal:nth-child(2) > vn-none > vn-icon-button[icon="delete"]',
         thirdWarehouseAutocomplete: 'vn-item-niche vn-horizontal:nth-child(3) > vn-autocomplete[ng-model="niche.warehouseFk"]',
         thirdCodeInput: 'vn-item-niche vn-horizontal:nth-child(3) > vn-textfield[label="Code"] input',
-        submitNichesButton: `vn-item-niche ${components.vnSubmit}`
+        submitNichesButton: `vn-item-niche button[type=submit]`
     },
     itemBotanical: {
-        botanicalInput: `vn-item-botanical vn-horizontal:nth-child(1) > ${components.vnTextfield}`,
+        botanicalInput: `vn-item-botanical vn-horizontal:nth-child(1) > vn-textfield input`,
         genusAutocomplete: 'vn-item-botanical vn-autocomplete[ng-model="$ctrl.botanical.genusFk"]',
         speciesAutocomplete: 'vn-item-botanical vn-autocomplete[ng-model="$ctrl.botanical.specieFk"]',
-        submitBotanicalButton: `vn-item-botanical ${components.vnSubmit}`
+        submitBotanicalButton: `vn-item-botanical button[type=submit]`
     },
     itemSummary: {
         basicData: 'vn-item-summary [name="basicData"]',
@@ -330,13 +329,13 @@ export default {
         searchResult: 'vn-ticket-index vn-card > div > vn-table > div > vn-tbody > a.vn-tr',
         searchWeeklyResult: 'vn-ticket-weekly-index vn-table vn-tbody > vn-tr',
         searchResultDate: 'vn-ticket-index vn-table vn-tbody > a:nth-child(1) > vn-td:nth-child(5)',
-        searchTicketInput: `vn-ticket-index ${components.vnTextfield}`,
-        searchWeeklyTicketInput: `vn-ticket-weekly-index ${components.vnTextfield}`,
+        searchTicketInput: `vn-ticket-index vn-textfield input`,
+        searchWeeklyTicketInput: `vn-ticket-weekly-index vn-textfield input`,
         searchWeeklyClearInput: 'vn-ticket-weekly-index vn-searchbar vn-icon[icon=clear]',
-        advancedSearchButton: 'vn-ticket-search-panel vn-submit[label="Search"] input',
+        advancedSearchButton: 'vn-ticket-search-panel button[type=submit]',
         searchButton: 'vn-ticket-index vn-searchbar vn-icon[icon="search"]',
         searchWeeklyButton: 'vn-ticket-weekly-index vn-searchbar vn-icon[icon="search"]',
-        moreMenu: 'vn-ticket-index vn-icon-menu[vn-id="more-button"] > div > vn-icon',
+        moreMenu: 'vn-ticket-index vn-icon-menu[icon=more_vert]',
         moreMenuWeeklyTickets: '.vn-popover.shown .vn-drop-down li:nth-child(2)',
         sixthWeeklyTicket: 'vn-ticket-weekly-index vn-table vn-tr:nth-child(6) vn-autocomplete[ng-model="weekly.weekDay"] input',
         weeklyTicket: 'vn-ticket-weekly-index vn-table > div > vn-tbody > vn-tr',
@@ -349,13 +348,13 @@ export default {
         deliveryDateInput: 'vn-ticket-create vn-date-picker[ng-model="$ctrl.landed"]',
         warehouseAutocomplete: 'vn-ticket-create vn-autocomplete[ng-model="$ctrl.warehouseFk"]',
         agencyAutocomplete: 'vn-ticket-create vn-autocomplete[ng-model="$ctrl.ticket.agencyModeFk"]',
-        createButton: `${components.vnSubmit}`
+        createButton: `button[type=submit]`
     },
     ticketDescriptor: {
         idLabelValue: 'vn-ticket-descriptor vn-label-value[label="Id"]',
         stateLabelValue: 'vn-ticket-descriptor vn-label-value[label="State"]',
         goBackToModuleIndexButton: 'vn-ticket-descriptor a[ui-sref="ticket.index"]',
-        moreMenu: 'vn-ticket-descriptor vn-icon-menu > div > vn-icon',
+        moreMenu: 'vn-ticket-descriptor vn-icon-menu[icon=more_vert]',
         moreMenuAddStowaway: '.vn-popover.shown .vn-drop-down li[name="Add stowaway"]',
         moreMenuDeleteStowawayButton: '.vn-popover.shown .vn-drop-down li[name="Remove stowaway"]',
         moreMenuAddToTurn: '.vn-popover.shown .vn-drop-down li[name="Add turn"]',
@@ -365,7 +364,7 @@ export default {
         changeShippedHourDialog: 'vn-ticket-descriptor vn-dialog[vn-id="changeShippedDialog"]',
         changeShippedHourInput: 'vn-dialog[vn-id="changeShippedDialog"] [ng-model="$ctrl.newShipped"]',
         addStowawayDialogFirstTicket: 'vn-ticket-descriptor > vn-add-stowaway > vn-dialog vn-table vn-tbody vn-tr',
-        shipButton: 'vn-ticket-descriptor > div > div.body > div.quicklinks vn-icon[icon="icon-stowaway"]',
+        shipButton: 'vn-ticket-descriptor vn-icon[icon="icon-stowaway"]',
         thursdayButton: 'vn-ticket-descriptor > vn-dialog > div > form > div.body > tpl-body > div > vn-tool-bar > vn-button:nth-child(4)',
         saturdayButton: 'vn-ticket-descriptor > vn-dialog > div > form > div.body > tpl-body > div > vn-tool-bar > vn-button:nth-child(6)',
         closeStowawayDialog: 'vn-ticket-descriptor > vn-add-stowaway > vn-dialog > div > button[class="close"]',
@@ -380,7 +379,7 @@ export default {
         addNoteButton: 'vn-icon[icon="add_circle"]',
         firstNoteTypeAutocomplete: 'vn-autocomplete[ng-model="observation.observationTypeFk"]',
         firstDescriptionInput: 'vn-textfield[label="Description"] input',
-        submitNotesButton: `${components.vnSubmit}`
+        submitNotesButton: `button[type=submit]`
     },
     ticketExpedition: {
         expeditionButton: 'vn-left-menu a[ui-sref="ticket.card.expedition"]',
@@ -395,7 +394,7 @@ export default {
         firstRemovePackageButton: 'vn-icon-button[vn-tooltip="Remove package"]',
         addPackageButton: 'vn-icon-button[vn-tooltip="Add package"]',
         clearPackageAutocompleteButton: 'vn-autocomplete[label="Package"] .icons > vn-icon[icon=clear]',
-        savePackagesButton: `${components.vnSubmit}`
+        savePackagesButton: `button[type=submit]`
     },
     ticketSales: {
         saleButton: 'vn-left-menu a[ui-sref="ticket.card.sale"]',
@@ -460,9 +459,9 @@ export default {
     },
     ticketTracking: {
         trackingButton: 'vn-left-menu a[ui-sref="ticket.card.tracking.index"]',
-        createStateButton: `${components.vnFloatButton}`,
+        createStateButton: `vn-float-button`,
         stateAutocomplete: 'vn-ticket-tracking-edit vn-autocomplete[ng-model="$ctrl.stateFk"]',
-        saveButton: `${components.vnSubmit}`,
+        saveButton: `button[type=submit]`,
         cancelButton: 'vn-ticket-tracking-edit vn-button[ui-sref="ticket.card.tracking.index"]'
     },
     ticketBasicData: {
@@ -471,8 +470,8 @@ export default {
         addressAutocomplete: 'vn-autocomplete[ng-model="$ctrl.ticket.addressFk"]',
         agencyAutocomplete: 'vn-autocomplete[ng-model="$ctrl.agencyModeId"]',
         zoneAutocomplete: 'vn-autocomplete[ng-model="$ctrl.zoneId"]',
-        nextStepButton: 'vn-step-control > section > section.buttons > section:nth-child(2) > vn-button',
-        finalizeButton: 'vn-step-control > section > section.buttons > section:nth-child(2) > vn-submit',
+        nextStepButton: 'vn-step-control .buttons > section:last-child vn-button',
+        finalizeButton: 'vn-step-control .buttons > section:last-child button[type=submit]',
         stepTwoTotalPriceDif: 'vn-ticket-basic-data-step-two > form > vn-card > div > vn-horizontal > table > tfoot > tr > td:nth-child(4)',
         chargesReasonAutocomplete: 'vn-autocomplete[ng-model="$ctrl.ticket.option"]',
     },
@@ -487,7 +486,7 @@ export default {
         quantityInput: 'vn-ticket-request-create vn-input-number input[name=quantity]',
         priceInput: 'vn-ticket-request-create vn-input-number input[name=price]',
         firstRemoveRequestButton: 'vn-ticket-request-index vn-icon[icon="delete"]:nth-child(1)',
-        saveButton: 'vn-ticket-request-create > form > div > vn-button-bar > vn-submit[label="Create"] input',
+        saveButton: 'vn-ticket-request-create button[type=submit]',
         firstDescription: 'vn-ticket-request-index vn-table vn-tr:nth-child(1) > vn-td:nth-child(2)',
 
     },
@@ -499,7 +498,7 @@ export default {
     },
     ticketService: {
         addServiceButton: 'vn-ticket-service vn-icon-button[vn-tooltip="Add service"] > button',
-        firstAddDescriptionButton: 'vn-ticket-service vn-icon-button[vn-tooltip="New service type"] > button',
+        firstAddDescriptionButton: 'vn-ticket-service vn-icon-button[vn-tooltip="New service type"]',
         firstDescriptionAutocomplete: 'vn-ticket-service vn-autocomplete[ng-model="service.description"]',
         firstQuantityInput: 'vn-ticket-service vn-input-number[label="Quantity"] input',
         firstPriceInput: 'vn-ticket-service vn-input-number[label="Price"] input',
@@ -507,22 +506,22 @@ export default {
         fistDeleteServiceButton: 'vn-ticket-service form vn-horizontal:nth-child(1) vn-icon-button[icon="delete"]',
         newDescriptionInput: 'vn-ticket-service > vn-dialog vn-textfield[ng-model="$ctrl.newServiceType.name"] input',
         serviceLine: 'vn-ticket-service > form > vn-card > div > vn-one:nth-child(2) > vn-horizontal',
-        saveServiceButton: `${components.vnSubmit}`,
+        saveServiceButton: `button[type=submit]`,
         saveDescriptionButton: 'vn-ticket-service > vn-dialog[vn-id="createServiceTypeDialog"] > div > form > div.buttons > tpl-buttons > button'
     },
     createStateView: {
         stateAutocomplete: 'vn-autocomplete[ng-model="$ctrl.stateFk"]',
         workerAutocomplete: 'vn-autocomplete[ng-model="$ctrl.workerFk"]',
         clearStateInputButton: 'vn-autocomplete[ng-model="$ctrl.stateFk"] .icons > vn-icon[icon=clear]',
-        saveStateButton: `${components.vnSubmit}`
+        saveStateButton: `button[type=submit]`
     },
     claimsIndex: {
-        searchClaimInput: `vn-claim-index ${components.vnTextfield}`,
+        searchClaimInput: `vn-claim-index vn-textfield input`,
         searchResult: 'vn-claim-index vn-card > div > vn-table > div > vn-tbody > a',
         searchButton: 'vn-claim-index vn-searchbar vn-icon[icon="search"]'
     },
     claimDescriptor: {
-        moreMenu: 'vn-claim-descriptor vn-icon-menu[vn-id="more-button"]',
+        moreMenu: 'vn-claim-descriptor vn-icon-menu[icon=more_vert]',
         moreMenuDeleteClaim: '.vn-popover.shown .vn-drop-down li[name="Delete claim"]',
         acceptDeleteClaim: 'vn-claim-descriptor > vn-confirm[vn-id="confirm-delete-claim"] button[response="ACCEPT"]'
     },
@@ -541,9 +540,9 @@ export default {
     },
     claimBasicData: {
         claimStateAutocomplete: 'vn-claim-basic-data vn-autocomplete[ng-model="$ctrl.claim.claimStateFk"]',
-        responsabilityInputRange: 'vn-input-range',
+        responsabilityInputRange: 'vn-range',
         observationInput: 'vn-textarea[ng-model="$ctrl.claim.observation"] textarea',
-        saveButton: `${components.vnSubmit}`
+        saveButton: `button[type=submit]`
     },
     claimDetail: {
         secondItemDiscount: 'vn-claim-detail > vn-vertical > vn-card > div > vn-vertical > vn-table > div > vn-tbody > vn-tr:nth-child(2) > vn-td:nth-child(6) > span',
@@ -569,7 +568,7 @@ export default {
         secondClaimResponsibleAutocomplete: 'vn-claim-development vn-horizontal:nth-child(2) vn-autocomplete[ng-model="claimDevelopment.claimResponsibleFk"]',
         secondClaimWorkerAutocomplete: 'vn-claim-development vn-horizontal:nth-child(2) vn-autocomplete[ng-model="claimDevelopment.workerFk"]',
         secondClaimRedeliveryAutocomplete: 'vn-claim-development vn-horizontal:nth-child(2) vn-autocomplete[ng-model="claimDevelopment.claimRedeliveryFk"]',
-        saveDevelopmentButton: `${components.vnSubmit}`
+        saveDevelopmentButton: `button[type=submit]`
     },
     claimAction: {
         importClaimButton: 'vn-claim-action vn-button[label="Import claim"]',
@@ -584,9 +583,9 @@ export default {
         searchResult: 'vn-order-index vn-card > div > vn-table > div > vn-tbody > a.vn-tr',
         searchResultDate: 'vn-order-index vn-table vn-tbody > a:nth-child(1) > vn-td:nth-child(4)',
         searchResultAddress: 'vn-order-index vn-table vn-tbody > a:nth-child(1) > vn-td:nth-child(6)',
-        searchOrderInput: `vn-order-index ${components.vnTextfield}`,
+        searchOrderInput: `vn-order-index vn-textfield input`,
         searchButton: 'vn-order-index vn-searchbar vn-icon[icon="search"]',
-        createOrderButton: `${components.vnFloatButton}`,
+        createOrderButton: `vn-float-button`,
     },
     orderDescriptor: {
         returnToModuleIndexButton: 'vn-order-descriptor a[ui-sref="order.index"]',
@@ -597,7 +596,7 @@ export default {
         addressAutocomplete: 'vn-autocomplete[label="Address"]',
         agencyAutocomplete: 'vn-autocomplete[label="Agency"]',
         landedDatePicker: 'vn-date-picker[label="Landed"]',
-        createButton: `${components.vnSubmit}`,
+        createButton: `button[type=submit]`,
         cancelButton: 'vn-button[href="#!/client/index"]'
     },
     orderCatalog: {
@@ -609,16 +608,16 @@ export default {
         openTagSearch: 'vn-catalog-filter > div > vn-vertical > vn-textfield[ng-model="$ctrl.value"] .append i',
         tagAutocomplete: 'vn-order-catalog-search-panel vn-autocomplete[ng-model="filter.tagFk"]',
         tagValueInput: 'vn-order-catalog-search-panel vn-textfield[ng-model="filter.value"] input',
-        searchTagButton: 'vn-order-catalog-search-panel > div > form > vn-horizontal:nth-child(3) > vn-submit > input',
-        thirdFilterRemoveButton: 'vn-catalog-filter > div > vn-horizontal.chips > vn-chip:nth-child(3) button',
-        fourthFilterRemoveButton: 'vn-catalog-filter > div > vn-horizontal.chips > vn-chip:nth-child(4) button',
+        searchTagButton: 'vn-order-catalog-search-panel button[type=submit]',
+        thirdFilterRemoveButton: 'vn-catalog-filter .chips > vn-chip:nth-child(3) vn-icon[icon=cancel]',
+        fourthFilterRemoveButton: 'vn-catalog-filter .chips > vn-chip:nth-child(4) vn-icon[icon=cancel]',
     },
     orderBasicData: {
         clientAutocomplete: 'vn-autocomplete[label="Client"]',
         addressAutocomplete: 'vn-autocomplete[label="Address"]',
         agencyAutocomplete: 'vn-autocomplete[label="Agency"]',
         observationInput: 'vn-textarea[label="Observation"] textarea',
-        saveButton: `${components.vnSubmit}`,
+        saveButton: `button[type=submit]`,
         acceptButton: 'vn-order-basic-data vn-confirm[vn-id="confirm"] button[response="ACCEPT"]'
     },
     orderLine: {
@@ -636,7 +635,7 @@ export default {
         vehicleAutoComplete: 'vn-route-create vn-autocomplete[ng-model="$ctrl.route.vehicleFk"]',
         agencyAutoComplete: 'vn-route-create vn-autocomplete[ng-model="$ctrl.route.agencyModeFk"]',
         descriptionInput: 'vn-route-create vn-textfield[ng-model="$ctrl.route.description"] input',
-        submitButton: 'vn-route-create vn-submit > input[type="submit"]'
+        submitButton: 'vn-route-create button[type=submit]'
     },
     routeDescriptor: {
         volume: 'vn-route-descriptor vn-label-value[label="Volume"] > section > span'
@@ -653,7 +652,7 @@ export default {
         createdDateInput: 'vn-route-basic-data vn-date-picker[ng-model="$ctrl.route.created"]',
         startedHourInput: 'vn-route-basic-data vn-input-time[ng-model="$ctrl.route.started"] input',
         finishedHourInput: 'vn-route-basic-data vn-input-time[ng-model="$ctrl.route.finished"] input',
-        saveButton: 'vn-route-basic-data vn-submit[label="Save"] input'
+        saveButton: 'vn-route-basic-data button[type=submit]'
     },
     routeTickets: {
         firstTicketPriority: 'vn-route-tickets vn-tr:nth-child(1) vn-textfield[ng-model="ticket.priority"] input',
@@ -668,7 +667,7 @@ export default {
     },
     workerPbx: {
         extensionInput: 'vn-worker-pbx vn-textfield[ng-model="$ctrl.worker.sip.extension"] input',
-        saveButton: 'vn-worker-pbx vn-submit[label="Save"] input'
+        saveButton: 'vn-worker-pbx button[type=submit]'
     },
     workerTimeControl: {
         timeDialogInput: '.vn-dialog.shown [ng-model="$ctrl.newTime"]',
@@ -720,12 +719,12 @@ export default {
         navigateBackToIndex: 'vn-worker-descriptor vn-icon[icon="chevron_left"]'
     },
     invoiceOutIndex: {
-        searchInvoiceOutInput: `vn-invoice-out-index ${components.vnTextfield}`,
+        searchInvoiceOutInput: `vn-invoice-out-index vn-textfield input`,
         searchButton: 'vn-invoice-out-index vn-searchbar vn-icon[icon="search"]',
         searchResult: 'vn-invoice-out-index vn-card > div > vn-table > div > vn-tbody > a.vn-tr',
     },
     invoiceOutDescriptor: {
-        moreMenu: 'vn-invoice-out-descriptor vn-icon-menu[vn-id="more-button"]',
+        moreMenu: 'vn-invoice-out-descriptor vn-icon-menu[icon=more_vert]',
         moreMenuDeleteInvoiceOut: '.vn-popover.shown .vn-drop-down li[name="Delete Invoice"]',
         moreMenuBookInvoiceOut: '.vn-popover.shown .vn-drop-down li[name="Book invoice"]',
         moreMenuShowInvoiceOutPdf: '.vn-popover.shown .vn-drop-down li[name="Show invoice PDF"]',
diff --git a/e2e/paths/01-login/01_login.spec.js b/e2e/paths/01-login/01_login.spec.js
index e5a70703e..03acc98a8 100644
--- a/e2e/paths/01-login/01_login.spec.js
+++ b/e2e/paths/01-login/01_login.spec.js
@@ -1,56 +1,35 @@
 import createNightmare from '../../helpers/nightmare';
 
-
 describe('Login path', () => {
     const nightmare = createNightmare();
 
     it('should receive an error when the username is incorrect', async() => {
-        const username = 'nobody';
-        const password = 'nightmare';
-
         const result = await nightmare
-            .wait(`vn-login input[name=user]`)
-            .write(`vn-login input[name=user]`, username)
-            .write(`vn-login input[name=password]`, password)
-            .click(`vn-login input[type=submit]`)
+            .doLogin('badUser', null)
             .waitForLastSnackbar();
 
         expect(result.length).toBeGreaterThan(0);
     });
 
     it('should receive an error when the username is blank', async() => {
-        const password = 'nightmare';
-
         const result = await nightmare
-            .clearInput(`vn-login input[name=user]`)
-            .write(`vn-login input[name=password]`, password)
-            .click(`vn-login input[type=submit]`)
+            .doLogin('', null)
             .waitForLastSnackbar();
 
         expect(result.length).toBeGreaterThan(0);
     });
 
     it('should receive an error when the password is incorrect', async() => {
-        const username = 'employee';
-        const password = 'badpassword';
-
         const result = await nightmare
-            .write(`vn-login input[name=user]`, username)
-            .write(`vn-login input[name=password]`, password)
-            .click(`vn-login input[type=submit]`)
+            .doLogin('employee', 'badPassword')
             .waitForLastSnackbar();
 
         expect(result.length).toBeGreaterThan(0);
     });
 
     it('should log in', async() => {
-        const username = 'employee';
-        const password = 'nightmare';
-
         const url = await nightmare
-            .write(`vn-login input[name=user]`, username)
-            .write(`vn-login input[name=password]`, password)
-            .click(`vn-login input[type=submit]`)
+            .doLogin('employee', null)
             .wait('#logout')
             .parsedUrl();
 
diff --git a/e2e/paths/02-client-module/03_edit_fiscal_data.spec.js b/e2e/paths/02-client-module/03_edit_fiscal_data.spec.js
index ae3020d2a..cbe3722de 100644
--- a/e2e/paths/02-client-module/03_edit_fiscal_data.spec.js
+++ b/e2e/paths/02-client-module/03_edit_fiscal_data.spec.js
@@ -42,9 +42,7 @@ describe('Client Edit fiscalData path', () => {
         it('should not be able to edit the verified data checkbox', async() => {
             const result = await nightmare
                 .wait(selectors.clientFiscalData.verifiedDataCheckbox)
-                .evaluate(selector => {
-                    return document.querySelector(selector).getAttribute('disabled');
-                }, selectors.clientFiscalData.verifiedDataCheckbox);
+                .isDisabled(selectors.clientFiscalData.verifiedDataCheckbox);
 
             expect(result).toBeTruthy();
         });
diff --git a/e2e/paths/02-client-module/12_lock_of_verified_data.spec.js b/e2e/paths/02-client-module/12_lock_of_verified_data.spec.js
index 52e2db237..398185ba5 100644
--- a/e2e/paths/02-client-module/12_lock_of_verified_data.spec.js
+++ b/e2e/paths/02-client-module/12_lock_of_verified_data.spec.js
@@ -16,9 +16,7 @@ describe('Client lock verified data path', () => {
             const result = await nightmare
                 .wait(200)
                 .wait(selectors.clientFiscalData.verifiedDataCheckbox)
-                .evaluate(selector => {
-                    return document.querySelector(selector).getAttribute('disabled');
-                }, selectors.clientFiscalData.verifiedDataCheckbox);
+                .isDisabled(selectors.clientFiscalData.verifiedDataCheckbox);
 
             expect(result).toBeTruthy();
         });
diff --git a/e2e/paths/05-ticket-module/13_services.spec.js b/e2e/paths/05-ticket-module/13_services.spec.js
index 31d262778..7172ab5a6 100644
--- a/e2e/paths/05-ticket-module/13_services.spec.js
+++ b/e2e/paths/05-ticket-module/13_services.spec.js
@@ -17,9 +17,7 @@ describe('Ticket services path', () => {
             const result = await nightmare
                 .waitToClick(selectors.ticketService.addServiceButton)
                 .wait(selectors.ticketService.firstAddDescriptionButton)
-                .evaluate(selector => {
-                    return document.querySelector(selector).disabled;
-                }, selectors.ticketService.firstAddDescriptionButton);
+                .isDisabled(selectors.ticketService.firstAddDescriptionButton);
 
             expect(result).toBeTruthy();
         });
diff --git a/e2e/paths/07-order-module/02_catalog.spec.js b/e2e/paths/07-order-module/02_catalog.spec.js
index d2a862958..cad95741e 100644
--- a/e2e/paths/07-order-module/02_catalog.spec.js
+++ b/e2e/paths/07-order-module/02_catalog.spec.js
@@ -66,7 +66,7 @@ describe('Order catalog', () => {
         const result = await nightmare
             .waitToClick(selectors.orderCatalog.fourthFilterRemoveButton)
             .waitToClick(selectors.orderCatalog.thirdFilterRemoveButton)
-            .waitForNumberOfElements('section.product', 4)
+            .waitForNumberOfElements('.product', 4)
             .countElement('section.product');
 
         expect(result).toEqual(4);
diff --git a/e2e/paths/09-invoice-out-module/01_descriptor.spec.js b/e2e/paths/09-invoice-out-module/01_descriptor.spec.js
index a00d6387d..fd3516d87 100644
--- a/e2e/paths/09-invoice-out-module/01_descriptor.spec.js
+++ b/e2e/paths/09-invoice-out-module/01_descriptor.spec.js
@@ -1,7 +1,7 @@
 import selectors from '../../helpers/selectors.js';
 import createNightmare from '../../helpers/nightmare';
 
-describe('InvoiceOut descriptor path', () => {
+fdescribe('InvoiceOut descriptor path', () => {
     const nightmare = createNightmare();
     let bookedDate;
 
diff --git a/front/core/components/button-menu/button-menu.html b/front/core/components/button-menu/button-menu.html
deleted file mode 100644
index 5beeb12fb..000000000
--- a/front/core/components/button-menu/button-menu.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="button-menu">
-    <button
-        class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored button-menu__button">
-        <vn-label vn-none translate>{{::$ctrl.label}}</vn-label>
-        <vn-icon vn-none icon="{{::$ctrl.icon}}"></vn-icon>
-        <vn-icon vn-none class="button-menu__arrow_down" icon="keyboard_arrow_down"></vn-icon>
-    </button>
-    <vn-drop-down
-        vn-id="drop-down"
-        on-select="$ctrl.onDropDownSelect(item)"
-        ng-click="$ctrl.onDropDownClick($event)">
-    </vn-drop-down>
-</div>
\ No newline at end of file
diff --git a/front/core/components/button-menu/index.html b/front/core/components/button-menu/index.html
new file mode 100644
index 000000000..b0977bb93
--- /dev/null
+++ b/front/core/components/button-menu/index.html
@@ -0,0 +1,20 @@
+<button>
+    <span
+        ng-if="::$ctrl.label"
+        translate>
+        {{::$ctrl.label}}
+    </span>
+    <vn-icon
+        ng-if="::$ctrl.icon"
+        icon="{{::$ctrl.icon}}">
+    </vn-icon>
+    <vn-icon
+        class="button-menu__arrow_down"
+        icon="keyboard_arrow_down">
+    </vn-icon>
+</button>
+<vn-drop-down
+    vn-id="drop-down"
+    on-select="$ctrl.onDropDownSelect(item)"
+    ng-click="$ctrl.onDropDownClick($event)">
+</vn-drop-down>
\ No newline at end of file
diff --git a/front/core/components/button-menu/button-menu.js b/front/core/components/button-menu/index.js
similarity index 83%
rename from front/core/components/button-menu/button-menu.js
rename to front/core/components/button-menu/index.js
index 99f3879ee..d31094d36 100644
--- a/front/core/components/button-menu/button-menu.js
+++ b/front/core/components/button-menu/index.js
@@ -1,17 +1,13 @@
 import ngModule from '../../module';
-import Input from '../../lib/input';
+import Button from '../button';
 import assignProps from '../../lib/assign-props';
 import './style.scss';
 
-export default class ButtonMenu extends Input {
+export default class ButtonMenu extends Button {
     constructor($element, $scope, $transclude) {
         super($element, $scope);
         this.$transclude = $transclude;
-        this.input = this.element.querySelector('.mdl-button');
-        $element.on('click', e => {
-            if (!this.disabled)
-                this.onClick(e);
-        });
+        $element.on('click', e => this.onClick(e));
     }
 
     get model() {
@@ -46,6 +42,7 @@ export default class ButtonMenu extends Input {
     }
 
     onClick(event) {
+        if (this.disabled) return;
         if (event.defaultPrevented) return;
         event.preventDefault();
         this.emit('open');
@@ -85,15 +82,14 @@ export default class ButtonMenu extends Input {
 }
 ButtonMenu.$inject = ['$element', '$scope', '$transclude'];
 
-ngModule.component('vnButtonMenu', {
-    template: require('./button-menu.html'),
+ngModule.vnComponent('vnButtonMenu', {
+    template: require('./index.html'),
+    controller: ButtonMenu,
     bindings: {
-        label: '@',
         showField: '@?',
         selection: '<?',
         valueField: '@?',
         selectFields: '<?',
-        disabled: '<?',
         initialData: '<?',
         showFilter: '<?',
         field: '=?',
@@ -104,12 +100,10 @@ ngModule.component('vnButtonMenu', {
         limit: '<?',
         multiple: '<?',
         onChange: '&?',
-        icon: '@?',
         translateFields: '<?',
         onOpen: '&?'
     },
     transclude: {
         tplItem: '?tplItem'
-    },
-    controller: ButtonMenu
+    }
 });
diff --git a/front/core/components/button-menu/button-menu.spec.js b/front/core/components/button-menu/index.spec.js
similarity index 100%
rename from front/core/components/button-menu/button-menu.spec.js
rename to front/core/components/button-menu/index.spec.js
diff --git a/front/core/components/button-menu/style.scss b/front/core/components/button-menu/style.scss
index 53dbb963a..1cd995b15 100644
--- a/front/core/components/button-menu/style.scss
+++ b/front/core/components/button-menu/style.scss
@@ -1,19 +1,3 @@
 vn-button-menu {
     position: relative;
-    cursor: pointer;
-
-    .button-menu__button {
-        padding: 0 10px;
-    }
-    vn-label {
-        float: left;
-        margin-top: 1px;
-    }
-    vn-icon {
-        float: left;
-        margin-top: 3px;
-    }
-    vn-icon.button-menu__arrow_down {
-        margin: 6px 0  0 5px;
-    }
 }
\ No newline at end of file
diff --git a/front/core/components/button/button.html b/front/core/components/button/button.html
deleted file mode 100644
index 1087bbee2..000000000
--- a/front/core/components/button/button.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<button type="{{::$ctrl.type}}" class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored">
-    <span translate>{{$ctrl.label}}</span>
-    <vn-icon 
-        icon="{{::$ctrl.icon}}">
-    </vn-icon>
-</button>
\ No newline at end of file
diff --git a/front/core/components/button/button.js b/front/core/components/button/button.js
deleted file mode 100644
index 4e5cf50a2..000000000
--- a/front/core/components/button/button.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import ngModule from '../../module';
-import Input from '../../lib/input';
-import './style.scss';
-
-export default class Button extends Input {
-    constructor($element) {
-        super($element);
-        this.$element = $element;
-        this.input = this.element.querySelector('.mdl-button');
-
-        $element[0].addEventListener('click', event => {
-            if (this.disabled)
-                event.stopImmediatePropagation();
-        });
-    }
-
-    $onInit() {
-        if (!this.type)
-            this.type = 'button';
-    }
-}
-Button.$inject = ['$element'];
-
-ngModule.component('vnButton', {
-    controller: Button,
-    template: require('./button.html'),
-    bindings: {
-        label: '@?',
-        disabled: '<?',
-        icon: '@?',
-        type: '@?'
-    }
-});
-
diff --git a/front/core/components/button/index.html b/front/core/components/button/index.html
new file mode 100644
index 000000000..e8c3f6bc5
--- /dev/null
+++ b/front/core/components/button/index.html
@@ -0,0 +1,11 @@
+<button type="{{::$ctrl.type}}" tabindex="-1">
+    <span
+        ng-if="::$ctrl.label"
+        translate>
+        {{::$ctrl.label}}
+    </span>
+    <vn-icon
+        ng-if="::$ctrl.icon"
+        icon="{{::$ctrl.icon}}">
+    </vn-icon>
+</button>
\ No newline at end of file
diff --git a/front/core/components/button/index.js b/front/core/components/button/index.js
new file mode 100644
index 000000000..e1a86eb5d
--- /dev/null
+++ b/front/core/components/button/index.js
@@ -0,0 +1,46 @@
+import ngModule from '../../module';
+import FormInput from '../form-input';
+import './style.scss';
+
+export default class Button extends FormInput {
+    constructor($element, $scope) {
+        super($element, $scope);
+        this.design = 'colored';
+        this.input = this.element.querySelector('button');
+
+        let element = this.element;
+        element.tabIndex = 0;
+        element.classList.add('vn-button');
+        this.element.addEventListener('keyup', e => this.onKeyup(e));
+        this.element.addEventListener('click', e => this.onClick(e));
+    }
+
+    $onInit() {
+        this.element.classList.add(this.design);
+        if (!this.type) this.type = 'button';
+    }
+
+    onKeyup(event) {
+        if (event.code == 'Space')
+            this.onClick(event);
+    }
+
+    onClick(event) {
+        if (event.defaultPrevented) return;
+        // event.preventDefault();
+
+        // FIXME: Don't stop event propagation
+        if (this.disabled) event.stopImmediatePropagation();
+    }
+}
+Button.$inject = ['$element', '$scope'];
+
+ngModule.vnComponent('vnButton', {
+    controller: Button,
+    template: require('./index.html'),
+    bindings: {
+        icon: '@?',
+        type: '@?'
+    }
+});
+
diff --git a/front/core/components/button/style.scss b/front/core/components/button/style.scss
index 84bd8659a..74dcbcf9b 100644
--- a/front/core/components/button/style.scss
+++ b/front/core/components/button/style.scss
@@ -1,5 +1,83 @@
-vn-button {
-    & > button > vn-icon {
-        vertical-align: middle;
+@import "variables";
+
+.vn-button {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    height: 36px;
+    border: none;
+    border-radius: .1em;
+    font-family: vn-font-bold;
+    text-transform: uppercase;
+    font-size: 14px;
+    cursor: pointer;
+    box-sizing: border-box;
+    outline: none;
+
+    & > button {
+        width: 100%;
+        padding: 0 12px;
+        box-sizing: border-box;
+        background-color: transparent;
+        border: none;
+        height: inherit;
+        color: inherit;
+        font: inherit;
+        display: block;
+        text-transform: inherit;
+        cursor: inherit;
+        outline: none;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
+        & > vn-icon {
+            vertical-align: middle;
+            color: inherit;
+            font-size: 1.7em;
+        }
     }
-}
\ No newline at end of file
+    &.colored {
+        color: white;
+        background-color: $color-main;
+        box-shadow: 0 .15em .15em 0 rgba(0, 0, 0, .3);
+        transition: background 200ms ease-in-out;
+
+        &:not(.disabled) {
+            &:hover,
+            &:focus {
+                background-color: lighten($color-main, 10%);
+            }
+        }
+    }
+    &.flat {
+        color: $color-main;
+        background-color: transparent;
+        box-shadow: none;
+        transition: background 200ms ease-in-out;
+
+        &:not(.disabled) {
+            &:hover,
+            &:focus {
+                background-color: $color-hover-cd;
+            }
+        }
+    }
+    &:hover,
+    &:focus {
+        outline: none;
+    }
+    &.round {
+        border-radius: 50%;
+        height: 3.8em;
+        width: 3.8em;
+
+        & > button > span {
+            display: none;
+        }
+    }
+    &.disabled {
+        opacity: .7;
+        cursor: initial;
+    }
+}
diff --git a/front/core/components/card/card.js b/front/core/components/card/card.js
index b812ccf61..a37835995 100644
--- a/front/core/components/card/card.js
+++ b/front/core/components/card/card.js
@@ -7,7 +7,7 @@ export default function directive() {
         transclude: true,
         template: require('./card.html'),
         link: function($scope, $element, $attrs, $ctrl, $transclude) {
-            $element.addClass('demo-card-wide mdl-shadow--2dp bg-panel');
+            $element.addClass('demo-card-wide vn-shadow bg-panel');
 
             $transclude($scope, function(clone) {
                 angular.element($element[0].querySelector('div')).append(clone);
diff --git a/front/core/components/chip/index.html b/front/core/components/chip/index.html
index 8696fd8bb..38a56923d 100644
--- a/front/core/components/chip/index.html
+++ b/front/core/components/chip/index.html
@@ -1,8 +1,7 @@
-<vn-one>
-    <span ng-class="{'mdl-chip--deletable': !$ctrl.disabled}" class="mdl-chip">
-        <span class="mdl-chip__text ellipsize" ng-transclude></span>
-        <button ng-click="$ctrl.remove()" ng-show="!$ctrl.disabled" type="button" class="mdl-chip__action">
-            <i class="material-icons">cancel</i>
-        </button>
-    </span>
-</vn-one>
\ No newline at end of file
+<div ng-transclude></div>
+<vn-icon
+    ng-click="$ctrl.onRemove()"
+    ng-if="$ctrl.removable"
+    icon="cancel"
+    tabindex="0">
+</vn-icon>
\ No newline at end of file
diff --git a/front/core/components/chip/index.js b/front/core/components/chip/index.js
index b35c00cbf..6a945559b 100644
--- a/front/core/components/chip/index.js
+++ b/front/core/components/chip/index.js
@@ -1,17 +1,12 @@
 import ngModule from '../../module';
+import Component from '../../lib/component';
 import './style.scss';
 
-export default class Chip {
-
-/**
- * Remove chip event
- */
-    remove() {
-        if (this.onRemove)
-            this.onRemove();
+export default class Chip extends Component {
+    onRemove() {
+        if (!this.disabled) this.emit('remove');
     }
 }
-
 Chip.$inject = ['$element', '$scope', '$transclude'];
 
 ngModule.component('vnChip', {
@@ -20,6 +15,6 @@ ngModule.component('vnChip', {
     transclude: true,
     bindings: {
         disabled: '<?',
-        onRemove: '&?'
+        removable: '<?'
     }
 });
diff --git a/front/core/components/chip/index.spec.js b/front/core/components/chip/index.spec.js
index 88faa759a..eaf6ff8c5 100644
--- a/front/core/components/chip/index.spec.js
+++ b/front/core/components/chip/index.spec.js
@@ -16,13 +16,13 @@ describe('Component vnChip', () => {
         controller = $componentController('vnChip', {$element, $scope, $transclude: () => {}});
     }));
 
-    describe('remove()', () => {
-        it(`should call onRemove()`, () => {
-            controller.onRemove = () => {};
-            spyOn(controller, 'onRemove');
-            controller.remove();
+    describe('onRemove()', () => {
+        it(`should emit remove event`, () => {
+            controller.emit = () => {};
+            spyOn(controller, 'emit');
+            controller.onRemove();
 
-            expect(controller.onRemove).toHaveBeenCalledWith();
+            expect(controller.emit).toHaveBeenCalledWith('remove');
         });
     });
 });
diff --git a/front/core/components/chip/style.scss b/front/core/components/chip/style.scss
index 81e81589c..ee7f46848 100644
--- a/front/core/components/chip/style.scss
+++ b/front/core/components/chip/style.scss
@@ -1,18 +1,53 @@
 @import "variables";
 
 vn-chip {
+    border-radius: 16px;
+    background-color: $color-bg;
     margin: 0 0.5em 0.5em 0;
+    color: $color-font;
+    font-size: 14px;
+    margin: .25em;
+    display: inline-flex;
+    align-items: center;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 28px;
+    padding: 0 .7em;
+    overflow: hidden;
 
-    .mdl-chip {
-        background-color: rgba($color-main, 0.9);
-        color: #FFF
+    &.colored {
+        background-color: $color-main;
+        color: $color-font-dark;
     }
-
-    .mdl-chip:active {
-        background-color: $color-main
-    }
-
-    & > vn-one > span > span {
+    & > div {
+        display: flex;
+        align-items: center;
         max-width: 100%;
+        height: 100%;
+
+        & > vn-avatar {
+            margin-left: -0.7em;
+            margin-right: .4em;
+        }
     }
+    & > vn-icon {
+        margin-left: .2em;
+        margin-right: -0.3em;
+        vertical-align: middle;
+        opacity: .6;
+        cursor: pointer;
+        transition: opacity 250ms ease-out;
+
+        &:hover,
+        &:focus {
+            opacity: 1;
+        }
+    }
+}
+
+vn-avatar {
+    display: inline-block;
+    height: 28px;
+    width: 28px;
+    border-radius: 50%;
 }
\ No newline at end of file
diff --git a/front/core/components/color-legend/index.html b/front/core/components/color-legend/index.html
deleted file mode 100644
index 613fb2347..000000000
--- a/front/core/components/color-legend/index.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<span
-    ng-class="{'pointer': $ctrl.$attrs['onClick']}"
-    class="mdl-chip mdl-chip--contact"
-    ng-repeat="legend in $ctrl.data track by $index"
-    ng-click="$ctrl.onClick(legend)">
-    <span class="mdl-chip__contact" ng-style="{backgroundColor: legend.color}"></span>
-    <span class="mdl-chip__text">{{legend.name}}</span>
-</span>
\ No newline at end of file
diff --git a/front/core/components/color-legend/index.js b/front/core/components/color-legend/index.js
deleted file mode 100644
index f72a501a7..000000000
--- a/front/core/components/color-legend/index.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import ngModule from '../../module';
-import Component from '../../lib/component';
-import './style.scss';
-
-export default class Controller extends Component {
-    constructor($element, $scope, $attrs) {
-        super($element, $scope);
-        this.$attrs = $attrs;
-    }
-
-    onClick(legend) {
-        this.emit('click', {legend});
-    }
-}
-
-Controller.$inject = ['$element', '$scope', '$attrs'];
-
-ngModule.component('vnColorLegend', {
-    template: require('./index.html'),
-    controller: Controller,
-    bindings: {
-        data: '<?'
-    }
-});
diff --git a/front/core/components/color-legend/style.scss b/front/core/components/color-legend/style.scss
deleted file mode 100644
index 615887c6d..000000000
--- a/front/core/components/color-legend/style.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-@import "variables";
-
-.mdl-chip--contact {
-    margin-left: 5px;
-    height: 20px;
-    line-height: 5px;
-    float: left    
-}
-
-.mdl-chip--contact .mdl-chip__contact {
-    height: 20px;
-    width: 20px
-}
\ No newline at end of file
diff --git a/front/core/components/field/index.js b/front/core/components/field/index.js
index 1004aeb05..ed99d1f5c 100644
--- a/front/core/components/field/index.js
+++ b/front/core/components/field/index.js
@@ -11,7 +11,6 @@ export default class Field extends FormInput {
         this.suffix = null;
 
         this.control = this.element.querySelector('.control');
-        this.classList = this.element.classList;
         this.classList.add('vn-field');
         this.element.addEventListener('click', e => this.onClick(e));
 
@@ -43,9 +42,11 @@ export default class Field extends FormInput {
     }
 
     set input(value) {
-        if (this.input) this.control.removeChild(this.input);
+        if (this.input)
+            this.control.removeChild(this.input);
         this._input = value;
-        this.control.appendChild(value);
+        if (value)
+            this.control.appendChild(value);
     }
 
     get input() {
@@ -69,12 +70,10 @@ export default class Field extends FormInput {
     }
 
     set name(value) {
-        // super.name = value;
         this.input.name = value;
     }
 
     get name() {
-        // return super.name;
         return this.input.name;
     }
 
@@ -86,36 +85,8 @@ export default class Field extends FormInput {
         return this.input.placeholder;
     }
 
-    set tabIndex(value) {
-        this.input.tabIndex = value;
-    }
-
-    get tabIndex() {
-        return this.input.tabIndex;
-    }
-
-    set disabled(value) {
-        this._disabled = boolTag(value);
-        this.input.disabled = this._disabled;
-        this.classList.toggle('disabled', this._disabled);
-    }
-
-    get disabled() {
-        return this._disabled;
-    }
-
-    set readonly(value) {
-        this._readonly = boolTag(value);
-        this.input.readOnly = this._readonly;
-        this.classList.toggle('readonly', this._readonly);
-    }
-
-    get readonly() {
-        return this._readonly;
-    }
-
     set required(value) {
-        this._required = boolTag(value);
+        this._required = value;
         let required = this.element.querySelector('.required');
         display(required, this._required);
     }
@@ -182,6 +153,10 @@ export default class Field extends FormInput {
         fix.innerText = text || '';
     }
 
+    refreshTabIndex() {
+        this.input.tabIndex = this.disabled ? -1 : this.tabIndex;
+    }
+
     onClick() {
         // if (event.defaultPrevented) return;
         // event.preventDefault();
@@ -252,15 +227,10 @@ ngModule.vnComponent('vnField', {
         suffix: '@?',
         hint: '@?',
         error: '<?',
-        tabIndex: '<?',
         rule: '@?'
     }
 });
 
-function boolTag(value) {
-    return Boolean(value || value === '');
-}
-
 function display(element, display) {
     element.style.display = display ? 'initial' : 'none';
 }
diff --git a/front/core/components/field/style.scss b/front/core/components/field/style.scss
index 9d45da3d2..8441fb04a 100644
--- a/front/core/components/field/style.scss
+++ b/front/core/components/field/style.scss
@@ -245,7 +245,6 @@
         }
     }
     & > .hint {
-        z-index: -1;
         padding: 4px 0;
         height: 12px;
         color: rgba(0, 0, 0, .4);
@@ -255,11 +254,12 @@
         transition-duration: 200ms;
         transition-timing-function: ease-in-out;
         opacity: 0;
+        visibility: hidden;
 
         &.filled {
-            z-index: 0;
             opacity: 1;
             transform: translateY(0);
+            visibility: visible;
         }
     }
     &.invalid {
diff --git a/front/core/components/float-button/float-button.html b/front/core/components/float-button/float-button.html
deleted file mode 100644
index e74a1fce7..000000000
--- a/front/core/components/float-button/float-button.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<button class="mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored">
-    <vn-icon icon="{{::$ctrl.icon}}"></vn-icon>
-</button>
\ No newline at end of file
diff --git a/front/core/components/float-button/float-button.js b/front/core/components/float-button/float-button.js
deleted file mode 100644
index beb3dd13b..000000000
--- a/front/core/components/float-button/float-button.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import ngModule from '../../module';
-
-ngModule.component('vnFloatButton', {
-    template: require('./float-button.html'),
-    bindings: {
-        icon: '@'
-    }
-});
diff --git a/front/core/components/float-button/index.js b/front/core/components/float-button/index.js
new file mode 100644
index 000000000..32ada7437
--- /dev/null
+++ b/front/core/components/float-button/index.js
@@ -0,0 +1,13 @@
+import ngModule from '../../module';
+import Button from '../button';
+
+export default class FloatButton extends Button {
+    constructor($element, $scope) {
+        super($element, $scope);
+        this.element.classList.add('round');
+    }
+}
+
+ngModule.vnComponent('vnFloatButton', {
+    controller: FloatButton
+});
diff --git a/front/core/components/form-input/index.js b/front/core/components/form-input/index.js
index 74d98079c..0a1297788 100644
--- a/front/core/components/form-input/index.js
+++ b/front/core/components/form-input/index.js
@@ -9,6 +9,11 @@ import Component from '../../lib/component';
  * @property {Boolean} disabled Put component in disabled mode
  */
 export default class FormInput extends Component {
+    constructor($element, $scope) {
+        super($element, $scope);
+        this.classList = this.element.classList;
+    }
+
     $onInit() {
         // XXX: Compatibility with old inputs
         let attrs = this.$element[0].attributes;
@@ -41,6 +46,48 @@ export default class FormInput extends Component {
     get name() {
         return this.element.getAttribute('name');
     }
+
+    set disabled(value) {
+        this._disabled = boolTag(value);
+        this.input.disabled = this._disabled;
+        this.classList.toggle('disabled', this._disabled);
+        this.refreshTabIndex();
+    }
+
+    get disabled() {
+        return this._disabled;
+    }
+
+    set readonly(value) {
+        this._readonly = boolTag(value);
+        this.input.readOnly = this._readonly;
+        this.classList.toggle('readonly', this._readonly);
+    }
+
+    get readonly() {
+        return this._readonly;
+    }
+
+    set tabIndex(value) {
+        this._tabIndex = value;
+        this.refreshTabIndex();
+    }
+
+    get tabIndex() {
+        return this._tabIndex;
+    }
+
+    select() {
+        this.input.select();
+    }
+
+    focus() {
+        this.input.focus();
+    }
+
+    refreshTabIndex() {
+        this.element.tabIndex = this.disabled ? -1 : this.tabIndex;
+    }
 }
 
 ngModule.vnComponent('vnFormInput', {
@@ -50,9 +97,14 @@ ngModule.vnComponent('vnFormInput', {
         field: '=?',
         name: '@?',
         disabled: '<?',
-        readonly: '<?'
+        readonly: '<?',
+        tabIndex: '<?'
     },
     require: {
         ngModel: '?ngModel'
     }
 });
+
+function boolTag(value) {
+    return Boolean(value || value === '');
+}
diff --git a/front/core/components/icon-button/icon-button.html b/front/core/components/icon-button/icon-button.html
deleted file mode 100644
index a3c30ed84..000000000
--- a/front/core/components/icon-button/icon-button.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<button type="button" ng-disabled="$ctrl.disabled">
-    <vn-icon icon="{{::$ctrl.icon}}">
-</button>
\ No newline at end of file
diff --git a/front/core/components/icon-button/icon-button.js b/front/core/components/icon-button/icon-button.js
deleted file mode 100644
index ba3ccae3e..000000000
--- a/front/core/components/icon-button/icon-button.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import ngModule from '../../module';
-import './style.scss';
-
-export default class IconButton {
-    constructor($element) {
-        this.element = $element[0];
-
-        if (this.element.getAttribute('tabindex') == null)
-            this.element.tabIndex = 0;
-
-        this.element.addEventListener('keyup', e => this.onKeyup(e));
-        this.element.addEventListener('click', e => this.onClick(e));
-    }
-
-    onKeyup(event) {
-        if (event.code == 'Space')
-            this.onClick(event);
-    }
-
-    onClick(event) {
-        if (event.defaultPrevented) return;
-        event.preventDefault();
-
-        // FIXME: Don't use Event.stopPropagation()
-        let button = this.element.querySelector('button');
-        if (this.disabled || button.disabled)
-            event.stopImmediatePropagation();
-    }
-}
-
-IconButton.$inject = ['$element'];
-ngModule.component('vnIconButton', {
-    controller: IconButton,
-    template: require('./icon-button.html'),
-    bindings: {
-        icon: '@',
-        disabled: '<?'
-    }
-});
diff --git a/front/core/components/icon-button/index.js b/front/core/components/icon-button/index.js
new file mode 100644
index 000000000..6becdc038
--- /dev/null
+++ b/front/core/components/icon-button/index.js
@@ -0,0 +1,14 @@
+import ngModule from '../../module';
+import Button from '../button';
+import './style.scss';
+
+export default class IconButton extends Button {
+    constructor($element, $scope) {
+        super($element, $scope);
+        this.design = null;
+    }
+}
+
+ngModule.vnComponent('vnIconButton', {
+    controller: IconButton
+});
diff --git a/front/core/components/icon-button/style.scss b/front/core/components/icon-button/style.scss
index 898e9fea0..3dd41d723 100644
--- a/front/core/components/icon-button/style.scss
+++ b/front/core/components/icon-button/style.scss
@@ -2,27 +2,12 @@
 
 vn-icon-button {
     @extend %clickable-light;
-    outline: 0;
     color: $color-main;
-    display: inline-flex;
-    align-items: center;
-    font-size: 18pt;
-    padding: .25em;
-    
-    & > button {
-        background-color: transparent;
-        display: block;
-        color: inherit;
-        border: 0;
-        padding: 0;
-        font-size: inherit;
 
-        &:hover {
-            background-color: initial;
-        }
-        & > vn-icon {
-            display: block;
-            font-size: inherit;
-        }
+    & > button {
+        padding: 0 !important;
+    }
+    &:focus {
+        opacity: .6;
     }
 }
diff --git a/front/core/components/icon-focusable/icon-focusable.html b/front/core/components/icon-focusable/icon-focusable.html
deleted file mode 100644
index 4bd8ad78a..000000000
--- a/front/core/components/icon-focusable/icon-focusable.html
+++ /dev/null
@@ -1 +0,0 @@
-<vn-icon icon="{{::$ctrl.icon}}"></vn-icon>
\ No newline at end of file
diff --git a/front/core/components/icon-focusable/icon-focusable.js b/front/core/components/icon-focusable/icon-focusable.js
deleted file mode 100644
index 691ee570f..000000000
--- a/front/core/components/icon-focusable/icon-focusable.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import ngModule from '../../module';
-import './style.scss';
-
-export default class IconFocusable {
-    constructor($element) {
-        $element[0].tabIndex = 0;
-        $element.on("keyup", event => this.onKeyDown(event, $element));
-    }
-
-    onKeyDown(event, $element) {
-        if (event.defaultPrevented) return;
-        if (event.keyCode == 32 || event.keyCode == 13) {
-            event.preventDefault();
-            $element.triggerHandler('click');
-        }
-    }
-}
-
-IconFocusable.$inject = ['$element'];
-ngModule.component('vnIconFocusable', {
-    controller: IconFocusable,
-    template: require('./icon-focusable.html'),
-    bindings: {
-        icon: '@',
-        className: '@?',
-        enabled: '<?',
-        label: '@?'
-    }
-});
diff --git a/front/core/components/icon-focusable/style.scss b/front/core/components/icon-focusable/style.scss
deleted file mode 100644
index bd32c52f1..000000000
--- a/front/core/components/icon-focusable/style.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-vn-icon-focusable {
-    display: inline-block;
-    text-align: center;
-
-    & > i,
-    & > i.material-icons {
-        display: block;
-        font-size: inherit;
-    }
-}
\ No newline at end of file
diff --git a/front/core/components/icon-menu/icon-menu.html b/front/core/components/icon-menu/icon-menu.html
deleted file mode 100644
index 93de718ff..000000000
--- a/front/core/components/icon-menu/icon-menu.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="icon-menu">
-    <vn-icon
-        class="button"
-        icon="{{::$ctrl.icon}}">
-    </vn-icon>
-    <vn-drop-down
-        vn-id="drop-down"
-        on-select="$ctrl.onDropDownSelect(item)"
-        ng-click="$ctrl.onDropDownClick($event)">
-    </vn-drop-down>
-</div>
\ No newline at end of file
diff --git a/front/core/components/icon-menu/icon-menu.js b/front/core/components/icon-menu/icon-menu.js
deleted file mode 100644
index abc94504e..000000000
--- a/front/core/components/icon-menu/icon-menu.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import ngModule from '../../module';
-import ButtonMenu from '../button-menu/button-menu';
-import './style.scss';
-
-export default class IconMenu extends ButtonMenu {
-    constructor($element, $scope, $transclude) {
-        super($element, $scope);
-        this.$transclude = $transclude;
-        this.input = this.element.querySelector('.button');
-    }
-}
-IconMenu.$inject = ['$element', '$scope', '$transclude'];
-
-ngModule.component('vnIconMenu', {
-    template: require('./icon-menu.html'),
-    bindings: {
-        label: '@',
-        showField: '@?',
-        selection: '<?',
-        valueField: '@?',
-        selectFields: '<?',
-        disabled: '<?',
-        initialData: '<?',
-        showFilter: '<?',
-        field: '=?',
-        url: '@?',
-        data: '<?',
-        where: '@?',
-        order: '@?',
-        limit: '<?',
-        multiple: '<?',
-        onChange: '&?',
-        icon: '@?',
-        translateFields: '<?',
-        onOpen: '&?'
-    },
-    transclude: {
-        tplItem: '?tplItem'
-    },
-    controller: IconMenu
-});
diff --git a/front/core/components/icon-menu/index.html b/front/core/components/icon-menu/index.html
new file mode 100644
index 000000000..0d59b3779
--- /dev/null
+++ b/front/core/components/icon-menu/index.html
@@ -0,0 +1,11 @@
+<button>
+    <vn-icon
+        class="button"
+        icon="{{::$ctrl.icon}}">
+    </vn-icon>
+</button>
+<vn-drop-down
+    vn-id="drop-down"
+    on-select="$ctrl.onDropDownSelect(item)"
+    ng-click="$ctrl.onDropDownClick($event)">
+</vn-drop-down>
\ No newline at end of file
diff --git a/front/core/components/icon-menu/index.js b/front/core/components/icon-menu/index.js
new file mode 100644
index 000000000..0549149a8
--- /dev/null
+++ b/front/core/components/icon-menu/index.js
@@ -0,0 +1,14 @@
+import ngModule from '../../module';
+import ButtonMenu from '../button-menu';
+
+export default class IconMenu extends ButtonMenu {
+    constructor($element, $scope) {
+        super($element, $scope);
+        this.element.classList.add('flat');
+    }
+}
+
+ngModule.vnComponent('vnIconMenu', {
+    template: require('./index.html'),
+    controller: IconMenu
+});
diff --git a/front/core/components/icon-menu/style.scss b/front/core/components/icon-menu/style.scss
deleted file mode 100644
index df7a5e331..000000000
--- a/front/core/components/icon-menu/style.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-vn-icon-menu {
-    cursor: pointer;
-
-    vn-drop-down {
-        font-family: 'vn-font';
-        outline: 0
-    }
-}
\ No newline at end of file
diff --git a/front/core/components/index.js b/front/core/components/index.js
index 0433744f6..50c1a1bf8 100644
--- a/front/core/components/index.js
+++ b/front/core/components/index.js
@@ -10,36 +10,35 @@ import './subtitle/subtitle';
 import './spinner/spinner';
 import './snackbar/snackbar';
 import './tooltip/tooltip';
-import './icon-menu/icon-menu';
-import './button-menu/button-menu';
 import './popover/popover';
 import './drop-down/drop-down';
 import './menu/menu';
 import './multi-check/multi-check';
-import './button/button';
-import './icon-button/icon-button';
-import './submit/submit';
 import './card/card';
-import './float-button/float-button';
 import './step-control/step-control';
 import './label-value/label-value';
 import './pagination/pagination';
 import './searchbar/searchbar';
 import './scroll-up/scroll-up';
 import './autocomplete';
+import './button';
+import './button-menu';
 import './calendar';
 import './check';
 import './chip';
-import './color-legend';
 import './data-viewer';
 import './date-picker';
 import './field';
+import './float-button';
+import './icon-menu';
+import './icon-button';
 import './input-number';
-import './input-range';
+import './range';
 import './input-time';
 import './input-file';
 import './list';
 import './radio';
+import './submit';
 import './table';
 import './td-editable';
 import './textarea';
diff --git a/front/core/components/input-file/index.html b/front/core/components/input-file/index.html
index 4e9c48631..58a2bea0c 100644
--- a/front/core/components/input-file/index.html
+++ b/front/core/components/input-file/index.html
@@ -1,42 +1,53 @@
-<div class="container"
-    ng-class="{selected: $ctrl.hasFocus}">
-    <div class="textField">
-        <div class="leftIcons" ng-transclude="leftIcons"></div>
-        <div class="infix">
-            <section class="value" ng-click="$ctrl.openFileSelector()" translate>
+<div class="container">
+    <div
+        ng-transclude="prepend"
+        class="prepend">
+    </div>
+    <div class="infix">
+        <div class="fix prefix"></div>
+        <div class="control">
+            <section
+                class="value"
+                ng-click="$ctrl.openFileSelector()"
+                translate>
                 {{$ctrl.value}}
             </section>
             <input
-                class="mdl-textfield__input"
-                type="file" 
-                name="{{::$ctrl.name}}" 
-                ng-model="$ctrl.files" 
-                vn-validation="{{$ctrl.rule}}" 
-                ng-disabled="$ctrl.disabled"
-                ng-readonly="$ctrl.readonly"
-                ng-focus="$ctrl.hasFocus = true"
-                ng-blur="$ctrl.hasFocus = false"
-                tabindex="{{$ctrl.input.tabindex}}"
-                accept="{{$ctrl.accept}}"/>
-            <label class="label">
-                <span translate>{{::$ctrl.label}}</span>
-                <span translate ng-show="::$ctrl.required">*</span>
-            </label> 
+                type="file"
+                ng-model="$ctrl.files"
+                accept="{{$ctrl.accept}}">
+            </input>
         </div>
-        <div class="underline"></div>
-        <div class="selected underline"></div>
-        <div class="suffix">
-            <i class="material-icons"
-                ng-if="::$ctrl.hasInfo"
-                vn-tooltip="{{::$ctrl.info}}">
-                info_outline
-            </i>
-            <vn-icon-button
-                icon="cloud_upload"
-                vn-tooltip="Select a file"
-                ng-click="$ctrl.openFileSelector()">
-            </vn-icon-button>
-        </div>
-        <div class="rightIcons" ng-transclude="rightIcons"></div>
+        <div class="fix suffix"></div>
+        <label>
+            <span translate>{{::$ctrl.label}}</span>
+            <span class="required">*</span>
+        </label> 
     </div>
+    <div class="icons pre">
+        <vn-icon
+            icon="clear"
+            translate-attr="{title: 'Clear'}"
+            ng-click="$ctrl.onClear($event)">
+        </vn-icon>
+        <vn-icon
+            icon="cloud_upload"
+            vn-tooltip="Select a file"
+            ng-click="$ctrl.openFileSelector()">
+        </vn-icon>
+        <vn-icon
+            ng-if="::$ctrl.info"
+            icon="info_outline"
+            vn-tooltip="{{::$ctrl.info}}">
+        </vn-icon>
+    </div>
+    <div
+        ng-transclude="append"
+        class="append">
+    </div>
+    <div class="icons post">
+    </div>
+    <div class="underline blur"></div>
+    <div class="underline focus"></div>
 </div>
+<div class="hint"></div>
diff --git a/front/core/components/input-file/index.js b/front/core/components/input-file/index.js
index d0f93e4f8..3a0066e75 100644
--- a/front/core/components/input-file/index.js
+++ b/front/core/components/input-file/index.js
@@ -1,15 +1,13 @@
 import ngModule from '../../module';
-import Input from '../../lib/input';
+import FormInput from '../form-input';
 import './style.scss';
 
-export default class InputFile extends Input {
+export default class InputFile extends FormInput {
     constructor($element, $scope) {
         super($element, $scope);
-        this.element = $element[0];
-        this.hasFocus = false;
         this._multiple = false;
         this._value = 'Select a file';
-
+        this.input = this.element.querySelector('input');
         this.registerEvents();
     }
 
@@ -106,26 +104,12 @@ export default class InputFile extends Input {
     }
 }
 
-InputFile.$inject = ['$element', '$scope'];
-
-ngModule.component('vnInputFile', {
+ngModule.vnComponent('vnInputFile', {
     template: require('./index.html'),
     controller: InputFile,
-    transclude: {
-        leftIcons: '?tLeftIcons',
-        rightIcons: '?tRightIcons'
-    },
     bindings: {
-        label: '@?',
-        name: '@?',
-        disabled: '<?',
         multiple: '<?',
-        required: '@?',
         accept: '@?',
-        rule: '@?',
-        files: '=model',
-        validate: '&',
-        onChange: '&',
-        onClear: '&'
+        files: '=model'
     }
 });
diff --git a/front/core/components/input-file/style.scss b/front/core/components/input-file/style.scss
index c5dd8922b..b0d5d50ca 100644
--- a/front/core/components/input-file/style.scss
+++ b/front/core/components/input-file/style.scss
@@ -7,159 +7,7 @@ vn-input-file {
         padding: 4px 0;
         outline: 0
     }
-    input {
-        display: none !important
-    }
-    margin: 20px 0;
-    display: inline-block;
-    width: 100%;
-
-    & > .container {
-        width: 100%;
-        position: relative;
-        padding-bottom: 2px;
-        display: flex;
-
-        & > .textField {
-            width: 100%;
-            display: flex;
-            align-items: center;
-            position: relative;
-            padding-top: 4px;
-        }
-    }
-
-    .leftIcons, .rightIcons, .suffix {
-        display: flex;
-        color: $color-font-secondary;
-        
-        .material-icons {
-            font-size: 20px !important
-        }
-    }
-
-    .suffix vn-icon-button {
-        padding: 0
-    }
-
-    t-left-icons {
-        padding-right: 0.5em
-    }
-
-    t-right-icons {
-        padding-left: 0.5em
-    }
-
-    .infix {
-        position: relative;
-        display: block;
-        flex: auto;
-        width: 100%;
-        min-width: 0;
-    }
-    i.clear {
-        visibility: hidden;
-        cursor: pointer;
-        outline: 0;
-
-        &:hover {
-            color: #222;
-        }
-    }
-    &:hover i.clear {
-        visibility: visible;
-    }
-    i.visible {
-        visibility: visible;
-    }
-    label {
-        position: absolute;
-        bottom: 0;
-        left: 0;
-        padding: 4px 0!important;
-        pointer-events: none;
-        color: $color-font-secondary;
-        transition-duration: .2s;
-        transition-timing-function: cubic-bezier(.4,0,.2,1);
-    }
-    &.not-empty label{
-        bottom: 24px;
-        color: $color-main;
-        padding: 0;
-        font-size: 12px;
-    }
-    input {
-        outline: none;
-        border: none;
-        font-family: "Helvetica", "Arial", sans-serif;
-        display: block;
-        font-size: 16px;
-        width: 100%;
-        background: 0 0;
-        color: inherit;
-        padding: 4px;
-        box-sizing: border-box;
-        border-bottom: 0!important;
-
-        &[type=number] {
-            -moz-appearance: textfield;
-            &::-webkit-outer-spin-button,
-            &::-webkit-inner-spin-button {
-                -webkit-appearance: none;
-                margin: 0;
-            }
-        }
-        &:invalid {
-            box-shadow: none;
-        }
-    }
-    .underline {
-        position: absolute;
-        bottom: 0;
-        height: 1px;
-        content: ' ';
-        pointer-events: none;
-        width: 100%;
-        background-color: $color-input-underline;
-    }
-    .selected.underline {
-        background-color: $color-main;
-        height: 2px;
-        left: 50%;
-        width: 0px !important;
-        transition-duration: 0.2s;
-        transition-timing-function: cubic-bezier(.4,0,.2,1);
-    }
-
-    div.selected {
-        &.container{
-            border-bottom: 0px;
-        }
-        label {
-            bottom: 24px;
-            color: $color-main;
-            font-size: 12px;
-        }
-        .selected.underline{
-            left: 0;
-            width: 100%!important;
-        }
-    }
-    & > div.container > div.textField > div.infix.invalid {
-        @extend div.selected;
-
-        & > span.mdl-textfield__error {
-            visibility: visible;
-        }
-        & > label {
-            color: #d50000;
-        }
-    }
-    .infix.invalid + .underline {
-        background-color: #d50000;
-    }
-
-    label span:nth-child(2) {
-        color: $color-alert
+    input[type=file] {
+        display: none;
     }
 }
\ No newline at end of file
diff --git a/front/core/components/input-range/index.html b/front/core/components/input-range/index.html
deleted file mode 100644
index 649e4de9f..000000000
--- a/front/core/components/input-range/index.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div>
-    <label translate>{{::$ctrl.label}}</label>
-    <input
-        name="{{$ctrl.name}}"
-        class="mdl-slider mdl-js-slider"
-        type="range"/>
-    <label class="min-label" translate>Company</label>
-    <label class="max-label" translate>Sales/Client</label>
-</div>
\ No newline at end of file
diff --git a/front/core/components/input-range/index.js b/front/core/components/input-range/index.js
deleted file mode 100644
index 8cfd898c7..000000000
--- a/front/core/components/input-range/index.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import ngModule from '../../module';
-import Input from '../../lib/input';
-import './style.scss';
-
-export default class inputRange extends Input {
-    constructor($element, $scope) {
-        super($element, $scope);
-        this.mdlElement = this.element.querySelector('.mdl-slider');
-        componentHandler.upgradeElement(this.mdlElement);
-        this.mdlElement.addEventListener('change', () => {
-            this._value = this.input.value;
-            this.$.$applyAsync();
-            if (this._value && this.onChange)
-                this.emit('change', {value: this._value});
-        });
-    }
-
-    get value() {
-        return this._value;
-    }
-
-    set value(value) {
-        this._value = value;
-        this.mdlElement.MaterialSlider.change(value);
-    }
-
-    get max() {
-        return this.input.max;
-    }
-
-    set max(value) {
-        this.input.max = value;
-    }
-
-    get min() {
-        return this.input.min;
-    }
-
-    set min(value) {
-        this.input.min = value;
-    }
-
-    get step() {
-        return this.input.step;
-    }
-
-    set step(value) {
-        this.input.step = value;
-    }
-
-    get() {
-        return this._model;
-    }
-
-    set model(value) {
-        this._model = value;
-    }
-
-    set disabled(value) {
-        this.input.disabled = value;
-    }
-}
-
-inputRange.$inject = ['$element', '$scope'];
-
-ngModule.component('vnInputRange', {
-    template: require('./index.html'),
-    controller: inputRange,
-    bindings: {
-        label: '@?',
-        disabled: '<?',
-        min: '<?',
-        max: '<?',
-        step: '<?',
-        value: '=',
-        model: '=',
-        onChange: '&'
-    }
-});
diff --git a/front/core/components/input-range/style.scss b/front/core/components/input-range/style.scss
deleted file mode 100644
index fc6943e70..000000000
--- a/front/core/components/input-range/style.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-@import "variables";
-vn-input-range {
-    label {
-        color: $color-main;
-        font-size: 12px;
-        padding: 0 25px;
-    }
-    label.min-label, label.max-label {
-        color: $color-font;
-    }
-    label.max-label {
-        float: right;
-    }
-}
\ No newline at end of file
diff --git a/front/core/components/list/style.scss b/front/core/components/list/style.scss
index 7560d3288..0786cacf8 100644
--- a/front/core/components/list/style.scss
+++ b/front/core/components/list/style.scss
@@ -24,11 +24,10 @@
     
                 vn-icon-button {
                     opacity: .4;
-                    color: $color-main;
                     margin-left: .5em;
                     transition: opacity 250ms ease-out;
                     padding: 0;
-                    font-size: 2em;
+                    font-size: 1.2em;
     
                     &:hover {
                         opacity: 1;
diff --git a/front/core/components/multi-check/multi-check.js b/front/core/components/multi-check/multi-check.js
index 63f89f84e..d354c9eef 100644
--- a/front/core/components/multi-check/multi-check.js
+++ b/front/core/components/multi-check/multi-check.js
@@ -1,5 +1,5 @@
 import ngModule from '../../module';
-import Input from '../../lib/input';
+import FormInput from '../form-input';
 import './style.scss';
 
 /**
@@ -8,7 +8,7 @@ import './style.scss';
  * @param {Array} data List of options shown in drop-down
  * @param {Array} models Elements to check / unCheck
  */
-export default class MultiCheck extends Input {
+export default class MultiCheck extends FormInput {
     constructor($element, $scope) {
         super($element, $scope);
         this._checked = false;
diff --git a/front/core/components/range/index.html b/front/core/components/range/index.html
new file mode 100644
index 000000000..ea35db58a
--- /dev/null
+++ b/front/core/components/range/index.html
@@ -0,0 +1,4 @@
+<label class="main" translate>{{::$ctrl.label}}</label>
+<input name="{{::$ctrl.name}}" type="range"></input>
+<label class="min-label" translate>{{::$ctrl.minLabel}}</label>
+<label class="max-label" translate>{{::$ctrl.maxLabel}}</label>
\ No newline at end of file
diff --git a/front/core/components/range/index.js b/front/core/components/range/index.js
new file mode 100644
index 000000000..80410875a
--- /dev/null
+++ b/front/core/components/range/index.js
@@ -0,0 +1,50 @@
+import ngModule from '../../module';
+import FormInput from '../form-input';
+import './style.scss';
+
+export default class Range extends FormInput {
+    constructor($element, $scope) {
+        super($element, $scope);
+        this.input = this.element.querySelector('input');
+    }
+
+    get max() {
+        return this.input.max;
+    }
+
+    set max(value) {
+        this.input.max = value;
+    }
+
+    get min() {
+        return this.input.min;
+    }
+
+    set min(value) {
+        this.input.min = value;
+    }
+
+    get step() {
+        return this.input.step;
+    }
+
+    set step(value) {
+        this.input.step = value;
+    }
+
+    refreshTabIndex() {
+        this.input.tabIndex = this.disabled ? -1 : this.tabIndex;
+    }
+}
+
+ngModule.vnComponent('vnRange', {
+    template: require('./index.html'),
+    controller: Range,
+    bindings: {
+        min: '<?',
+        max: '<?',
+        step: '<?',
+        minLabel: '@?',
+        maxLabel: '@?'
+    }
+});
diff --git a/front/core/components/range/style.scss b/front/core/components/range/style.scss
new file mode 100644
index 000000000..878035f3a
--- /dev/null
+++ b/front/core/components/range/style.scss
@@ -0,0 +1,84 @@
+@import "variables";
+
+@mixin range($thumb-selector, $track-selector) {
+    &::#{$thumb-selector} {
+        -webkit-appearance: none;
+        margin-top: -5px;
+        border-radius: 50%;
+        background: $color-main;
+        border: none;
+        height: 12px;
+        width: 12px;
+        border-radius: 50%;
+        transition-property: transform, box-shadow;
+        transition-duration: 250ms;
+        transition-timing-function: ease-out;
+    }
+    &:focus::#{$thumb-selector} {
+        box-shadow: 0 0 0 10px rgba($color-main, .2);
+    }
+    &:active::#{$thumb-selector} {
+        transform: scale(1.5);
+        box-shadow: none;
+    }
+    &:disabled::#{$thumb-selector} {
+        transform: none;
+        cursor: initial;
+    }
+    &::#{$track-selector} {
+        width: 100%;
+        height: 3px;
+        cursor: inherit;
+        background: $color-secondary;
+        border-radius: 2px;
+        border: none;
+    }
+}
+
+vn-range {
+    & > label {
+        font-size: 12px;
+
+        &.main {
+            color: $color-main;
+        }
+        &.min-label {
+            float: left;
+        }
+        &.max-label {
+            float: right;
+        }
+    }
+    & > input {
+        cursor: pointer;
+        height: 30px;
+        display: block;
+        width: 100%;
+        background: transparent;
+        border-color: transparent;
+        -webkit-appearance: none;
+        margin: .2em 0;
+
+        &:focus {
+            outline: none;
+        }
+        &::-moz-focus-outer {
+            border: 0;
+        }
+        @include range(
+            "-moz-range-thumb",
+            "-moz-range-track"
+        );
+        @include range(
+            "-webkit-slider-thumb",
+            "-webkit-slider-runnable-track"
+        );
+        @include range(
+            "-ms-thumb",
+            "-ms-track"
+        );
+        &:disabled {
+            cursor: initial;
+        }
+    }
+}
diff --git a/front/core/components/scroll-up/scroll-up.html b/front/core/components/scroll-up/scroll-up.html
index 3f3b309d5..a3748acc6 100644
--- a/front/core/components/scroll-up/scroll-up.html
+++ b/front/core/components/scroll-up/scroll-up.html
@@ -1,5 +1,6 @@
-<button class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-js-ripple-effect mdl-button--colored"
+<vn-button
+    icon="keyboard_arrow_up"
     ng-click="$ctrl.goUp()"
-    vn-tooltip="Go up">
-    <vn-icon icon="keyboard_arrow_up"></vn-icon>
-</button>
\ No newline at end of file
+    vn-tooltip="Go up"
+    class="round">
+</vn-button>
\ No newline at end of file
diff --git a/front/core/components/scroll-up/style.scss b/front/core/components/scroll-up/style.scss
index 0d5cd6c58..1bf7ea982 100644
--- a/front/core/components/scroll-up/style.scss
+++ b/front/core/components/scroll-up/style.scss
@@ -1,6 +1,6 @@
 vn-scroll-up {
-    top: 5em;
-    right: 2.5em;
+    top: 5.5em;
+    right: 2em;
     display: none;
     position: fixed;
 }
\ No newline at end of file
diff --git a/front/core/components/searchbar/style.scss b/front/core/components/searchbar/style.scss
index b3fa4b1a2..03cc0cd8d 100644
--- a/front/core/components/searchbar/style.scss
+++ b/front/core/components/searchbar/style.scss
@@ -2,6 +2,7 @@
 
 vn-searchbar {
     display: block;
+    width: 100%;
 }
 
 .search-panel {
diff --git a/front/core/components/spinner/spinner.html b/front/core/components/spinner/spinner.html
index 47b6e42fe..b6a3af8be 100644
--- a/front/core/components/spinner/spinner.html
+++ b/front/core/components/spinner/spinner.html
@@ -1,2 +1,12 @@
-<div class="mdl-spinner mdl-spinner--single-color mdl-js-spinner">
+<div class="loader">
+    <svg class="circular" viewBox="25 25 50 50">
+    <circle
+        class="path"
+        cx="50"
+        cy="50"
+        r="20"
+        fill="none"
+        stroke-miterlimit="10">
+    </circle>
+    </svg>
 </div>
\ No newline at end of file
diff --git a/front/core/components/spinner/spinner.js b/front/core/components/spinner/spinner.js
index ca87323d5..aee973aa6 100644
--- a/front/core/components/spinner/spinner.js
+++ b/front/core/components/spinner/spinner.js
@@ -1,19 +1,18 @@
 import ngModule from '../../module';
 import Component from '../../lib/component';
-import './style.css';
+import './style.scss';
 
 /**
  * A spinner to inform the user about loading process.
  */
 export default class Spinner extends Component {
     constructor($element, $scope) {
-        super($element);
+        super($element, $scope);
         this._enable = false;
         this.spinner = $element[0].firstChild;
-        componentHandler.upgradeElement(this.spinner);
     }
     /**
-     * Enables/disables the spinner.
+     * Activates/deactivates the spinner.
      *
      * @param {Boolean} value %true to enable, %false to disable
      */
@@ -35,14 +34,14 @@ export default class Spinner extends Component {
      * Activates the spinner.
      */
     start() {
-        this.spinner.MaterialSpinner.start();
+        this.spinner.style.display = 'block';
         this._enable = true;
     }
     /**
      * Deactivates the spinner.
      */
     stop() {
-        this.spinner.MaterialSpinner.stop();
+        this.spinner.style.display = 'none';
         this._enable = false;
     }
 }
diff --git a/front/core/components/spinner/spinner.spec.js b/front/core/components/spinner/spinner.spec.js
index cb23783f7..437139c8c 100644
--- a/front/core/components/spinner/spinner.spec.js
+++ b/front/core/components/spinner/spinner.spec.js
@@ -1,7 +1,6 @@
 import './spinner.js';
 
 describe('Component vnSpinner', () => {
-    let $scope;
     let $element;
     let controller;
 
@@ -9,53 +8,44 @@ describe('Component vnSpinner', () => {
         $translateProvider.translations('en', {});
     }));
 
-    beforeEach(angular.mock.inject(($componentController, $rootScope) => {
-        $scope = $rootScope.$new();
-        $element = angular.element('<div><div></div></div>');
-        controller = $componentController('vnSpinner', {$scope, $element});
+    beforeEach(angular.mock.inject(($compile, $rootScope) => {
+        $element = $compile(`<vn-spinner></vn-spinner>`)($rootScope);
+        controller = $element.controller('vnSpinner');
     }));
 
+    afterEach(() => {
+        $element.remove();
+    });
+
     describe('enable()', () => {
-        it(`should call start() based on a boolean value passed as argument`, () => {
+        it(`should call start() when enable is set to true`, () => {
             spyOn(controller, 'start');
-            spyOn(controller, 'stop');
             controller.enable = true;
 
             expect(controller.start).toHaveBeenCalledWith();
-            expect(controller.stop).not.toHaveBeenCalledWith();
         });
 
-        it(`should call stop() based on a boolean value passed as argument`, () => {
-            spyOn(controller, 'start');
+        it(`should call stop() when enable is set to false`, () => {
             spyOn(controller, 'stop');
             controller.enable = false;
 
-            expect(controller.start).not.toHaveBeenCalledWith();
             expect(controller.stop).toHaveBeenCalledWith();
         });
     });
 
     describe('start()', () => {
-        it(`should call start() on the controller.materialSpinner then set controllers._enable to be truthy`, () => {
-            controller.spinner = {MaterialSpinner: {start: () => {}}};
-            spyOn(controller.spinner.MaterialSpinner, 'start');
-            controller._enable = false;
+        it(`should set enable to true`, () => {
             controller.start();
 
-            expect(controller.spinner.MaterialSpinner.start).toHaveBeenCalledWith();
-            expect(controller._enable).toBeTruthy();
+            expect(controller.enable).toBeTruthy();
         });
     });
 
     describe('stop()', () => {
-        it(`should call stop() on the controller.materialSpinner then set controllers._enable to be truthy`, () => {
-            controller.spinner = {MaterialSpinner: {stop: () => {}}};
-            spyOn(controller.spinner.MaterialSpinner, 'stop');
-            controller._enable = true;
+        it(`should set enable to false`, () => {
             controller.stop();
 
-            expect(controller.spinner.MaterialSpinner.stop).toHaveBeenCalledWith();
-            expect(controller._enable).toBeFalsy();
+            expect(controller.enable).toBeFalsy();
         });
     });
 });
diff --git a/front/core/components/spinner/style.css b/front/core/components/spinner/style.css
deleted file mode 100644
index fbcd1a0bf..000000000
--- a/front/core/components/spinner/style.css
+++ /dev/null
@@ -1,3 +0,0 @@
-vn-spinner {
-    display: inline-block;
-}
\ No newline at end of file
diff --git a/front/core/components/spinner/style.scss b/front/core/components/spinner/style.scss
new file mode 100644
index 000000000..3be908caf
--- /dev/null
+++ b/front/core/components/spinner/style.scss
@@ -0,0 +1,60 @@
+@import "variables";
+
+vn-spinner {
+    display: inline-block;
+    min-height: 28px;
+    min-width: 28px;
+
+    & > .loader {
+        position: relative;
+        margin: 0 auto;
+        width: 100%;
+        height: 100%;
+
+        &:before {
+            content: '';
+            display: block;
+            padding-top: 100%;
+        }
+        & > .circular {
+            animation: rotate 2s linear infinite;
+            transform-origin: center center;
+            height: 100%;
+            width: 100%;
+            position: absolute;
+            top: 0;
+            bottom: 0;
+            left: 0;
+            right: 0;
+            margin: auto;
+
+            & > .path {
+                stroke: $color-main;
+                stroke-dasharray: 1, 200;
+                stroke-dashoffset: 0;
+                stroke-linecap: square;
+                stroke-width: 6px;
+                animation: dash 1.5s ease-in-out infinite;
+            }
+        }
+    }
+    @keyframes rotate {
+        100% {
+            transform: rotate(360deg);
+        }
+    }
+    @keyframes dash {
+        0% {
+            stroke-dasharray: 1, 200;
+            stroke-dashoffset: 0;
+        }
+        50% {
+            stroke-dasharray: 89, 200;
+            stroke-dashoffset: -35px;
+        }
+        100% {
+            stroke-dasharray: 89, 200;
+            stroke-dashoffset: -124px;
+        }
+    }
+}
\ No newline at end of file
diff --git a/front/core/components/step-control/style.scss b/front/core/components/step-control/style.scss
index e1c29c9a2..9acc1f314 100644
--- a/front/core/components/step-control/style.scss
+++ b/front/core/components/step-control/style.scss
@@ -41,11 +41,5 @@ vn-step-control {
         & > .buttons > .step {
             display: flex
         }
-        & > .buttons > .step > .mdl-button {
-            line-height: 32px;
-            font-size: 12px;
-            padding: 0 12px;
-            height: 32px
-        }
     }
 }
\ No newline at end of file
diff --git a/front/core/components/submit/index.js b/front/core/components/submit/index.js
new file mode 100644
index 000000000..ced73f0ba
--- /dev/null
+++ b/front/core/components/submit/index.js
@@ -0,0 +1,13 @@
+import ngModule from '../../module';
+import Button from '../button';
+
+export default class Controller extends Button {
+    constructor($element, $scope) {
+        super($element, $scope);
+        this.type = 'submit';
+    }
+}
+
+ngModule.vnComponent('vnSubmit', {
+    controller: Controller
+});
diff --git a/front/core/components/submit/submit.html b/front/core/components/submit/submit.html
deleted file mode 100644
index 6e77e4c16..000000000
--- a/front/core/components/submit/submit.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<input
-    class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored"
-    type="submit"
-    translate-attr="{value: $ctrl.label}"
-    value="$ctrl.label">
-</input>
diff --git a/front/core/components/submit/submit.js b/front/core/components/submit/submit.js
deleted file mode 100644
index 41d63cf1d..000000000
--- a/front/core/components/submit/submit.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import ngModule from '../../module';
-import Input from '../../lib/input';
-
-export default class Controller extends Input {
-    constructor($element, $scope) {
-        super($element, $scope);
-        this.$element = $element;
-        this.input = $element[0].querySelector('input');
-    }
-
-    set disabled(value) {
-        this.input.disabled = value;
-    }
-}
-
-Controller.$inject = ['$element', '$scope'];
-
-ngModule.component('vnSubmit', {
-    template: require('./submit.html'),
-    controller: Controller,
-    bindings: {
-        label: '@?',
-        disabled: '<?',
-    }
-});
diff --git a/front/core/components/td-editable/index.js b/front/core/components/td-editable/index.js
index 64f29cddc..844e7501e 100644
--- a/front/core/components/td-editable/index.js
+++ b/front/core/components/td-editable/index.js
@@ -1,6 +1,6 @@
 import ngModule from '../../module';
 import Component from '../../lib/component';
-import Input from '../../lib/input';
+import FormInput from '../form-input';
 import './style.scss';
 
 export default class Controller extends Component {
@@ -37,7 +37,7 @@ export default class Controller extends Component {
             }
 
             let inputCtrl = this.field[0].firstElementChild.$ctrl;
-            if (inputCtrl instanceof Input) {
+            if (inputCtrl instanceof FormInput) {
                 let evt = new MouseEvent('click', {
                     bubbles: true,
                     cancelable: true,
diff --git a/front/core/components/toggle/index.js b/front/core/components/toggle/index.js
index d9b4e05bd..54f5b8158 100644
--- a/front/core/components/toggle/index.js
+++ b/front/core/components/toggle/index.js
@@ -19,15 +19,24 @@ export default class Toggle extends FormInput {
     }
 
     set disabled(value) {
-        this.element.tabIndex = !value ? 0 : -1;
-        this.element.classList.toggle('disabled', Boolean(value));
         this._disabled = value;
+        this.classList.toggle('disabled', Boolean(value));
+        this.refreshTabIndex();
     }
 
     get disabled() {
         return this._disabled;
     }
 
+    set readonly(value) {
+        this._readonly = value;
+        this.classList.toggle('readonly', Boolean(value));
+    }
+
+    get readonly() {
+        return this._readonly;
+    }
+
     onKeydown(event) {
         if (event.code == 'Space')
             this.onClick(event);
diff --git a/front/core/components/toggle/style.scss b/front/core/components/toggle/style.scss
index 72f99cb35..13b7406f6 100644
--- a/front/core/components/toggle/style.scss
+++ b/front/core/components/toggle/style.scss
@@ -12,6 +12,9 @@
     }
     & > span {
         font-size: $input-font-size;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
     }
     & > .btn {
         position: relative;
diff --git a/front/core/components/tooltip/tooltip.js b/front/core/components/tooltip/tooltip.js
index e0bc323eb..036ec6958 100644
--- a/front/core/components/tooltip/tooltip.js
+++ b/front/core/components/tooltip/tooltip.js
@@ -13,7 +13,7 @@ export default class Tooltip extends Component {
     constructor($element, $scope, $timeout) {
         super($element, $scope);
         this.$timeout = $timeout;
-        $element.addClass('vn-tooltip mdl-shadow--4dp');
+        $element.addClass('vn-tooltip vn-shadow');
         this.position = 'down';
         this.margin = 10;
     }
diff --git a/front/core/directives/acl.js b/front/core/directives/acl.js
index f9df740cf..1cebddd42 100644
--- a/front/core/directives/acl.js
+++ b/front/core/directives/acl.js
@@ -1,110 +1,41 @@
 import ngModule from '../module';
+import FormInput from '../components/form-input';
 
-function vnAcl(aclService, $timeout) {
+function vnAcl(aclService) {
     let acls = [];
 
-    function getMaterialType(className) {
-        let type = '';
-        if (className) {
-            type = className.replace('mdl-', '').replace('__input', '');
-            type = type.charAt(0).toUpperCase() + type.slice(1);
-        }
-        return type;
-    }
-    function updateMaterial(input) {
-        if (input && input.className) {
-            let find = input.className.match(/mdl-[\w]+input/g);
-            if (find && find.length && find[0]) {
-                let type = getMaterialType(find[0]);
-                if (type && input.parentNode[`Material${type}`] && input.parentNode[`Material${type}`].updateClasses_)
-                    input.parentNode[`Material${type}`].updateClasses_();
-            }
-        }
-    }
-    function getDynamicConditions($attrs) {
-        let atributes = $attrs.$attr;
-        let conditions = {};
-
-        Object.keys(atributes).forEach(atribute => {
-            if (atribute.startsWith('aclConditionalTo')) {
-                let role = atributes[atribute].split('-').slice(-1)[0];
-                conditions[atribute] = {
-                    role: role
-                };
-            }
-        });
-        return conditions;
-    }
-
-    function permissionElement($element, action) {
-        if (!aclService.hasAny(acls)) {
-            if (action === 'disabled') {
-                let element = $element[0];
-                let selector = 'input, textarea, button, submit, md-checkbox';
-
-                if (element.$ctrl) {
-                    element.setAttribute('disabled', 'true');
-                    element.$ctrl.disabled = true;
-                }
-
-                if (!element.matches(selector))
-                    element = element.querySelector(selector);
-
-                if (element) {
-                    $timeout(() => {
-                        element.setAttribute('disabled', 'true');
-                        updateMaterial(element);
-                    });
-                    $element[0].querySelectorAll('vn-drop-down').forEach(element => {
-                        element.parentNode.removeChild(element);
-                    });
-                }
-            } else
-                $element.remove();
-        }
-    }
-
-    function updateAcls(role, toAdd) {
-        let position = acls.indexOf(role);
-
-        if (!toAdd && position > -1)
-            acls.splice(position, 1);
-        // XXX: add acl and enabled element if previusly was disabled
-    }
-
     return {
         restrict: 'A',
         priority: -1,
-        link: function($scope, $element, $attrs) {
+        link: function(_, $element, $attrs) {
             acls = $attrs.vnAcl.split(',').map(i => i.trim());
 
             if (acls[0] == '') return;
 
-            let action = $attrs.vnAclAction || 'disabled';
-            let conditions = getDynamicConditions($attrs);
+            let action = $attrs.vnAclAction || 'disable';
 
-            permissionElement($element, action);
+            if (aclService.hasAny(acls)) return;
 
-            if (Object.keys(conditions).length) {
-                let watchConditions = $scope.$watch(() => {
-                    Object.keys(conditions).forEach(attrName => {
-                        let hasPermission = $scope.$eval($attrs[attrName]);
-                        if (!hasPermission) {
-                            updateAcls(conditions[attrName].role, hasPermission);
-                            permissionElement($element, action);
-                            delete conditions[attrName];
-                        }
-                    });
+            if (action === 'disable') {
+                let element = $element[0];
+                let elementToDisable = element.$ctrl;
 
-                    if (Object.keys(conditions).length === 0) {
-                        // unWacth
-                        watchConditions();
-                    }
-                });
-            }
+                if (!(elementToDisable instanceof FormInput)) {
+                    let selector = 'input, textarea, button, submit';
+
+                    if (!element.matches(selector))
+                        element = element.querySelector(selector);
+
+                    elementToDisable = element;
+                }
+
+                if (elementToDisable)
+                    elementToDisable.disabled = true;
+            } else
+                $element.remove();
         }
     };
 }
-vnAcl.$inject = ['aclService', '$timeout'];
+vnAcl.$inject = ['aclService'];
 
 ngModule.directive('vnAcl', vnAcl);
diff --git a/front/core/directives/specs/acl.spec.js b/front/core/directives/specs/acl.spec.js
index 523fb28bd..a7884a12d 100644
--- a/front/core/directives/specs/acl.spec.js
+++ b/front/core/directives/specs/acl.spec.js
@@ -1,54 +1,97 @@
 describe('Directive acl', () => {
-    let scope;
+    let $scope;
+    let $element;
     let element;
     let compile;
-    let $timeout;
 
     beforeEach(angular.mock.module('vnCore', $translateProvider => {
         $translateProvider.translations('en', {});
     }));
 
-    compile = (hasPermissions, _element) => {
-        inject(($compile, $rootScope, aclService, _$timeout_) => {
-            spyOn(aclService, 'hasAny').and.returnValue(hasPermissions);
-            scope = $rootScope.$new();
-            $timeout = _$timeout_;
-            element = angular.element(_element);
-            $compile(element)(scope);
-            scope.$digest();
+    beforeEach(inject(($httpBackend, aclService) => {
+        $httpBackend.whenGET('/api/Accounts/acl')
+            .respond({
+                user: {id: 1, name: 'myUser'},
+                roles: [
+                    {role: {name: 'myRole'}},
+                    {role: {name: 'myOtherRole'}}
+                ]
+            });
+        aclService.load();
+        $httpBackend.flush();
+    }));
+
+    afterEach(() => {
+        $element.remove();
+        $scope.$destroy();
+    });
+
+    compile = html => {
+        inject(($compile, $rootScope) => {
+            $scope = $rootScope.$new();
+            $element = $compile(html)($scope);
+            $scope.$digest();
+            element = $element[0];
         });
     };
 
-    it('should not disable the input element as the user has permision', () => {
-        let html = `<div vn-acl="administrative,client" vn-acl-action="disabled"><input/></div>`;
-        compile(true, html);
-        let input = element.find('input');
+    it('should not disable the input element as the user owns the role', () => {
+        let html = `
+            <div
+                vn-acl="randomRole, myRole"
+                vn-acl-action="disable">
+                <input/>
+            </div>
+        `;
+        compile(html);
+        let input = element.querySelector('input');
 
-        expect(input).toBeDefined();
-        expect(input.attr('disabled')).toBeFalsy();
+        expect(input.disabled).toBeFalsy();
     });
 
-    it('should delete the element as the user does not have permission and there is no action', () => {
-        let html = `<container><div vn-acl="administrative,client" vn-acl-action="anything but disabled"><input/></div></container>`;
-        compile(false, html);
+    it('should disable the element as the action is to disable and the user does not own the role', () => {
+        let html = `
+            <div
+                vn-acl="unownedRole, randomRole"
+                vn-acl-action="disable">
+                <input/>
+            </div>
+        `;
+        compile(html);
+        let input = element.querySelector('input');
 
-        expect(element.children().length).toEqual(0);
+        expect(input.disabled).toBeTruthy();
     });
 
-    it('should disable the element as the action is to disable it but the user has no permission but present', () => {
-        let html = `<div vn-acl="administrative,client" vn-acl-action="disabled"><input/></div>`;
-        compile(false, html);
-        let input = element.find('input');
-        $timeout.flush();
+    it('should keep the element as the action is to remove and the user owns the role', () => {
+        let html = `
+            <section>
+                <div
+                    vn-acl="myOtherRole, randomRole"
+                    vn-acl-action="remove">
+                    <input/>
+                </div>
+            </section>
+        `;
+        compile(html);
+        let div = element.querySelector('div');
 
-        expect(input).toBeDefined();
-        expect(input.attr('disabled')).toBeTruthy();
+        expect(div).not.toBeNull();
     });
 
-    it('should delete any element with the tag vn-drop-down', () => {
-        let html = `<div vn-acl="administrative,client" vn-acl-action="disabled"><vn-drop-down></vn-drop-down><input/></div>`;
-        compile(false, html);
+    it('should delete the element as the action is to remove and the user does not own the role', () => {
+        let html = `
+            <section>
+                <div
+                    vn-acl="unownedRole, randomRole"
+                    vn-acl-action="remove">
+                    <input/>
+                </div>
+            </section>
+        `;
+        compile(html);
+        let div = element.querySelector('div');
 
-        expect(element.find('vn-drop-down').length).toBe(0);
+        expect(div).toBeNull();
     });
 });
diff --git a/front/core/lib/input.js b/front/core/lib/input.js
deleted file mode 100644
index b29d3fe37..000000000
--- a/front/core/lib/input.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import Component from './component';
-
-/**
- * Component that host an input.
- */
-export default class Input extends Component {
-    constructor($element, $scope) {
-        super($element, $scope);
-        this.input = this.element.querySelector('input');
-    }
-
-    set disabled(value) {
-        this.input.disabled = value == true;
-        this.mdlUpdate();
-    }
-
-    get disabled() {
-        return this.input.disabled;
-    }
-
-    select() {
-        this.input.select();
-    }
-
-    focus() {
-        this.input.focus();
-    }
-
-    mdlUpdate() {
-        if (this.mdlElement)
-            this.mdlElement.updateClasses_();
-    }
-}
-Input.$inject = ['$element', '$scope'];
-
-export const $options = {
-    bindings: {
-        label: '@?',
-        disabled: '<?',
-        readonly: '<?'
-    }
-};
diff --git a/front/core/module.js b/front/core/module.js
index 0ce7f7619..b9fd9f6a8 100644
--- a/front/core/module.js
+++ b/front/core/module.js
@@ -1,7 +1,6 @@
 import {ng, ngDeps} from './vendor';
 
 const ngModule = ng.module('vnCore', ngDeps);
-ngModule.constant('moment', require('moment-timezone'));
 export default ngModule;
 
 /**
@@ -43,6 +42,9 @@ ngModule.vnComponent = function(name, options) {
 
 config.$inject = ['$translateProvider', '$translatePartialLoaderProvider'];
 export function config($translateProvider, $translatePartialLoaderProvider) {
+    // For CSS browser targeting
+    document.documentElement.setAttribute('data-browser', navigator.userAgent);
+
     $translatePartialLoaderProvider.addPart('core');
 
     let conf = {urlTemplate: '/locale/{part}/{lang}.json'};
diff --git a/front/core/styles/background.scss b/front/core/styles/background.scss
index 93bf1a98c..0b96250b5 100644
--- a/front/core/styles/background.scss
+++ b/front/core/styles/background.scss
@@ -9,3 +9,9 @@
 .item-disabled {
     opacity: $color-disabled;
 }
+.vn-shadow {
+    box-shadow: $shadow;
+}
+.invisible {
+    visibility: hidden;
+}
diff --git a/front/core/styles/font-family.scss b/front/core/styles/font-family.scss
index caebc9f99..b461917ce 100644
--- a/front/core/styles/font-family.scss
+++ b/front/core/styles/font-family.scss
@@ -16,3 +16,26 @@
     font-weight: 400;
     src: url('./icons/Material-Design-Icons.woff2') format('woff2'); 
 }
+
+.material-icons {
+    font-family: 'Material Icons';
+    font-weight: normal;
+    font-style: normal;
+    font-size: 24px;  /* Preferred icon size */
+    display: inline-block;
+    line-height: 1;
+    text-transform: none;
+    letter-spacing: normal;
+    word-wrap: normal;
+    white-space: nowrap;
+    direction: ltr;
+
+    /* Support for all WebKit browsers. */
+    -webkit-font-smoothing: antialiased;
+    /* Support for Safari and Chrome. */
+    text-rendering: optimizeLegibility;
+    /* Support for Firefox. */
+    -moz-osx-font-smoothing: grayscale;
+    /* Support for IE. */
+    font-feature-settings: 'liga';
+}
diff --git a/front/core/styles/global.scss b/front/core/styles/global.scss
new file mode 100644
index 000000000..2c99aa45b
--- /dev/null
+++ b/front/core/styles/global.scss
@@ -0,0 +1,40 @@
+@import "variables";
+
+html, body {
+    background-color: $color-bg;
+    overflow: auto;
+    height: 100%;
+    font-family: vn-font;
+    color: $color-font;
+    font-size: 12pt;
+    margin: 0;
+    padding: 0;
+}
+a:focus {
+    outline: 1px solid $color-spacer-light;
+}
+input,
+button {
+    &:focus {
+        outline: none;
+    }
+}
+button,
+input {
+    &::-moz-focus-inner {
+        border: none;
+    }
+}
+input[type=submit],
+input[type=button],
+button {
+    cursor: pointer;
+
+    &:disabled {
+        opacity: .7;
+    }
+}
+a {
+    color: $color-font-link;
+    text-decoration: none;
+}
\ No newline at end of file
diff --git a/front/core/styles/index.js b/front/core/styles/index.js
index 796d9bfde..1cdc4c7e1 100644
--- a/front/core/styles/index.js
+++ b/front/core/styles/index.js
@@ -1,10 +1,9 @@
-import './effects.scss';
 import './background.scss';
 import './border.scss';
 import './font-family.scss';
+import './global.scss';
 import './icons/salixfont.css';
 import './layout.scss';
-import './mdl-override.scss';
 import './responsive.scss';
 import './spacing.scss';
 import './text.scss';
diff --git a/front/core/styles/mdl-override.scss b/front/core/styles/mdl-override.scss
deleted file mode 100644
index 8e6c8509c..000000000
--- a/front/core/styles/mdl-override.scss
+++ /dev/null
@@ -1,61 +0,0 @@
-@import "variables";
-
-/**
- * Rewrited CSS rules from Material Design Lite.
- * FIXME: don't use !important
- */
-body {
-    line-height: initial;
-    font-size: 12pt;
-}
-
-// Textfield
-
-.mdl-textfield--floating-label {
-    &.is-focused, 
-    &.is-dirty, 
-    &.has-placeholder {
-        .mdl-textfield__label {
-            color: $color-main !important;
-        }
-    }
-}
-.mdl-textfield__label::after {
-    background-color: $color-main !important;
-}
-fieldset[disabled] .mdl-textfield,
-.mdl-textfield.is-disabled {
-    .mdl-textfield__input {
-        border: none !important;
-        color: inherit !important;
-    }
-    .mdl-textfield__label {
-        color: $color-main !important;
-    }
-}
-
-// Button
-
-.mdl-button {
-    font-weight: bolder;
-    color: $color-main;
-}
-.mdl-button--fab {
-    color: $color-font-dark !important; 
-    background-color: $color-main !important;
-}
-.mdl-button--colored {
-    color: $color-font-dark !important;
-}
-.mdl-button--raised:hover {
-    background-color: $color-main !important;
-}
-.mdl-button--colored {
-    &,
-    &:focus,
-    &:active,
-    &:hover {
-        background-color: $color-main !important;
-    }
-}
-
diff --git a/front/core/styles/text.scss b/front/core/styles/text.scss
index bb82fa2a0..2eb959af7 100644
--- a/front/core/styles/text.scss
+++ b/front/core/styles/text.scss
@@ -1,5 +1,4 @@
 @import "./variables";
-@import "./font-family";
 
 /* Headings */
 
@@ -44,7 +43,6 @@ h1, h2, h3, h4, h5, h6 {
     padding: 0;
     margin-top: 0;
     margin-bottom: .2em;
-    font-family: vn-font-bold;
 }
 
 /* Colors */
diff --git a/front/core/styles/util.scss b/front/core/styles/util.scss
new file mode 100644
index 000000000..95a523ff4
--- /dev/null
+++ b/front/core/styles/util.scss
@@ -0,0 +1,6 @@
+
+@mixin browser($browser) {
+    html[data-browser*="#{$browser}"] & {
+        @content;
+    }
+}
diff --git a/front/core/styles/variables.scss b/front/core/styles/variables.scss
index 648095cf5..1783a4c01 100644
--- a/front/core/styles/variables.scss
+++ b/front/core/styles/variables.scss
@@ -1,3 +1,4 @@
+@import "./util";
 
 $menu-width: 16em;
 $topbar-height: 4em;
@@ -107,3 +108,4 @@ $color-alert-light: darken($color-alert, 35%);
 
 $border-thin: .05em solid $color-spacer;
 $border-thin-light: .05em solid $color-spacer-light;
+$shadow: 0 .15em .15em 0 rgba(0, 0, 0, .3);
diff --git a/front/core/vendor.js b/front/core/vendor.js
index bd368dac2..0cdae4e81 100644
--- a/front/core/vendor.js
+++ b/front/core/vendor.js
@@ -7,18 +7,13 @@ import 'angular-translate-loader-partial';
 import '@uirouter/angularjs';
 import 'mg-crud';
 import 'oclazyload';
-import 'angular-moment';
 
 export const ngDeps = [
     'pascalprecht.translate',
     'ui.router',
     'mgCrud',
-    'oc.lazyLoad',
-    'angularMoment'
+    'oc.lazyLoad'
 ];
 
-import 'material-design-lite';
-import 'material-design-lite/dist/material.orange-deep_orange.min.css';
-
 import * as validator from 'validator';
 export {validator};
diff --git a/front/package-lock.json b/front/package-lock.json
index 31fc844b9..9d71d20cc 100644
--- a/front/package-lock.json
+++ b/front/package-lock.json
@@ -31,24 +31,6 @@
       "resolved": "https://registry.npmjs.org/angular/-/angular-1.7.5.tgz",
       "integrity": "sha512-760183yxtGzni740IBTieNuWLtPNAoMqvmC0Z62UoU0I3nqk+VJuO3JbQAXOyvo3Oy/ZsdNQwrSTh/B0OQZjNw=="
     },
-    "angular-animate": {
-      "version": "1.7.7",
-      "resolved": "https://registry.npmjs.org/angular-animate/-/angular-animate-1.7.7.tgz",
-      "integrity": "sha512-KLbU9gtgCyNSaMZKnNe9Yi6UTlDMN2EWyokQ06TG5fbDWOePm+kv2xqeUg1S2h+ZLjK0NnoVDIvwDhVQ+AWAag=="
-    },
-    "angular-aria": {
-      "version": "1.7.7",
-      "resolved": "https://registry.npmjs.org/angular-aria/-/angular-aria-1.7.7.tgz",
-      "integrity": "sha512-Jju0VudfKVp+6FUtfzpDBuOJE8+8cGPSM10nRicXvJRX/Nx/YOu38f2aL3HQwThrRK+3E5jfo7yRwVNYoSmSxg=="
-    },
-    "angular-moment": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/angular-moment/-/angular-moment-1.3.0.tgz",
-      "integrity": "sha512-KG8rvO9MoaBLwtGnxTeUveSyNtrL+RNgGl1zqWN36+HDCCVGk2DGWOzqKWB6o+eTTbO3Opn4hupWKIElc8XETA==",
-      "requires": {
-        "moment": ">=2.8.0 <3.0.0"
-      }
-    },
     "angular-translate": {
       "version": "2.18.1",
       "resolved": "https://registry.npmjs.org/angular-translate/-/angular-translate-2.18.1.tgz",
@@ -83,11 +65,6 @@
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
     },
-    "flatpickr": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/flatpickr/-/flatpickr-4.5.2.tgz",
-      "integrity": "sha512-jDy4QYGpmiy7+Qk8QvKJ4spjDdxcx9cxMydmq1x427HkKWBw0qizLYeYM2F6tMcvvqGjU5VpJS55j4LnsaBblA=="
-    },
     "js-yaml": {
       "version": "3.13.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
@@ -97,11 +74,6 @@
         "esprima": "^4.0.0"
       }
     },
-    "material-design-lite": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/material-design-lite/-/material-design-lite-1.3.0.tgz",
-      "integrity": "sha1-0ATOP+6Zoe63Sni4oyUTSl8RcdM="
-    },
     "mg-crud": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/mg-crud/-/mg-crud-1.1.2.tgz",
@@ -110,19 +82,6 @@
         "angular": "^1.6.1"
       }
     },
-    "moment": {
-      "version": "2.24.0",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
-      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
-    },
-    "moment-timezone": {
-      "version": "0.5.25",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.25.tgz",
-      "integrity": "sha512-DgEaTyN/z0HFaVcVbSyVCUU6HeFdnNC3vE4c9cgu2dgMTvjBUBdBzWfasTBmAW45u5OIMeCJtU8yNjM22DHucw==",
-      "requires": {
-        "moment": ">= 2.9.0"
-      }
-    },
     "npm": {
       "version": "6.11.3",
       "resolved": "https://registry.npmjs.org/npm/-/npm-6.11.3.tgz",
diff --git a/front/package.json b/front/package.json
index 82798b28c..e17dbd08c 100644
--- a/front/package.json
+++ b/front/package.json
@@ -12,16 +12,10 @@
 		"@babel/polyfill": "^7.2.5",
 		"@uirouter/angularjs": "^1.0.20",
 		"angular": "^1.7.5",
-		"angular-animate": "^1.7.7",
-		"angular-aria": "^1.7.7",
-		"angular-moment": "^1.3.0",
 		"angular-translate": "^2.18.1",
 		"angular-translate-loader-partial": "^2.18.1",
-		"flatpickr": "^4.5.2",
 		"js-yaml": "^3.13.1",
-		"material-design-lite": "^1.3.0",
 		"mg-crud": "^1.1.2",
-		"moment-timezone": "^0.5.25",
 		"npm": "^6.11.3",
 		"oclazyload": "^0.6.3",
 		"require-yaml": "0.0.1",
diff --git a/front/salix/components/app/style.scss b/front/salix/components/app/style.scss
index 29c14fe0b..530524773 100644
--- a/front/salix/components/app/style.scss
+++ b/front/salix/components/app/style.scss
@@ -1,12 +1,5 @@
 @import "variables";
 
-body {
-    background-color: $color-bg;
-    overflow: auto;
-    height: 100%;
-    font-family: vn-font;
-    color: $color-font;
-}
 vn-app {
     height: inherit;
     display: block;
@@ -104,37 +97,3 @@ vn-app {
         }
     }
 }
-form vn-horizontal {
-    align-items: center;
-
-    & > * {
-        box-sizing: border-box;
-        min-height: 2.8em;
-        padding: 0 $spacing-sm;
-
-        &:first-child {
-            padding-left: 0;
-            padding-right: $spacing-xs;
-        }
-        &:last-child {
-            padding-left: $spacing-xs;
-            padding-right: 0;
-        }
-        &:first-child:last-child {
-            padding: 0;
-        }
-    }
-
-    @media screen and (max-width: $mobile-width) {
-        flex-direction: column;
-        align-items: initial;
-    
-        & > * {
-            &,
-            &:first-child,
-            &:last-child {
-                padding: 0;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/front/salix/components/descriptor/index.html b/front/salix/components/descriptor/index.html
new file mode 100644
index 000000000..a3ee34563
--- /dev/null
+++ b/front/salix/components/descriptor/index.html
@@ -0,0 +1,24 @@
+<a ng-if="$ctrl.links.btnOne"
+    vn-tooltip="{{::$ctrl.links.btnOne.tooltip}}"
+    class="vn-button colored"
+    ui-sref="{{::$ctrl.links.btnOne.state}}" target="_blank">
+    <vn-icon
+        icon="{{::$ctrl.links.btnOne.icon}}">
+    </vn-icon>
+</a>
+<a ng-if="$ctrl.links.btnTwo"
+    vn-tooltip="{{::$ctrl.links.btnTwo.tooltip}}"
+    class="vn-button colored" 
+    ui-sref="{{::$ctrl.links.btnTwo.state}}" target="_blank">
+    <vn-icon 
+        icon="{{::$ctrl.links.btnTwo.icon}}">
+    </vn-icon>
+</a>
+<a ng-if="$ctrl.links.btnThree"
+    vn-tooltip="{{::$ctrl.links.btnThree.tooltip}}"
+    class="vn-button colored" 
+    ui-sref="{{::$ctrl.links.btnThree.state}}" target="_blank">
+    <vn-icon
+        icon="{{::$ctrl.links.btnThree.icon}}">
+    </vn-icon>
+</a>
\ No newline at end of file
diff --git a/front/salix/components/descriptor/index.js b/front/salix/components/descriptor/index.js
index 423b033ce..504812b15 100644
--- a/front/salix/components/descriptor/index.js
+++ b/front/salix/components/descriptor/index.js
@@ -1 +1,12 @@
+import ngModule from '../../module';
 import './style.scss';
+
+export default class QuickLinks {}
+
+ngModule.component('vnQuickLinks', {
+    template: require('./index.html'),
+    controller: QuickLinks,
+    bindings: {
+        links: '<?'
+    }
+});
diff --git a/front/salix/components/descriptor/style.scss b/front/salix/components/descriptor/style.scss
index 24164da21..16bc23b28 100644
--- a/front/salix/components/descriptor/style.scss
+++ b/front/salix/components/descriptor/style.scss
@@ -13,15 +13,19 @@
         color: $color-font-dark;
 
         & > * {
-            min-width: 1.8em;
             @extend %clickable;
+            min-width: 45px;
+            height: 45px;
+            box-sizing: border-box;
             display: flex;
             align-items: center;
             justify-content: center;
-            padding: .5em;
             color: inherit;
 
             & > vn-icon {
+                padding: 10px;
+            }
+            vn-icon {
                 font-size: 1.8em;
             }
         }
@@ -55,28 +59,25 @@
                 }
             }
         }
-        & > .quicklinks {
+        .quicklinks,
+        vn-quick-links {
             display: flex;
             align-items: center;
             justify-content: center;
-            padding: 0;
             
             & > a {
-                padding: $spacing-sm;
-    
+                padding: 0 $spacing-md;
+                margin: 0 $spacing-sm;
+
                 & > vn-icon {
                     font-size: 1.8em;
                     padding: 0;
-    
-                    & > i {
-                        line-height: 36px
-                    }
                 }
             }
         }
     }
 }
-vn-popover {
+.vn-popover {
     .vn-descriptor > .header > a:first-child {
         visibility: hidden;
     }
diff --git a/front/salix/components/home/home.html b/front/salix/components/home/home.html
index fa9cd9d67..b6aaeced1 100644
--- a/front/salix/components/home/home.html
+++ b/front/salix/components/home/home.html
@@ -4,7 +4,7 @@
             ng-repeat="mod in ::$ctrl.modules"
             ui-sref="{{::mod.route.state}}" 
             translate-attr="::{title: mod.name}"
-            class="mdl-shadow--4dp">
+            class="vn-shadow">
             <div>
                 <vn-icon icon="{{::mod.icon || 'photo'}}"></vn-icon>
             </div>
diff --git a/front/salix/components/index.js b/front/salix/components/index.js
index ca37b21d1..5724231ed 100644
--- a/front/salix/components/index.js
+++ b/front/salix/components/index.js
@@ -1,11 +1,11 @@
 import './app/app';
-import './login/login';
-import './home/home';
-import './main-menu/main-menu';
 import './background/background';
-import './side-menu/side-menu';
-import './left-menu/left-menu';
-import './topbar/topbar';
-import './user-popover';
 import './descriptor';
+import './home/home';
+import './left-menu/left-menu';
+import './login/login';
+import './main-menu/main-menu';
+import './topbar/topbar';
+import './side-menu/side-menu';
 import './summary';
+import './user-popover';
diff --git a/front/salix/components/login/login.html b/front/salix/components/login/login.html
index 73154222c..b15714a23 100644
--- a/front/salix/components/login/login.html
+++ b/front/salix/components/login/login.html
@@ -4,14 +4,12 @@
 		<vn-textfield
 			label="User"
 			ng-model="$ctrl.user"
-			name="user"
 			vn-id="userField"
 			vn-focus>
 		</vn-textfield>
 		<vn-textfield
 			label="Password"
 			ng-model="$ctrl.password"
-			name="password"
 			type="password">
 		</vn-textfield>
 		<vn-check
diff --git a/front/salix/components/main-menu/style.scss b/front/salix/components/main-menu/style.scss
index cff2286b9..68744aad6 100644
--- a/front/salix/components/main-menu/style.scss
+++ b/front/salix/components/main-menu/style.scss
@@ -11,8 +11,8 @@ vn-main-menu {
         align-items: center;
         box-sizing: border-box;
 
-        & > *:hover {
-            color: $color-main;
+        & > * {
+            transition: color 250ms ease-out;
         }
         & > #user {
             vertical-align: middle;
@@ -20,12 +20,16 @@ vn-main-menu {
             margin-right: .2em;
             cursor: pointer;
         }
-        & > vn-icon-button {
-            font-size: 2.1em;
+        & > .vn-button {
+            font-size: 1.2em;
             color: inherit;
             padding: 0;
             margin-left: .3em;
         }
+        & > :hover {
+            color: $color-main;
+            opacity: 1;
+        }
     }
 }
 
diff --git a/front/salix/components/summary/style.scss b/front/salix/components/summary/style.scss
index c9a2b74ab..9fd85be3c 100644
--- a/front/salix/components/summary/style.scss
+++ b/front/salix/components/summary/style.scss
@@ -20,6 +20,7 @@
         & > vn-horizontal {
             flex-wrap: wrap;
             padding: $spacing-md;
+            overflow: hidden;
 
             h4 {
                 margin-bottom: $spacing-md;
@@ -28,7 +29,7 @@
                 line-height: 1;
                 padding: 7px;
                 padding-bottom: 4px; /* Bottom line-height fix */
-                font-family: unset;
+                font-weight: lighter;
                 background-color: $color-main-light;
                 border-bottom: .1em solid $color-main;
                 white-space: nowrap;
@@ -38,7 +39,6 @@
             & > * {
                 margin: $spacing-sm;
                 min-width: 14em;
-                overflow: hidden;
                 padding: 0;
             }
             & > vn-auto {
diff --git a/front/salix/styles/misc.scss b/front/salix/styles/misc.scss
index 8066759ac..6dcaab060 100644
--- a/front/salix/styles/misc.scss
+++ b/front/salix/styles/misc.scss
@@ -1,31 +1,43 @@
 @import "./variables";
 @import "./effects";
 
-html, body {
-    margin: 0;
-    padding: 0;
+form vn-horizontal {
+    align-items: stretch;
+
+    & > * {
+        box-sizing: border-box;
+        min-height: 2.8em;
+        padding: 0 $spacing-sm;
+
+        &:first-child {
+            padding-left: 0;
+            padding-right: $spacing-xs;
+        }
+        &:last-child {
+            padding-left: $spacing-xs;
+            padding-right: 0;
+        }
+        &:first-child:last-child {
+            padding: 0;
+        }
+    }
+
+    @media screen and (max-width: $mobile-width) {
+        flex-direction: column;
+        align-items: initial;
+    
+        & > * {
+            &,
+            &:first-child,
+            &:last-child {
+                padding: 0;
+            }
+        }
+    }
 }
-a:focus,
-input:focus,
-button:focus {
-    outline: none;
-}
-button::-moz-focus-inner,
-input[type=submit]::-moz-focus-inner,
-input[type=button]::-moz-focus-inner,
-input[type=reset]::-moz-focus-inner {
-	border: none;
-}
-.unselectable {
-    -moz-user-select: none;
-    -webkit-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-}
-a, .link {
+
+.link {
     color: $color-font-link;
-    text-decoration: none;
-    outline: 0
 }
 .link {
     cursor: pointer;
@@ -34,6 +46,12 @@ a, .link {
         text-decoration: underline;
     }
 }
+.unselectable {
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
 vn-bg-title {
     display: block;
     text-align: center;
@@ -77,9 +95,6 @@ html [pointer], .pointer{
 html [noDrop], .noDrop{
     cursor: no-drop;
 }
-button {
-    @extend %clickable;
-}
 vn-button-bar {
     display: block;
     margin-top: $spacing-sm;
@@ -91,9 +106,6 @@ vn-tool-bar {
         margin-right: .6em;
     }
 }
-input[type="submit"]:disabled, button:disabled {
-    opacity: 0.7;
-}
 html [scrollable] {
     min-height: 1px;
     flex: 1;
diff --git a/modules/agency/front/index/index.html b/modules/agency/front/index/index.html
index cfe39c7f1..c2cd52faa 100644
--- a/modules/agency/front/index/index.html
+++ b/modules/agency/front/index/index.html
@@ -80,7 +80,8 @@
     vn-tooltip="New zone"
     vn-bind="+"
     fixed-bottom-right>
-    <vn-float-button icon="add"
+    <vn-float-button
+        icon="add"
         vn-acl="deliveryBoss"
         vn-acl-action="remove">
     </vn-float-button>
diff --git a/modules/claim/front/action/index.html b/modules/claim/front/action/index.html
index 65467d349..b502cf020 100644
--- a/modules/claim/front/action/index.html
+++ b/modules/claim/front/action/index.html
@@ -28,16 +28,18 @@
                         ng-click="$ctrl.showLastTickets($event)"
                         vn-tooltip="Imports ticket lines">
                     </vn-button>
-                    <vn-input-range
+                    <vn-range
                         vn-one 
                         label="Responsability"
-                        value="$ctrl.claim.responsibility"
+                        min-label="Company"
+                        max-label="Sales/Client"
+                        ng-model="$ctrl.claim.responsibility"
                         max="$ctrl.maxResponsibility"
                         min="1"
                         step="1"
                         vn-acl="salesAssistant"
                         on-change="$ctrl.saveResponsibility(value)">
-                    </vn-input-range>
+                    </vn-range>
                 </vn-tool-bar>
                 <vn-one
                     style = "text-align:right">
diff --git a/modules/claim/front/descriptor/index.html b/modules/claim/front/descriptor/index.html
index 24efcc0fb..431989bbd 100644
--- a/modules/claim/front/descriptor/index.html
+++ b/modules/claim/front/descriptor/index.html
@@ -42,32 +42,9 @@
             value="{{$ctrl.claim.ticketFk}}">
             </vn-label-value>
         </div>
-        <div class="quicklinks">
-            <a ng-if="$ctrl.quicklinks.btnOne"
-                vn-tooltip="{{::$ctrl.quicklinks.btnOne.tooltip}}"
-                ui-sref="{{::$ctrl.quicklinks.btnOne.state}}" target="_blank">
-                <vn-icon 
-                    class="mdl-button mdl-js-button mdl-button--colored" 
-                    icon="{{::$ctrl.quicklinks.btnOne.icon}}">
-                </vn-icon>
-            </a>
-            <a ng-if="$ctrl.quicklinks.btnTwo"
-                vn-tooltip="{{::$ctrl.quicklinks.btnTwo.tooltip}}"
-                ui-sref="{{::$ctrl.quicklinks.btnTwo.state}}" target="_blank">
-                <vn-icon 
-                    class="mdl-button mdl-js-button mdl-button--colored" 
-                    icon="{{::$ctrl.quicklinks.btnTwo.icon}}">
-                </vn-icon>
-            </a>
-            <a ng-if="$ctrl.quicklinks.btnThree"
-                vn-tooltip="{{::$ctrl.quicklinks.btnThree.tooltip}}"
-                ui-sref="{{::$ctrl.quicklinks.btnThree.state}}" target="_blank">
-                <vn-icon 
-                    class="mdl-button mdl-js-button mdl-button--colored" 
-                    icon="{{::$ctrl.quicklinks.btnThree.icon}}">
-                </vn-icon>
-            </a>
-        </div>
+        <vn-quick-links
+            links="$ctrl.quicklinks">
+        </vn-quick-links>
     </div>
 </div>
 <vn-confirm
diff --git a/modules/claim/front/dms/index/index.html b/modules/claim/front/dms/index/index.html
index 89d1e0b22..524f7db78 100644
--- a/modules/claim/front/dms/index/index.html
+++ b/modules/claim/front/dms/index/index.html
@@ -14,17 +14,18 @@
     class="vn-w-lg">
     <vn-horizontal class="photo-list">
         <section class="photo" ng-repeat="photo in $ctrl.photos">
-            <section class="image mdl-shadow--2dp" on-error-src 
+            <section class="image vn-shadow" on-error-src 
                 ng-style="{'background': 'url(/api/dms/' + photo.dmsFk + '/downloadFile?access_token=' + $ctrl.accessToken + ')'}"
                 zoom-image="/api/dms/{{::photo.dmsFk}}/downloadFile?access_token={{::$ctrl.accessToken}}">
             </section>
             <section class="actions">
-                <button class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-js-ripple-effect mdl-button--colored"
+                <vn-button
+                    class="round"
                     ng-click="$ctrl.showDeleteConfirm($index)"
                     title="{{'Remove file' | translate}}"
-                    tabindex="-1">
-                    <vn-icon icon="delete"></vn-icon>
-                </button>
+                    tabindex="-1"
+                    icon="delete">
+                </vn-button>
             </section>
         </section>
     </vn-horizontal>
diff --git a/modules/claim/front/summary/index.html b/modules/claim/front/summary/index.html
index 314d71bc9..46600c0da 100644
--- a/modules/claim/front/summary/index.html
+++ b/modules/claim/front/summary/index.html
@@ -30,16 +30,18 @@
             </vn-textarea>
         </vn-one>
         <vn-one>
-            <vn-input-range
+            <vn-range
                 vn-one 
                 disabled="true"
                 label="Responsability"
-                value="$ctrl.summary.claim.responsibility"
+                min-label="Company"
+                max-label="Sales/Client"
+                ng-model="$ctrl.summary.claim.responsibility"
                 max="5"
                 min="1"
                 step="1"
                 vn-acl="salesAssistant">
-            </vn-input-range>
+            </vn-range>
         </vn-one>
         <vn-auto>
             <h4 translate>Detail</h4>
diff --git a/modules/client/front/address/create/index.html b/modules/client/front/address/create/index.html
index 8c30f9929..30e49590c 100644
--- a/modules/client/front/address/create/index.html
+++ b/modules/client/front/address/create/index.html
@@ -119,12 +119,10 @@
     </vn-card>
     <vn-button-bar>
         <vn-submit label="Save"></vn-submit>
-        <button
-            class="mdl-button mdl-button--raised mdl-button--colored"
-            translate
+        <vn-button
+            label="Cancel"
             ui-sref="client.card.address.index">
-            Cancel
-        </button>
+        </vn-button>
     </vn-button-bar>
 </form>
 
diff --git a/modules/client/front/basic-data/index.html b/modules/client/front/basic-data/index.html
index eed8277af..ce80ea5a6 100644
--- a/modules/client/front/basic-data/index.html
+++ b/modules/client/front/basic-data/index.html
@@ -5,70 +5,68 @@
     form="form"
     save="patch">
 </vn-watcher>
-<form name="form" vn-http-submit="watcher.submit()" compact>
-    <fieldset>
-        <vn-card class="vn-pa-lg">
-            <vn-horizontal>
-                <vn-textfield
-                    vn-one 
-                    label="Comercial Name" 
-                    ng-model="$ctrl.client.name"
-                    rule
-                    vn-focus>
-                </vn-textfield>
-            </vn-horizontal>
-            <vn-horizontal>
-                <vn-textfield
-                    vn-one
-                    label="Contact"
-                    ng-model="$ctrl.client.contact"
-                    rule>
-                </vn-textfield>
-                <vn-textfield
-                    vn-one 
-                    label="Email" 
-                    ng-model="$ctrl.client.email"
-                    rule
-                    info="You can save multiple emails">
-                </vn-textfield>
-            </vn-horizontal>
-            <vn-horizontal>
-                <vn-textfield
-                    vn-one
-                    label="Phone"
-                    ng-model="$ctrl.client.phone"
-                    rule>
-                </vn-textfield>
-                <vn-textfield
-                    vn-one
-                    label="Mobile"
-                    ng-model="$ctrl.client.mobile"
-                    rule>
-                </vn-textfield>
-            </vn-horizontal>
-            <vn-horizontal>
-                <vn-autocomplete 
-                    vn-one
-                    ng-model="$ctrl.client.salesPersonFk"
-                    url="/client/api/Clients/activeWorkersWithRole"
-                    show-field="nickname"
-                    search-function="{firstName: $search}"
-                    value-field="id"
-                    where="{role: 'employee'}"
-                    label="Salesperson"
-                    vn-acl="salesAssistant">
-                </vn-autocomplete>
-                <vn-autocomplete 
-                    vn-one
-                    ng-model="$ctrl.client.contactChannelFk"
-                    url="/client/api/ContactChannels"
-                    label="Channel">
-                </vn-autocomplete>
-            </vn-horizontal>
-        </vn-card>
-        <vn-button-bar>
-            <vn-submit label="Save"></vn-submit>
-            <vn-button label="Undo changes" ng-if="watcher.dataChanged()" ng-click="watcher.loadOriginalData()"></vn-button>
-        </vn-button-bar>
-    </fieldset>
+<form name="form" vn-http-submit="watcher.submit()" class="vn-w-md">
+    <vn-card class="vn-pa-lg">
+        <vn-horizontal>
+            <vn-textfield
+                vn-one 
+                label="Comercial Name" 
+                ng-model="$ctrl.client.name"
+                rule
+                vn-focus>
+            </vn-textfield>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-textfield
+                vn-one
+                label="Contact"
+                ng-model="$ctrl.client.contact"
+                rule>
+            </vn-textfield>
+            <vn-textfield
+                vn-one 
+                label="Email" 
+                ng-model="$ctrl.client.email"
+                rule
+                info="You can save multiple emails">
+            </vn-textfield>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-textfield
+                vn-one
+                label="Phone"
+                ng-model="$ctrl.client.phone"
+                rule>
+            </vn-textfield>
+            <vn-textfield
+                vn-one
+                label="Mobile"
+                ng-model="$ctrl.client.mobile"
+                rule>
+            </vn-textfield>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-autocomplete 
+                vn-one
+                ng-model="$ctrl.client.salesPersonFk"
+                url="/client/api/Clients/activeWorkersWithRole"
+                show-field="nickname"
+                search-function="{firstName: $search}"
+                value-field="id"
+                where="{role: 'employee'}"
+                label="Salesperson"
+                vn-acl="salesAssistant">
+            </vn-autocomplete>
+            <vn-autocomplete 
+                vn-one
+                ng-model="$ctrl.client.contactChannelFk"
+                url="/client/api/ContactChannels"
+                label="Channel">
+            </vn-autocomplete>
+        </vn-horizontal>
+    </vn-card>
+    <vn-button-bar>
+        <vn-submit label="Save"></vn-submit>
+        <vn-button label="Undo changes" ng-if="watcher.dataChanged()" ng-click="watcher.loadOriginalData()"></vn-button>
+    </vn-button-bar>
 </form>
diff --git a/modules/client/front/credit-insurance/insurance/create/index.html b/modules/client/front/credit-insurance/insurance/create/index.html
index f652f6011..a28fb605b 100644
--- a/modules/client/front/credit-insurance/insurance/create/index.html
+++ b/modules/client/front/credit-insurance/insurance/create/index.html
@@ -35,9 +35,9 @@
     </vn-card>
     <vn-button-bar>
         <vn-submit label="Save"></vn-submit>
-        <button 
-            class="mdl-button mdl-button--raised mdl-button--colored" 
-            translate 
-            ui-sref="client.card.creditInsurance.insurance.index({classificationId: post.params.classificationId})">Cancel</button>
+        <vn-button 
+            label="Cancel"
+            ui-sref="client.card.creditInsurance.insurance.index({classificationId: post.params.classificationId})">
+        </vn-button>
     </vn-button-bar>
 </form>
\ No newline at end of file
diff --git a/modules/client/front/descriptor/index.html b/modules/client/front/descriptor/index.html
index 84f3ca10e..32d785fe3 100644
--- a/modules/client/front/descriptor/index.html
+++ b/modules/client/front/descriptor/index.html
@@ -63,31 +63,8 @@
                 ng-class="{bright: $ctrl.client.isTaxDataChecked == false}">
             </vn-icon>
         </div>
-        <div class="quicklinks">
-            <a ng-if="$ctrl.quicklinks.btnOne"
-                vn-tooltip="{{::$ctrl.quicklinks.btnOne.tooltip}}"
-                ui-sref="{{::$ctrl.quicklinks.btnOne.state}}" target="_blank">
-                <vn-icon 
-                    class="mdl-button mdl-js-button mdl-button--colored" 
-                    icon="{{::$ctrl.quicklinks.btnOne.icon}}">
-                </vn-icon>
-            </a>
-            <a ng-if="$ctrl.quicklinks.btnTwo"
-                vn-tooltip="{{::$ctrl.quicklinks.btnTwo.tooltip}}"
-                ui-sref="{{::$ctrl.quicklinks.btnTwo.state}}" target="_blank">
-                <vn-icon 
-                    class="mdl-button mdl-js-button mdl-button--colored" 
-                    icon="{{::$ctrl.quicklinks.btnTwo.icon}}">
-                </vn-icon>
-            </a>
-            <a ng-if="$ctrl.quicklinks.btnThree"
-                vn-tooltip="{{::$ctrl.quicklinks.btnThree.tooltip}}"
-                ui-sref="{{::$ctrl.quicklinks.btnThree.state}}" target="_blank">
-                <vn-icon 
-                    class="mdl-button mdl-js-button mdl-button--colored" 
-                    icon="{{::$ctrl.quicklinks.btnThree.icon}}">
-                </vn-icon>
-            </a>
-        </div>
+        <vn-quick-links
+            links="$ctrl.quicklinks">
+        </vn-quick-links>
     </div>
 </div>
\ No newline at end of file
diff --git a/modules/invoiceOut/front/descriptor/index.html b/modules/invoiceOut/front/descriptor/index.html
index 211560d28..3960c3925 100644
--- a/modules/invoiceOut/front/descriptor/index.html
+++ b/modules/invoiceOut/front/descriptor/index.html
@@ -33,24 +33,9 @@
                 value="{{$ctrl.invoiceOut.company.code}}">
             </vn-label-value>
         </div>
-        <div class="quicklinks">
-            <a ng-if="$ctrl.quicklinks.btnOne"
-                vn-tooltip="{{::$ctrl.quicklinks.btnOne.tooltip}}"
-                ui-sref="{{::$ctrl.quicklinks.btnOne.state}}" target="_blank">
-                <vn-icon 
-                    class="mdl-button mdl-js-button mdl-button--colored" 
-                    icon="{{::$ctrl.quicklinks.btnOne.icon}}">
-                </vn-icon>
-            </a>
-            <a ng-if="$ctrl.quicklinks.btnTwo"
-                vn-tooltip="{{::$ctrl.quicklinks.btnTwo.tooltip}}"
-                ui-sref="{{::$ctrl.quicklinks.btnTwo.state}}" target="_blank">
-                <vn-icon 
-                    class="mdl-button mdl-js-button mdl-button--colored" 
-                    icon="{{::$ctrl.quicklinks.btnTwo.icon}}">
-                </vn-icon>
-            </a>
-        </div>
+        <vn-quick-links
+            links="$ctrl.quicklinks">
+        </vn-quick-links>
     </div>
 </div>
 <vn-confirm
diff --git a/modules/item/front/create/index.html b/modules/item/front/create/index.html
index d852faab7..557ccdf77 100644
--- a/modules/item/front/create/index.html
+++ b/modules/item/front/create/index.html
@@ -53,13 +53,13 @@
             </vn-horizontal>
         </vn-card>
         <vn-button-bar>
-            <vn-submit label="Create"></vn-submit>
-            <button
-                class="mdl-button mdl-button--raised mdl-button--colored"
-                translate
-                ui-sref="item.index"
-            >Cancel
-            </button>
+            <vn-submit
+                label="Create">
+            </vn-submit>
+            <vn-button
+                label="Cancel"
+                ui-sref="item.index">
+            </vn-button>
         </vn-button-bar>
     </form>
 </div>
diff --git a/modules/item/front/descriptor/index.html b/modules/item/front/descriptor/index.html
index cd12c253f..e273b02e4 100644
--- a/modules/item/front/descriptor/index.html
+++ b/modules/item/front/descriptor/index.html
@@ -64,32 +64,9 @@
                 ng-class="{bright: $ctrl.item.isActive == false}">
             </vn-icon>
         </div>
-        <div class="quicklinks">
-            <a ng-if="$ctrl.quicklinks.btnOne"
-                vn-tooltip="{{::$ctrl.quicklinks.btnOne.tooltip}}"
-                ui-sref="{{::$ctrl.quicklinks.btnOne.state}}" target="_blank">
-                <vn-icon 
-                    class="mdl-button mdl-js-button mdl-button--colored" 
-                    icon="{{::$ctrl.quicklinks.btnOne.icon}}">
-                </vn-icon>
-            </a>
-            <a ng-if="$ctrl.quicklinks.btnTwo"
-                vn-tooltip="{{::$ctrl.quicklinks.btnTwo.tooltip}}"
-                ui-sref="{{::$ctrl.quicklinks.btnTwo.state}}" target="_blank">
-                <vn-icon 
-                    class="mdl-button mdl-js-button mdl-button--colored" 
-                    icon="{{::$ctrl.quicklinks.btnTwo.icon}}">
-                </vn-icon>
-            </a>
-            <a ng-if="$ctrl.quicklinks.btnThree"
-                vn-tooltip="{{::$ctrl.quicklinks.btnThree.tooltip}}"
-                ui-sref="{{::$ctrl.quicklinks.btnThree.state}}" target="_blank">
-                <vn-icon 
-                    class="mdl-button mdl-js-button mdl-button--colored" 
-                    icon="{{::$ctrl.quicklinks.btnThree.icon}}">
-                </vn-icon>
-            </a>
-        </div>
+        <vn-quick-links
+            links="$ctrl.quicklinks">
+        </vn-quick-links>
     </div>
 </div>
 <vn-dialog
diff --git a/modules/item/front/index/index.html b/modules/item/front/index/index.html
index aae3b0660..0b0030689 100644
--- a/modules/item/front/index/index.html
+++ b/modules/item/front/index/index.html
@@ -7,9 +7,8 @@
 </vn-crud-model>
 <div class="content-block">
     <vn-card class="vn-px-md vn-w-sm">
-        <vn-horizontal>
+        <vn-horizontal style="align-items: center;">
             <vn-searchbar
-                vn-three
                 panel="vn-item-search-panel"
                 on-search="$ctrl.onSearch($params)"
                 info="Search items by id, name or barcode"
diff --git a/modules/item/front/index/style.scss b/modules/item/front/index/style.scss
index e0791295d..1cbc88124 100644
--- a/modules/item/front/index/style.scss
+++ b/modules/item/front/index/style.scss
@@ -1,16 +1,5 @@
 @import "variables";
 
-vn-item-index {
-    vn-icon-menu{
-        padding-top: 30px;
-        padding-left: 10px;
-        color: $color-main;
-        li {
-            color: initial;
-        }
-    }
-}
-
 vn-item-product {
     display: block;
 
diff --git a/modules/item/front/last-entries/style.scss b/modules/item/front/last-entries/style.scss
index 63ffcb35b..6188daabc 100644
--- a/modules/item/front/last-entries/style.scss
+++ b/modules/item/front/last-entries/style.scss
@@ -15,10 +15,6 @@ vn-item-last-entries {
     }
     vn-date-picker {
         flex: none !important;
-
-        .mdl-textfield{
-            width: 400px !important;
-        }
     }
     @media screen and (max-width: 1440px) {
         .expendable {
diff --git a/modules/item/front/search-panel/index.js b/modules/item/front/search-panel/index.js
index 458382a99..a722fb1fc 100644
--- a/modules/item/front/search-panel/index.js
+++ b/modules/item/front/search-panel/index.js
@@ -2,8 +2,8 @@ import ngModule from '../module';
 import SearchPanel from 'core/components/searchbar/search-panel';
 
 class Controller extends SearchPanel {
-    constructor($scope) {
-        super();
+    constructor($scope, $element) {
+        super($scope, $element);
         this.$ = $scope;
         this.moreFields = [
             {field: 'id'},
@@ -58,8 +58,6 @@ class Controller extends SearchPanel {
     }
 }
 
-Controller.$inject = ['$scope'];
-
 ngModule.component('vnItemSearchPanel', {
     template: require('./index.html'),
     controller: Controller
diff --git a/modules/order/front/descriptor/index.html b/modules/order/front/descriptor/index.html
index dcc9b16de..cf2a52e1a 100644
--- a/modules/order/front/descriptor/index.html
+++ b/modules/order/front/descriptor/index.html
@@ -46,32 +46,9 @@
                 value="{{$ctrl.order.total | currency: 'EUR': 2}}">
             </vn-label-value>
         </div>
-        <div class="quicklinks">
-            <a ng-if="$ctrl.quicklinks.btnOne"
-                vn-tooltip="{{::$ctrl.quicklinks.btnOne.tooltip}}"
-                ui-sref="{{::$ctrl.quicklinks.btnOne.state}}" target="_blank">
-                <vn-icon 
-                    class="mdl-button mdl-js-button mdl-button--colored" 
-                    icon="{{::$ctrl.quicklinks.btnOne.icon}}">
-                </vn-icon>
-            </a>
-            <a ng-if="$ctrl.quicklinks.btnTwo"
-                vn-tooltip="{{::$ctrl.quicklinks.btnTwo.tooltip}}"
-                ui-sref="{{::$ctrl.quicklinks.btnTwo.state}}" target="_blank">
-                <vn-icon 
-                    class="mdl-button mdl-js-button mdl-button--colored" 
-                    icon="{{::$ctrl.quicklinks.btnTwo.icon}}">
-                </vn-icon>
-            </a>
-            <a ng-if="$ctrl.quicklinks.btnThree"
-                vn-tooltip="{{::$ctrl.quicklinks.btnThree.tooltip}}"
-                ui-sref="{{::$ctrl.quicklinks.btnThree.state}}" target="_blank">
-                <vn-icon 
-                    class="mdl-button mdl-js-button mdl-button--colored" 
-                    icon="{{::$ctrl.quicklinks.btnThree.icon}}">
-                </vn-icon>
-            </a>
-        </div>
+        <vn-quick-links
+            links="$ctrl.quicklinks">
+        </vn-quick-links>
     </div>
 </div>
 <vn-confirm
diff --git a/modules/order/front/filter/index.html b/modules/order/front/filter/index.html
index 7a935120e..7afbd0c02 100644
--- a/modules/order/front/filter/index.html
+++ b/modules/order/front/filter/index.html
@@ -74,27 +74,30 @@
         on-close="$ctrl.onPopoverClose()">
         <vn-order-catalog-search-panel/>
     </vn-popover>
-    <vn-horizontal class="chips" style="flex-wrap: wrap">
+    <div class="chips">
         <vn-chip 
             ng-if="$ctrl.category"
-            vn-tooltip="Category"
+            removable="true"
+            translate-attr="{title: 'Category'}"
             on-remove="$ctrl.category = null"
-            ellipsize> 
+            class="colored"> 
             <span translate>{{$ctrl.category.value}}</span>
         </vn-chip>
         <vn-chip 
             ng-if="$ctrl.type"
-            vn-tooltip="Type"
+            removable="true"
+            translate-attr="{title: 'Type'}"
             on-remove="$ctrl.type = null"
-            ellipsize> 
+            class="colored"> 
             <span translate>{{$ctrl.type.value}}</span>
         </vn-chip>
         <vn-chip
             ng-repeat="tag in $ctrl.tags"
-            vn-tooltip="Value"
+            removable="true"
+            translate-attr="{title: 'Tag'}"
             on-remove="$ctrl.remove($index)"
-            ellipsize> 
+            class="colored"> 
             <span translate>{{::tag.value}}</span>
         </vn-chip>
-    </vn-horizontal>
+    </div>
 </div>
\ No newline at end of file
diff --git a/modules/order/front/filter/style.scss b/modules/order/front/filter/style.scss
index 52125ace6..0cac5765f 100644
--- a/modules/order/front/filter/style.scss
+++ b/modules/order/front/filter/style.scss
@@ -39,10 +39,12 @@ vn-catalog-filter > div {
         }
     }
     .chips {
+        display: flex;
         flex-wrap: wrap;
         padding: $spacing-md;
+        overflow: hidden;
+        max-width: 100%;
     }
-
     vn-autocomplete[vn-id="type"] .list {
         max-height: 20em
     }
diff --git a/modules/order/front/prices-popover/index.html b/modules/order/front/prices-popover/index.html
index 3a7f34462..a88e027ac 100644
--- a/modules/order/front/prices-popover/index.html
+++ b/modules/order/front/prices-popover/index.html
@@ -1,13 +1,11 @@
 <vn-popover vn-id="popover" on-close="$ctrl.clear()">
     <div class="vn-descriptor">
         <div class="header">
-            <a translate-attr="{title: 'Return to module index'}" ui-sref="item.index">
-                <vn-icon icon="chevron_left"></vn-icon>
-            </a>
+            <span></span>
             <a translate-attr="{title: 'Preview'}" ui-sref="item.card.summary({id: $ctrl.item.id})">
                 <vn-icon icon="desktop_windows"></vn-icon>
             </a>
-            <vspan></span>
+            <span></span>
         </div>
         <div class="vn-pa-md">
             <vn-horizontal>
@@ -74,32 +72,9 @@
                 </vn-vertical>
             </vn-horizontal>
             <vn-horizontal class="buttons-bar">
-                <div class="quicklinks" vn-one>
-                    <a ng-if="$ctrl.quicklinks.btnOne"
-                        vn-tooltip="{{::$ctrl.quicklinks.btnOne.tooltip}}"
-                        ui-sref="{{::$ctrl.quicklinks.btnOne.state}}" target="_blank">
-                        <vn-icon 
-                            class="mdl-button mdl-js-button mdl-button--colored" 
-                            icon="{{::$ctrl.quicklinks.btnOne.icon}}">
-                        </vn-icon>
-                    </a>
-                    <a ng-if="$ctrl.quicklinks.btnTwo"
-                        vn-tooltip="{{::$ctrl.quicklinks.btnTwo.tooltip}}"
-                        ui-sref="{{::$ctrl.quicklinks.btnTwo.state}}" target="_blank">
-                        <vn-icon 
-                            class="mdl-button mdl-js-button mdl-button--colored" 
-                            icon="{{::$ctrl.quicklinks.btnTwo.icon}}">
-                        </vn-icon>
-                    </a>
-                    <a ng-if="$ctrl.quicklinks.btnThree"
-                        vn-tooltip="{{::$ctrl.quicklinks.btnThree.tooltip}}"
-                        ui-sref="{{::$ctrl.quicklinks.btnThree.state}}" target="_blank">
-                        <vn-icon 
-                            class="mdl-button mdl-js-button mdl-button--colored" 
-                            icon="{{::$ctrl.quicklinks.btnThree.icon}}">
-                        </vn-icon>
-                    </a>
-                </div>
+                <vn-quick-links
+                    links="$ctrl.quicklinks">
+                </vn-quick-links>
                 <vn-one>
                     <vn-submit
                         label="Save"
diff --git a/modules/route/front/descriptor/index.html b/modules/route/front/descriptor/index.html
index 2e141e52e..8ab44e9bf 100644
--- a/modules/route/front/descriptor/index.html
+++ b/modules/route/front/descriptor/index.html
@@ -46,32 +46,9 @@
                 ng-class="{bright: $ctrl.route.m3 > $ctrl.route.vehicle.m3 && $ctrl.route.vehicle.m3 != NULL}">
             </vn-icon>
         </div>
-        <div class="quicklinks">
-            <a ng-if="$ctrl.quicklinks.btnOne"
-                vn-tooltip="{{::$ctrl.quicklinks.btnOne.tooltip}}"
-                ui-sref="{{::$ctrl.quicklinks.btnOne.state}}" target="_blank">
-                <vn-icon 
-                    class="mdl-button mdl-js-button mdl-button--colored" 
-                    icon="{{::$ctrl.quicklinks.btnOne.icon}}">
-                </vn-icon>
-            </a>
-            <a ng-if="$ctrl.quicklinks.btnTwo"
-                vn-tooltip="{{::$ctrl.quicklinks.btnTwo.tooltip}}"
-                ui-sref="{{::$ctrl.quicklinks.btnTwo.state}}" target="_blank">
-                <vn-icon 
-                    class="mdl-button mdl-js-button mdl-button--colored" 
-                    icon="{{::$ctrl.quicklinks.btnTwo.icon}}">
-                </vn-icon>
-            </a>
-            <a ng-if="$ctrl.quicklinks.btnThree"
-                vn-tooltip="{{::$ctrl.quicklinks.btnThree.tooltip}}"
-                ui-sref="{{::$ctrl.quicklinks.btnThree.state}}" target="_blank">
-                <vn-icon 
-                    class="mdl-button mdl-js-button mdl-button--colored" 
-                    icon="{{::$ctrl.quicklinks.btnThree.icon}}">
-                </vn-icon>
-            </a>
-        </div>
+        <vn-quick-links
+            links="$ctrl.quicklinks">
+        </vn-quick-links>
     </div>
 </div>
 <vn-confirm
diff --git a/modules/ticket/front/descriptor/index.html b/modules/ticket/front/descriptor/index.html
index d830f09d9..faa2acf5b 100644
--- a/modules/ticket/front/descriptor/index.html
+++ b/modules/ticket/front/descriptor/index.html
@@ -72,31 +72,10 @@
                 ng-class="{bright: $ctrl.ticket.isDeleted == true}">
             </vn-icon>
         </div>
-        <div class="quicklinks">
-            <a ng-if="$ctrl.quicklinks.btnOne"
-                vn-tooltip="{{::$ctrl.quicklinks.btnOne.tooltip}}"
-                ui-sref="{{::$ctrl.quicklinks.btnOne.state}}">
-                <vn-icon 
-                    class="mdl-button mdl-js-button mdl-button--colored" 
-                    icon="{{::$ctrl.quicklinks.btnOne.icon}}">
-                </vn-icon>
-            </a>
-            <a ng-if="$ctrl.quicklinks.btnTwo"
-                vn-tooltip="{{::$ctrl.quicklinks.btnTwo.tooltip}}"
-                ui-sref="{{::$ctrl.quicklinks.btnTwo.state}}">
-                <vn-icon 
-                    class="mdl-button mdl-js-button mdl-button--colored" 
-                    icon="{{::$ctrl.quicklinks.btnTwo.icon}}">
-                </vn-icon>
-            </a>
-            <a ng-if="$ctrl.quicklinks.btnThree"
-                vn-tooltip="{{::$ctrl.quicklinks.btnThree.tooltip}}"
-                ui-sref="{{::$ctrl.quicklinks.btnThree.state}}">
-                <vn-icon 
-                    class="mdl-button mdl-js-button mdl-button--colored" 
-                    icon="{{::$ctrl.quicklinks.btnThree.icon}}">
-                </vn-icon>
-            </a>
+        <vn-quick-links
+            links="$ctrl.quicklinks">
+        </vn-quick-links>
+        <div style="text-align: center">
             <vn-button-menu
                 ng-if="$ctrl.ticket.ship.length > 1"
                 vn-id="stowaways-button"
@@ -158,12 +137,15 @@
     question="You are going to delete this ticket"
     message="This ticket will be removed from current route! Continue anyway?">
 </vn-confirm>
-<vn-add-stowaway vn-id="addStowaway" 
+<vn-add-stowaway
+    vn-id="addStowaway" 
     card-reload="$ctrl.cardReload()" 
     ticket="$ctrl.ticket">
 </vn-add-stowaway>
-<vn-remove-stowaway vn-id="removeStowaway" 
-    card-reload="$ctrl.cardReload()" ticket="$ctrl.ticket">
+<vn-remove-stowaway
+    vn-id="removeStowaway" 
+    card-reload="$ctrl.cardReload()"
+    ticket="$ctrl.ticket">
 </vn-remove-stowaway>
 <vn-confirm
     vn-id="confirm-dialog"
diff --git a/modules/ticket/front/index/index.html b/modules/ticket/front/index/index.html
index 63c43f8a7..3cf4a7c93 100644
--- a/modules/ticket/front/index/index.html
+++ b/modules/ticket/front/index/index.html
@@ -8,7 +8,7 @@
 </vn-crud-model>
 <div class="content-block">
     <vn-card class="vn-px-md vn-w-sm">
-        <vn-horizontal>
+        <vn-horizontal style="align-items: center;">
             <vn-searchbar
                 vn-id="ticketSearchbar"
                 panel="vn-ticket-search-panel"
diff --git a/modules/ticket/front/index/style.scss b/modules/ticket/front/index/style.scss
index 7fed21006..30d7c11ca 100644
--- a/modules/ticket/front/index/style.scss
+++ b/modules/ticket/front/index/style.scss
@@ -1,19 +1,6 @@
 @import "variables";
 
 vn-ticket-index {
-    vn-icon-menu {
-        padding-top: 30px;
-        padding-left: 10px;
-        color: $color-main;
-    
-        li {
-            color: initial;
-        }
-    }
-    vn-searchbar {
-        width: 100%
-    }
-
     @media screen and (max-width: 1440px) {
         .expendable {
             display: none;
diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html
index 6e54a6d66..3061938a7 100644
--- a/modules/ticket/front/sale/index.html
+++ b/modules/ticket/front/sale/index.html
@@ -39,14 +39,12 @@
                         disabled="!$ctrl.isChecked || !$ctrl.isEditable"
                         ng-click="$ctrl.showRemoveLinesDialog()"
                         vn-tooltip="Remove lines"
-                        tooltip-position="up"
                         icon="delete">
                     </vn-button>
                     <vn-button
                         disabled="!$ctrl.isChecked || !$ctrl.isEditable"
                         ng-click="$ctrl.showTransferPopover($event);"
                         vn-tooltip="Transfer lines"
-                        tooltip-position="right"
                         icon="call_split">
                     </vn-button>
                 </vn-tool-bar>
diff --git a/modules/ticket/front/sale/style.scss b/modules/ticket/front/sale/style.scss
index fb70f0844..2a18e0920 100644
--- a/modules/ticket/front/sale/style.scss
+++ b/modules/ticket/front/sale/style.scss
@@ -5,13 +5,6 @@ vn-ticket-sale {
         justify-content: space-between !important;
         align-items: center;
     }
-    
-    vn-ticket-sale {
-        tr .mdl-textfield{
-            width: inherit;
-            max-width: 100%;
-        }
-    }
     vn-table {
         img {
             border-radius: 50%;
diff --git a/modules/ticket/front/services/index.html b/modules/ticket/front/services/index.html
index b1ce19f83..de8145ef1 100644
--- a/modules/ticket/front/services/index.html
+++ b/modules/ticket/front/services/index.html
@@ -20,15 +20,16 @@
                 show-field="name"
                 value-field="name"
                 ng-model="service.description">
+                <append>
+                    <vn-icon-button
+                        icon="add_circle"
+                        vn-tooltip="New service type"
+                        ng-click="$ctrl.newServiceTypeDialog($index, $event)"
+                        vn-acl="administrative"
+                        style="padding: 0;">
+                    </vn-icon-button>
+                </append>
             </vn-autocomplete>
-            <vn-icon-button
-                vn-auto
-                class="vn-my-md"
-                icon="add_circle"
-                vn-tooltip="New service type"
-                ng-click="$ctrl.newServiceTypeDialog($index)"
-                vn-acl="administrative">
-            </vn-icon-button>
             <vn-input-number
                 vn-one min="0"
                 step="1" 
diff --git a/modules/ticket/front/services/index.js b/modules/ticket/front/services/index.js
index 016506e08..344e8f5b0 100644
--- a/modules/ticket/front/services/index.js
+++ b/modules/ticket/front/services/index.js
@@ -46,7 +46,8 @@ class Controller {
         this.nameInput.focus();
     }
 
-    newServiceTypeDialog(elementIndex) {
+    newServiceTypeDialog(elementIndex, event) {
+        event.preventDefault();
         this.$scope.createServiceTypeDialog.show();
         this.currentServiceIndex = elementIndex;
     }
diff --git a/modules/ticket/front/services/index.spec.js b/modules/ticket/front/services/index.spec.js
index 97ce890d9..cf416f84d 100644
--- a/modules/ticket/front/services/index.spec.js
+++ b/modules/ticket/front/services/index.spec.js
@@ -1,6 +1,6 @@
 import './index.js';
 
-fdescribe('Ticket component vnTicketService', () => {
+describe('Ticket component vnTicketService', () => {
     let controller;
     let $httpBackend;
     let $httpParamSerializer;
diff --git a/modules/ticket/front/summary/index.html b/modules/ticket/front/summary/index.html
index 584360121..89cf97ca9 100644
--- a/modules/ticket/front/summary/index.html
+++ b/modules/ticket/front/summary/index.html
@@ -6,6 +6,8 @@
         </span>
         <vn-button
             disabled="!$ctrl.isEditable" 
+            class="flat"
+            style="color: inherit;"
             label="SET OK" 
             ng-click="$ctrl.setOkState()"
             vn-tooltip="Change ticket state to 'Ok'">
diff --git a/modules/worker/front/calendar/index.html b/modules/worker/front/calendar/index.html
index d832fa960..a8225981f 100644
--- a/modules/worker/front/calendar/index.html
+++ b/modules/worker/front/calendar/index.html
@@ -23,7 +23,14 @@
                     {{'of' | translate}} {{$ctrl.calendar.totalHolidays}} {{'days' | translate}}
                 </vn-auto>
             </vn-vertical>
-            <vn-color-legend data="$ctrl.legends"></vn-color-legend>
+            <div>
+                <vn-chip ng-repeat="legend in $ctrl.legends">
+                    <vn-avatar
+                        ng-style="{backgroundColor: legend.color}">
+                    </vn-avatar>
+                    {{legend.name}}
+                </vn-chip>
+            </div>
         </vn-vertical>
     </vn-side-menu>
 </div>
\ No newline at end of file
diff --git a/modules/worker/front/descriptor/index.html b/modules/worker/front/descriptor/index.html
index 5bb9b22e5..cf5279ad8 100644
--- a/modules/worker/front/descriptor/index.html
+++ b/modules/worker/front/descriptor/index.html
@@ -36,11 +36,9 @@
         <div class="quicklinks">
             <a
                 ui-sref="client.card.summary({id: $ctrl.worker.userFk})"
-                vn-tooltip="Go to client">
-                <vn-icon
-                    class="mdl-button mdl-js-button mdl-button--colored" 
-                    icon="person">
-                </vn-icon>
+                vn-tooltip="Go to client"
+                class="vn-button">
+                <vn-icon icon="person"></vn-icon>
             </a>
         </div>
     </div>
diff --git a/modules/worker/front/index/index.html b/modules/worker/front/index/index.html
index c27f3aed4..87abf1539 100644
--- a/modules/worker/front/index/index.html
+++ b/modules/worker/front/index/index.html
@@ -7,9 +7,8 @@
 </vn-crud-model>
 <div class="content-block vn-w-sm">
     <vn-card class="vn-px-md">
-        <vn-horizontal>
+        <vn-horizontal style="align-items: center;">
             <vn-searchbar
-                style="width: 100%"
                 panel="vn-worker-search-panel"
                 on-search="$ctrl.onSearch($params)"
                 info="Search workers by id, firstName, lastName or user name"
diff --git a/modules/worker/front/index/index.js b/modules/worker/front/index/index.js
index e554f9fa0..adaaf6d40 100644
--- a/modules/worker/front/index/index.js
+++ b/modules/worker/front/index/index.js
@@ -1,5 +1,4 @@
 import ngModule from '../module';
-import './style.scss';
 
 export default class Controller {
     constructor($, $state) {
diff --git a/modules/worker/front/index/style.scss b/modules/worker/front/index/style.scss
deleted file mode 100644
index f6ebf3828..000000000
--- a/modules/worker/front/index/style.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-@import "variables";
-
-vn-worker-index vn-icon-menu {
-    padding-top: 30px;
-    padding-left: 10px;
-    color: $color-main;
-
-    li {
-        color: initial;
-    }
-}
\ No newline at end of file

From 17a150370cb4025dc69e00e6abb529bf892164e3 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Fri, 18 Oct 2019 21:54:13 +0200
Subject: [PATCH 25/41] Style fixes

---
 .../01_descriptor.spec.js                      |  2 +-
 front/core/components/card/style.scss          |  1 +
 front/core/components/icon-button/style.scss   |  2 +-
 front/core/components/searchbar/searchbar.html |  2 +-
 front/salix/components/home/home.html          |  1 -
 front/salix/components/home/style.scss         |  4 ++--
 modules/agency/front/index/index.html          |  2 +-
 modules/claim/front/index/index.html           |  2 +-
 modules/client/front/index/index.html          |  2 +-
 modules/invoiceOut/front/index/index.html      | 18 ++++++++----------
 modules/item/front/index/index.html            |  2 +-
 modules/order/front/index/index.html           |  2 +-
 modules/route/front/index/index.html           |  2 +-
 modules/ticket/front/index/index.html          |  2 +-
 modules/travel/front/index/index.html          |  2 +-
 modules/worker/front/index/index.html          |  2 +-
 16 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/e2e/paths/09-invoice-out-module/01_descriptor.spec.js b/e2e/paths/09-invoice-out-module/01_descriptor.spec.js
index fd3516d87..a00d6387d 100644
--- a/e2e/paths/09-invoice-out-module/01_descriptor.spec.js
+++ b/e2e/paths/09-invoice-out-module/01_descriptor.spec.js
@@ -1,7 +1,7 @@
 import selectors from '../../helpers/selectors.js';
 import createNightmare from '../../helpers/nightmare';
 
-fdescribe('InvoiceOut descriptor path', () => {
+describe('InvoiceOut descriptor path', () => {
     const nightmare = createNightmare();
     let bookedDate;
 
diff --git a/front/core/components/card/style.scss b/front/core/components/card/style.scss
index c2fe4e1ea..a459879df 100644
--- a/front/core/components/card/style.scss
+++ b/front/core/components/card/style.scss
@@ -1,3 +1,4 @@
 vn-card {
     display: block;
+    box-sizing: border-box;
 }
\ No newline at end of file
diff --git a/front/core/components/icon-button/style.scss b/front/core/components/icon-button/style.scss
index 3dd41d723..c73580ad9 100644
--- a/front/core/components/icon-button/style.scss
+++ b/front/core/components/icon-button/style.scss
@@ -5,7 +5,7 @@ vn-icon-button {
     color: $color-main;
 
     & > button {
-        padding: 0 !important;
+        padding: .2em !important;
     }
     &:focus {
         opacity: .6;
diff --git a/front/core/components/searchbar/searchbar.html b/front/core/components/searchbar/searchbar.html
index c231b9752..069a9411c 100644
--- a/front/core/components/searchbar/searchbar.html
+++ b/front/core/components/searchbar/searchbar.html
@@ -1,6 +1,6 @@
 <form ng-submit="$ctrl.onSubmit()">
     <vn-textfield
-        class="dense vn-py-md"
+        class="dense"
         placeholder="{{::'Search' | translate}}"
         ng-model="$ctrl.searchString">
         <prepend>
diff --git a/front/salix/components/home/home.html b/front/salix/components/home/home.html
index b6aaeced1..95bec4e5a 100644
--- a/front/salix/components/home/home.html
+++ b/front/salix/components/home/home.html
@@ -9,7 +9,6 @@
                 <vn-icon icon="{{::mod.icon || 'photo'}}"></vn-icon>
             </div>
             <h4 ng-bind-html="$ctrl.getModuleName(mod)"></h4>
-
             <span
                 ng-show='mod.keyBind'
                 vn-tooltip="Ctrl + Alt + {{mod.keyBind}}">
diff --git a/front/salix/components/home/style.scss b/front/salix/components/home/style.scss
index cab44ea73..b004b7336 100644
--- a/front/salix/components/home/style.scss
+++ b/front/salix/components/home/style.scss
@@ -49,9 +49,9 @@ vn-home {
                     text-align: center;
                 }
                 & > h4 {
-                    max-width: 7em;
+                    max-width: 100%;
                     text-align: center;
-                    font-size: 13pt;
+                    font-size: 12pt;
                     overflow: hidden;
                     color: inherit;
                     margin: 0;
diff --git a/modules/agency/front/index/index.html b/modules/agency/front/index/index.html
index c2cd52faa..8c039cdef 100644
--- a/modules/agency/front/index/index.html
+++ b/modules/agency/front/index/index.html
@@ -7,7 +7,7 @@
     auto-load="true">
 </vn-crud-model>
 <div>
-    <vn-card class="vn-w-sm vn-px-md">
+    <vn-card class="vn-w-sm vn-pa-md">
         <vn-searchbar
             panel="vn-zone-search-panel"
             model="model"
diff --git a/modules/claim/front/index/index.html b/modules/claim/front/index/index.html
index e72810f6f..1dc510042 100644
--- a/modules/claim/front/index/index.html
+++ b/modules/claim/front/index/index.html
@@ -7,7 +7,7 @@
     auto-load="true">
 </vn-crud-model>
 <div class="content-block">
-    <vn-card class="vn-px-md vn-w-sm">
+    <vn-card class="vn-w-sm vn-pa-md">
         <vn-searchbar
             panel="vn-claim-search-panel"
             on-search="$ctrl.onSearch($params)"
diff --git a/modules/client/front/index/index.html b/modules/client/front/index/index.html
index 602ef8600..64be81a29 100644
--- a/modules/client/front/index/index.html
+++ b/modules/client/front/index/index.html
@@ -6,7 +6,7 @@
     data="clients">
 </vn-crud-model>
 <div class="content-block vn-w-sm">
-    <vn-card class="vn-px-md">
+    <vn-card class="vn-pa-md">
         <vn-searchbar
             panel="vn-client-search-panel"
             model="model"
diff --git a/modules/invoiceOut/front/index/index.html b/modules/invoiceOut/front/index/index.html
index 2eb08ead1..e88a1986d 100644
--- a/modules/invoiceOut/front/index/index.html
+++ b/modules/invoiceOut/front/index/index.html
@@ -6,16 +6,14 @@
     order="issued DESC">
 </vn-crud-model>
 <div class="content-block">
-    <div class="vn-list">
-        <vn-card class="vn-px-md vn-w-sm">
-            <vn-searchbar
-                panel="vn-invoice-search-panel"
-                on-search="$ctrl.onSearch($params)"
-                info="Search invoices by reference"
-                vn-focus>
-            </vn-searchbar>
-        </vn-card>
-    </div>
+    <vn-card class="vn-pa-md vn-w-sm">
+        <vn-searchbar
+            panel="vn-invoice-search-panel"
+            on-search="$ctrl.onSearch($params)"
+            info="Search invoices by reference"
+            vn-focus>
+        </vn-searchbar>
+    </vn-card>
     <vn-data-viewer
         model="model"
         class="vn-w-md vn-my-md">
diff --git a/modules/item/front/index/index.html b/modules/item/front/index/index.html
index 0b0030689..3ed297baa 100644
--- a/modules/item/front/index/index.html
+++ b/modules/item/front/index/index.html
@@ -6,7 +6,7 @@
     data="items">
 </vn-crud-model>
 <div class="content-block">
-    <vn-card class="vn-px-md vn-w-sm">
+    <vn-card class="vn-pa-md vn-w-sm">
         <vn-horizontal style="align-items: center;">
             <vn-searchbar
                 panel="vn-item-search-panel"
diff --git a/modules/order/front/index/index.html b/modules/order/front/index/index.html
index 5a01182b9..750130a7f 100644
--- a/modules/order/front/index/index.html
+++ b/modules/order/front/index/index.html
@@ -6,7 +6,7 @@
     order="landed DESC, clientFk">
 </vn-crud-model>
 <div class="content-block">
-    <vn-card class="vn-px-md vn-w-sm">
+    <vn-card class="vn-pa-md vn-w-sm">
         <vn-searchbar
             panel="vn-order-search-panel"
             on-search="$ctrl.onSearch($params)"
diff --git a/modules/route/front/index/index.html b/modules/route/front/index/index.html
index cd1e2baa2..e3ef4d98f 100644
--- a/modules/route/front/index/index.html
+++ b/modules/route/front/index/index.html
@@ -7,7 +7,7 @@
     auto-load="true">
 </vn-crud-model>
 <div class="content-block">
-    <vn-card class="vn-px-md vn-w-sm">
+    <vn-card class="vn-pa-md vn-w-sm">
         <vn-searchbar
             filter="$ctrl.filter"
             panel="vn-route-search-panel"
diff --git a/modules/ticket/front/index/index.html b/modules/ticket/front/index/index.html
index 3cf4a7c93..20eaf254a 100644
--- a/modules/ticket/front/index/index.html
+++ b/modules/ticket/front/index/index.html
@@ -7,7 +7,7 @@
     order="shipped DESC, zoneHour ASC, zoneMinute ASC, clientFk">
 </vn-crud-model>
 <div class="content-block">
-    <vn-card class="vn-px-md vn-w-sm">
+    <vn-card class="vn-pa-md vn-w-sm">
         <vn-horizontal style="align-items: center;">
             <vn-searchbar
                 vn-id="ticketSearchbar"
diff --git a/modules/travel/front/index/index.html b/modules/travel/front/index/index.html
index b97df36b1..5f7a08fd4 100644
--- a/modules/travel/front/index/index.html
+++ b/modules/travel/front/index/index.html
@@ -6,7 +6,7 @@
     data="travels">
 </vn-crud-model>
 <div class="content-block">
-    <vn-card class="vn-px-md vn-w-sm">
+    <vn-card class="vn-pa-md vn-w-sm">
         <vn-searchbar
             panel="vn-travel-search-panel"
             model="model"
diff --git a/modules/worker/front/index/index.html b/modules/worker/front/index/index.html
index 87abf1539..759162250 100644
--- a/modules/worker/front/index/index.html
+++ b/modules/worker/front/index/index.html
@@ -6,7 +6,7 @@
     data="workers">
 </vn-crud-model>
 <div class="content-block vn-w-sm">
-    <vn-card class="vn-px-md">
+    <vn-card class="vn-pa-md">
         <vn-horizontal style="align-items: center;">
             <vn-searchbar
                 panel="vn-worker-search-panel"

From 485bc43b139cf9f880bdc15c502f55229fe01273 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Fri, 18 Oct 2019 22:07:55 +0200
Subject: [PATCH 26/41] Style fixes

---
 modules/item/front/descriptor/style.scss | 1 +
 modules/item/front/summary/index.html    | 8 +++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/item/front/descriptor/style.scss b/modules/item/front/descriptor/style.scss
index 8b08071e1..257e46e1c 100644
--- a/modules/item/front/descriptor/style.scss
+++ b/modules/item/front/descriptor/style.scss
@@ -5,6 +5,7 @@ vn-item-descriptor {
     img[ng-src] {
         height: 100%;
         width: 100%;
+        display: block;
     }
     vn-dialog[vn-id=regularize]{
         vn-textfield{
diff --git a/modules/item/front/summary/index.html b/modules/item/front/summary/index.html
index 4a1e4fb56..a3ab3d8ae 100644
--- a/modules/item/front/summary/index.html
+++ b/modules/item/front/summary/index.html
@@ -2,11 +2,9 @@
     <h5>{{$ctrl.item.id}} - {{$ctrl.summary.item.name}}</h5>
     <vn-horizontal>
         <vn-one>
-            <vn-one>
-                <img style="width: 100%"
-                    ng-src="//verdnatura.es/vn-image-data/catalog/200x200/{{$ctrl.item.image}}" 
-                    zoom-image="//verdnatura.es/vn-image-data/catalog/1600x900/{{$ctrl.item.image}}" on-error-src/>
-            </vn-one>
+            <img style="width: 100%; display: block;"
+                ng-src="//verdnatura.es/vn-image-data/catalog/200x200/{{$ctrl.item.image}}" 
+                zoom-image="//verdnatura.es/vn-image-data/catalog/1600x900/{{$ctrl.item.image}}" on-error-src/>
             <vn-horizontal class="item-state">
                 <vn-one>
                     <p translate>Visible</p>

From de9a8443ca6b38f313cc09f099e069713aa2574c Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Fri, 18 Oct 2019 22:28:08 +0200
Subject: [PATCH 27/41] Style fixes

---
 front/core/components/field/style.scss  |   4 +-
 front/core/components/toggle/style.scss |   2 +-
 front/core/styles/global.scss           |   2 +-
 front/core/styles/variables.scss        |   2 +-
 modules/claim/front/detail/index.html   | 128 ++++++++++++------------
 5 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/front/core/components/field/style.scss b/front/core/components/field/style.scss
index 8441fb04a..e57b27912 100644
--- a/front/core/components/field/style.scss
+++ b/front/core/components/field/style.scss
@@ -35,7 +35,7 @@
             & > .fix {
                 padding-top: 24px;
                 line-height: 24px;
-                font-size: $input-font-size;
+                font-size: $font-size;
                 opacity: 0;
                 transition: opacity 200ms ease-in-out;
 
@@ -58,7 +58,7 @@
                     border: none;
                     font-family: Arial, sans-serif;
                     display: block;
-                    font-size: $input-font-size;
+                    font-size: $font-size;
                     width: 100%;
                     background: 0;
                     color: inherit;
diff --git a/front/core/components/toggle/style.scss b/front/core/components/toggle/style.scss
index 13b7406f6..a373b6f4c 100644
--- a/front/core/components/toggle/style.scss
+++ b/front/core/components/toggle/style.scss
@@ -11,7 +11,7 @@
         cursor: inherit;
     }
     & > span {
-        font-size: $input-font-size;
+        font-size: $font-size;
         text-overflow: ellipsis;
         white-space: nowrap;
         overflow: hidden;
diff --git a/front/core/styles/global.scss b/front/core/styles/global.scss
index 2c99aa45b..5f001736b 100644
--- a/front/core/styles/global.scss
+++ b/front/core/styles/global.scss
@@ -6,7 +6,7 @@ html, body {
     height: 100%;
     font-family: vn-font;
     color: $color-font;
-    font-size: 12pt;
+    font-size: $font-size;
     margin: 0;
     padding: 0;
 }
diff --git a/front/core/styles/variables.scss b/front/core/styles/variables.scss
index 1783a4c01..454bc6f7c 100644
--- a/front/core/styles/variables.scss
+++ b/front/core/styles/variables.scss
@@ -3,7 +3,7 @@
 $menu-width: 16em;
 $topbar-height: 4em;
 $mobile-width: 800px;
-$input-font-size: 16px;
+$font-size: 16px;
 
 // Width
 
diff --git a/modules/claim/front/detail/index.html b/modules/claim/front/detail/index.html
index 4a5767194..30387ed43 100644
--- a/modules/claim/front/detail/index.html
+++ b/modules/claim/front/detail/index.html
@@ -1,12 +1,14 @@
-<vn-crud-model vn-id="model" 
+<vn-crud-model
+    vn-id="model" 
     auto-load="true"
     url="claim/api/ClaimBeginnings"
     filter="$ctrl.filter"
     data="$ctrl.salesClaimed"
     on-data-change="$ctrl.calculateTotals()">
 </vn-crud-model>
-
-<vn-card class="vn-mb-md vn-pa-lg vn-w-lg" style="text-align: right" 
+<vn-card
+    class="vn-mb-md vn-pa-lg vn-w-lg"
+    style="text-align: right" 
     ng-if="$ctrl.salesClaimed.length > 0">
     <vn-label-value label="Total" 
         value="{{$ctrl.paidTotal | currency: 'EUR':2}}">
@@ -15,70 +17,68 @@
         value="{{$ctrl.claimedTotal | currency: 'EUR':2}}">
     </vn-label-value>
 </vn-card>
-
-<vn-card class="vn-pa-lg">
-    <vn-data-viewer model="model">
-        <vn-table model="model">
-            <vn-thead>
-                <vn-tr>
-                    <vn-th center>Landed</vn-th>
-                    <vn-th number>Quantity</vn-th>
-                    <vn-th>Claimed</vn-th>
-                    <vn-th>Description</vn-th>
-                    <vn-th number>Price</vn-th>
-                    <vn-th number>Disc.</vn-th>
-                    <vn-th number>Total</vn-th>
-                    <vn-th></vn-th>
-                </vn-tr>
-            </vn-thead>
-            <vn-tbody>
-                <vn-tr ng-repeat="saleClaimed in $ctrl.salesClaimed" vn-repeat-last>
-                    <vn-td center>{{::saleClaimed.sale.ticket.landed | dateTime:'dd/MM/yyyy'}}</vn-td>
-                    <vn-td number>{{::saleClaimed.sale.quantity}}</vn-td>
-                    <vn-td>
-                        <vn-input-number
-                            vn-focus min="0"
-                            step="1"
-                            ng-model="saleClaimed.quantity"
-                            on-change="$ctrl.setClaimedQuantity(saleClaimed.id, saleClaimed.quantity)">
-                        </vn-input-number>
-                    </vn-td>
-                    <vn-td expand title="{{::saleClaimed.sale.concept}}">
-                        <span 
-                            class="link"
-                            ng-click="$ctrl.showItemDescriptor($event, saleClaimed.sale.itemFk)">
-                            {{::saleClaimed.sale.concept}}
-                        </span>
-                    </vn-td>
-                    <vn-td number>{{::saleClaimed.sale.price | currency: 'EUR':2}}</vn-td>
-                    <vn-td number>
-                        <span class="link"
-                            vn-tooltip="Edit discount"
-                            ng-click="$ctrl.showEditPopover($event, saleClaimed)">
-                            {{::saleClaimed.sale.discount}} %
-                        </span>
-                    </vn-td>
-                    <vn-td number>
-                        {{::$ctrl.getSaleTotal(saleClaimed.sale) | currency: 'EUR':2}}
-                    </vn-td>
-                    <vn-td shrink>
-                        <vn-icon-button
-                            vn-tooltip="Remove sale"
-                            icon="delete"
-                            ng-click="$ctrl.deleteClaimedSale($index)"
-                            tabindex="-1">
-                        </vn-icon-button>
-                    </vn-td>
-                </vn-tr>
-            </vn-tbody>
-        </vn-table>
-    </vn-data-viewer>
-</vn-card>
-
+<vn-data-viewer model="model">
+    <vn-card>
+    <vn-table model="model">
+        <vn-thead>
+            <vn-tr>
+                <vn-th center>Landed</vn-th>
+                <vn-th number>Quantity</vn-th>
+                <vn-th>Claimed</vn-th>
+                <vn-th>Description</vn-th>
+                <vn-th number>Price</vn-th>
+                <vn-th number>Disc.</vn-th>
+                <vn-th number>Total</vn-th>
+                <vn-th></vn-th>
+            </vn-tr>
+        </vn-thead>
+        <vn-tbody>
+            <vn-tr ng-repeat="saleClaimed in $ctrl.salesClaimed" vn-repeat-last>
+                <vn-td center>{{::saleClaimed.sale.ticket.landed | dateTime:'dd/MM/yyyy'}}</vn-td>
+                <vn-td number>{{::saleClaimed.sale.quantity}}</vn-td>
+                <vn-td>
+                    <vn-input-number
+                        min="0"
+                        step="1"
+                        ng-model="saleClaimed.quantity"
+                        on-change="$ctrl.setClaimedQuantity(saleClaimed.id, saleClaimed.quantity)"
+                        class="dense">
+                    </vn-input-number>
+                </vn-td>
+                <vn-td expand title="{{::saleClaimed.sale.concept}}">
+                    <span 
+                        class="link"
+                        ng-click="$ctrl.showItemDescriptor($event, saleClaimed.sale.itemFk)">
+                        {{::saleClaimed.sale.concept}}
+                    </span>
+                </vn-td>
+                <vn-td number>{{::saleClaimed.sale.price | currency: 'EUR':2}}</vn-td>
+                <vn-td number>
+                    <span class="link"
+                        vn-tooltip="Edit discount"
+                        ng-click="$ctrl.showEditPopover($event, saleClaimed)">
+                        {{::saleClaimed.sale.discount}} %
+                    </span>
+                </vn-td>
+                <vn-td number>
+                    {{::$ctrl.getSaleTotal(saleClaimed.sale) | currency: 'EUR':2}}
+                </vn-td>
+                <vn-td shrink>
+                    <vn-icon-button
+                        vn-tooltip="Remove sale"
+                        icon="delete"
+                        ng-click="$ctrl.deleteClaimedSale($index)"
+                        tabindex="-1">
+                    </vn-icon-button>
+                </vn-td>
+            </vn-tr>
+        </vn-tbody>
+    </vn-table>
+    </vn-card>
+</vn-data-viewer>
 <a ng-click="$ctrl.openAddSalesDialog()" vn-tooltip="Add sale item" vn-bind="+" fixed-bottom-right>
     <vn-float-button icon="add"></vn-float-button>
 </a>
-
 <!-- Add Lines Dialog -->
 <vn-dialog vn-id="add-sales" class="modal-form">
     <tpl-body>

From 470b966e85e416c6e5f53b4c60ea58599ca9e2e7 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Fri, 18 Oct 2019 22:54:25 +0200
Subject: [PATCH 28/41] Style fixes

---
 front/salix/components/summary/style.scss | 1 +
 front/salix/styles/misc.scss              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/front/salix/components/summary/style.scss b/front/salix/components/summary/style.scss
index 9fd85be3c..558b9b758 100644
--- a/front/salix/components/summary/style.scss
+++ b/front/salix/components/summary/style.scss
@@ -21,6 +21,7 @@
             flex-wrap: wrap;
             padding: $spacing-md;
             overflow: hidden;
+            align-items: flex-start;
 
             h4 {
                 margin-bottom: $spacing-md;
diff --git a/front/salix/styles/misc.scss b/front/salix/styles/misc.scss
index 6dcaab060..0983264bc 100644
--- a/front/salix/styles/misc.scss
+++ b/front/salix/styles/misc.scss
@@ -2,7 +2,7 @@
 @import "./effects";
 
 form vn-horizontal {
-    align-items: stretch;
+    align-items: center;
 
     & > * {
         box-sizing: border-box;

From 72017a64ac888fc8e403bd1de0fba027fa925f1e Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Sat, 19 Oct 2019 01:18:25 +0200
Subject: [PATCH 29/41] Date timezone offset properly handled from backend DB
 connector

---
 front/core/components/date-picker/index.js    |  2 +-
 .../core/components/date-picker/index.spec.js |  4 +--
 front/core/components/input-time/index.js     |  2 +-
 .../core/components/input-time/index.spec.js  |  2 +-
 front/core/filters/dateTime.js                | 21 -------------
 front/core/filters/index.js                   |  1 -
 loopback/server/connectors/vn-mysql.js        | 31 -------------------
 loopback/server/datasources.json              |  2 ++
 modules/agency/back/methods/zone/clone.js     |  4 ---
 modules/agency/front/descriptor/index.html    |  2 +-
 modules/agency/front/events/index.html        |  6 ++--
 modules/agency/front/exclusions/index.html    |  2 +-
 modules/agency/front/index/index.html         |  2 +-
 modules/agency/front/location/index.html      |  5 +--
 modules/agency/front/summary/index.html       |  2 +-
 modules/claim/front/action/index.html         |  6 ++--
 modules/claim/front/basic-data/index.html     |  2 +-
 modules/claim/front/descriptor/index.html     |  2 +-
 modules/claim/front/detail/index.html         |  4 +--
 modules/claim/front/index/index.html          |  2 +-
 modules/claim/front/summary/index.html        |  6 ++--
 modules/client/front/balance/index/index.html |  8 ++---
 .../front/credit-insurance/index/index.html   |  6 ++--
 .../insurance/index/index.html                |  2 +-
 modules/client/front/credit/index/index.html  |  2 +-
 modules/client/front/dms/index/index.html     |  2 +-
 modules/client/front/greuge/index/index.html  |  2 +-
 modules/client/front/mandate/index.html       |  4 +--
 modules/client/front/note/index/index.html    |  2 +-
 .../client/front/recovery/index/index.html    |  4 +--
 modules/client/front/sample/index/index.html  |  2 +-
 modules/client/front/summary/index.html       |  2 +-
 modules/client/front/web-payment/index.html   |  2 +-
 .../invoiceOut/front/descriptor/index.html    |  2 +-
 modules/invoiceOut/front/index/index.html     |  6 ++--
 modules/invoiceOut/front/summary/index.html   | 10 +++---
 modules/item/front/diary/index.html           |  2 +-
 modules/item/front/last-entries/index.html    |  2 +-
 modules/item/front/request/index.html         |  6 ++--
 modules/order/front/descriptor/index.html     |  2 +-
 modules/order/front/index/index.html          |  2 +-
 modules/order/front/line/index.html           |  2 +-
 modules/order/front/summary/index.html        |  4 +--
 modules/route/front/descriptor/index.html     |  2 +-
 modules/route/front/index/index.html          |  2 +-
 modules/route/front/summary/index.html        |  6 ++--
 .../front/basic-data/step-one/index.html      |  2 +-
 .../ticket/front/descriptor/addStowaway.html  |  2 +-
 modules/ticket/front/descriptor/index.html    |  2 +-
 .../front/descriptor/removeStowaway.html      |  2 +-
 modules/ticket/front/dms/index/index.html     |  2 +-
 modules/ticket/front/expedition/index.html    |  2 +-
 modules/ticket/front/index/index.html         |  6 ++--
 modules/ticket/front/request/index/index.html |  2 +-
 modules/ticket/front/sale-tracking/index.html |  2 +-
 modules/ticket/front/sale/index.html          |  2 +-
 modules/ticket/front/summary/index.html       |  8 ++---
 .../ticket/front/tracking/index/index.html    |  2 +-
 modules/ticket/front/weekly/index/index.html  |  2 +-
 modules/travel/front/index/index.html         |  4 +--
 .../methods/worker-time-control/addTime.js    |  3 --
 modules/worker/front/log/index.html           |  2 +-
 modules/worker/front/time-control/index.html  |  2 +-
 63 files changed, 93 insertions(+), 150 deletions(-)
 delete mode 100644 front/core/filters/dateTime.js

diff --git a/front/core/components/date-picker/index.js b/front/core/components/date-picker/index.js
index 933123485..b667674fa 100644
--- a/front/core/components/date-picker/index.js
+++ b/front/core/components/date-picker/index.js
@@ -43,7 +43,7 @@ class DatePicker extends Field {
 
     set field(value) {
         super.field = value;
-        this.input.value = this.$filter('dateTime')(value, 'yyyy-MM-dd');
+        this.input.value = this.$filter('date')(value, 'yyyy-MM-dd');
     }
 }
 DatePicker.$inject = ['$element', '$scope', '$compile', '$translate', '$filter'];
diff --git a/front/core/components/date-picker/index.spec.js b/front/core/components/date-picker/index.spec.js
index b6f6fbd2f..38d344fc9 100644
--- a/front/core/components/date-picker/index.spec.js
+++ b/front/core/components/date-picker/index.spec.js
@@ -22,10 +22,10 @@ describe('Component vnDatePicker', () => {
         it(`should display the formated the date`, () => {
             let today;
             today = new Date();
-            today.setUTCHours(0, 0, 0, 0);
+            today.setHours(0, 0, 0, 0);
 
             $ctrl.field = today;
-            let displayed = $filter('dateTime')(today, 'yyyy-MM-dd');
+            let displayed = $filter('date')(today, 'yyyy-MM-dd');
 
             expect($ctrl.value).toEqual(displayed);
         });
diff --git a/front/core/components/input-time/index.js b/front/core/components/input-time/index.js
index 3dc01e0c7..d77ccbec2 100644
--- a/front/core/components/input-time/index.js
+++ b/front/core/components/input-time/index.js
@@ -15,7 +15,7 @@ export default class InputTime extends Field {
     }
 
     set field(value) {
-        this.input.value = this.$filter('dateTime')(value, 'HH:mm');
+        this.input.value = this.$filter('date')(value, 'HH:mm');
         super.field = value;
     }
 
diff --git a/front/core/components/input-time/index.spec.js b/front/core/components/input-time/index.spec.js
index f1ab14b50..0ab0fc762 100644
--- a/front/core/components/input-time/index.spec.js
+++ b/front/core/components/input-time/index.spec.js
@@ -24,7 +24,7 @@ describe('Component vnInputTime', () => {
         it(`should display the formated the date`, () => {
             let date = new Date();
             $ctrl.field = date;
-            let displayed = $filter('dateTime')(date, 'HH:mm');
+            let displayed = $filter('date')(date, 'HH:mm');
 
             expect($ctrl.value).toEqual(displayed);
         });
diff --git a/front/core/filters/dateTime.js b/front/core/filters/dateTime.js
deleted file mode 100644
index a4a527160..000000000
--- a/front/core/filters/dateTime.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import ngModule from '../module';
-
-/**
- * Returns a formatted date based on input filter.
- *
- * @return {String} The string result
- */
-dateTime.$inject = ['$filter'];
-
-export default function dateTime($filter) {
-    return function(input, format) {
-        if (typeof input === 'string' && input) {
-            input = new Date(input);
-            let offset = input.getTimezoneOffset() * 60000;
-            input.setTime(input.getTime() + offset);
-        }
-
-        return $filter('date')(input, format);
-    };
-}
-ngModule.filter('dateTime', dateTime);
diff --git a/front/core/filters/index.js b/front/core/filters/index.js
index 26c2db213..cc4dff823 100644
--- a/front/core/filters/index.js
+++ b/front/core/filters/index.js
@@ -1,7 +1,6 @@
 import './phone';
 import './ucwords';
 import './dash-if-empty';
-import './dateTime';
 import './percentage';
 import './currency';
 import './zero-fill';
diff --git a/loopback/server/connectors/vn-mysql.js b/loopback/server/connectors/vn-mysql.js
index 2ea30b598..5c625be85 100644
--- a/loopback/server/connectors/vn-mysql.js
+++ b/loopback/server/connectors/vn-mysql.js
@@ -5,37 +5,6 @@ const EnumFactory = require('loopback-connector-mysql').EnumFactory;
 const fs = require('fs');
 
 class VnMySQL extends MySQL {
-    toColumnValue(prop, val) {
-        if (val == null || !prop || prop.type !== Date)
-            return MySQL.prototype.toColumnValue.call(this, prop, val);
-
-        val = new Date(val);
-
-        return val.getFullYear() + '-' +
-            fillZeros(val.getMonth() + 1) + '-' +
-            fillZeros(val.getDate()) + ' ' +
-            fillZeros(val.getHours()) + ':' +
-            fillZeros(val.getMinutes()) + ':' +
-            fillZeros(val.getSeconds());
-
-        function fillZeros(v) {
-            return v < 10 ? '0' + v : v;
-        }
-    }
-    fromColumnValue(prop, val) {
-        if (val == null || !prop || prop.type !== Date)
-            return MySQL.prototype.fromColumnValue.call(this, prop, val);
-
-        let date = new Date(val);
-
-        return date;
-    }
-
-    isIsoDate(dateString) {
-        let isoRegexp = /^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[01]|0[1-9]|[12][0-9])T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(.[0-9]+)?(Z)?$/g;
-        return isoRegexp.test(dateString);
-    }
-
     /**
      * Promisified version of execute().
      *
diff --git a/loopback/server/datasources.json b/loopback/server/datasources.json
index 4c9e407a0..bbd8ce0d5 100644
--- a/loopback/server/datasources.json
+++ b/loopback/server/datasources.json
@@ -12,6 +12,8 @@
         "username": "root",
         "password": "root",
         "multipleStatements": true,
+        "legacyUtcDateProcessing": false,
+        "timezone": "local",
         "connectTimeout": 20000,
         "acquireTimeout": 20000
     },
diff --git a/modules/agency/back/methods/zone/clone.js b/modules/agency/back/methods/zone/clone.js
index 7924415ed..3d0008a27 100644
--- a/modules/agency/back/methods/zone/clone.js
+++ b/modules/agency/back/methods/zone/clone.js
@@ -40,10 +40,6 @@ module.exports = Self => {
                 where: {id}
             }, options);
 
-            const hour = zone.hour;
-            const offset = hour.getTimezoneOffset() * 60000;
-            hour.setTime(hour.getTime() + offset);
-
             // Find all original included geolocations
             const includedGeo = await models.ZoneIncluded.find({
                 fields: ['geoFk', 'isIncluded'],
diff --git a/modules/agency/front/descriptor/index.html b/modules/agency/front/descriptor/index.html
index d6de7791e..ffed14551 100644
--- a/modules/agency/front/descriptor/index.html
+++ b/modules/agency/front/descriptor/index.html
@@ -31,7 +31,7 @@
                 value="{{$ctrl.zone.agencyMode.name}}">
             </vn-label-value>
             <vn-label-value label="Closing hour (ETD)"
-                value="{{$ctrl.zone.hour | dateTime: 'HH:mm'}}">
+                value="{{$ctrl.zone.hour | date: 'HH:mm'}}">
             </vn-label-value>
             <vn-label-value label="Traveling days"
                 value="{{$ctrl.zone.travelingDays}}">
diff --git a/modules/agency/front/events/index.html b/modules/agency/front/events/index.html
index eba9a9ac0..91864dc7c 100644
--- a/modules/agency/front/events/index.html
+++ b/modules/agency/front/events/index.html
@@ -15,13 +15,13 @@
                     <div
                         ng-if="::row.from && !row.to"
                         class="vn-mb-sm">
-                        {{::row.from | dateTime:'dd/MM/yyyy'}}
+                        {{::row.from | date:'dd/MM/yyyy'}}
                     </div>
                     <div
                         ng-if="::!row.from || row.to"
                         class="vn-mb-sm">
                         <span ng-if="row.to">
-                            {{::row.from | dateTime:'dd/MM/yyyy'}} - {{::row.to | dateTime:'dd/MM/yyyy'}}
+                            {{::row.from | date:'dd/MM/yyyy'}} - {{::row.to | date:'dd/MM/yyyy'}}
                         </span>
                         <span ng-if="!row.to" translate>
                             Indefinitely
@@ -32,7 +32,7 @@
                     </div>
                     <vn-label-value
                         label="Closing" 
-                        value="{{::row.hour | dateTime:'hh:mm'}}">
+                        value="{{::row.hour | date:'hh:mm'}}">
                     </vn-label-value>
                     <vn-label-value
                         label="Traveling days" 
diff --git a/modules/agency/front/exclusions/index.html b/modules/agency/front/exclusions/index.html
index d5227d7e0..d6e20d060 100644
--- a/modules/agency/front/exclusions/index.html
+++ b/modules/agency/front/exclusions/index.html
@@ -7,7 +7,7 @@
             <vn-table>
             <vn-tbody>
             <vn-tr ng-repeat="row in data | orderBy:'day'">
-                <vn-td>{{::row.day | dateTime:'dd/MM/yyyy'}}</vn-td>
+                <vn-td>{{::row.day | date:'dd/MM/yyyy'}}</vn-td>
                 <vn-td shrink>
                     <vn-icon-button
                         icon="delete"
diff --git a/modules/agency/front/index/index.html b/modules/agency/front/index/index.html
index 8c039cdef..289e30fda 100644
--- a/modules/agency/front/index/index.html
+++ b/modules/agency/front/index/index.html
@@ -39,7 +39,7 @@
                     <vn-td number>{{::zone.id}}</vn-td>
                     <vn-td expand>{{::zone.name}}</vn-td>
                     <vn-td>{{::zone.agencyMode.name}}</vn-td>
-                    <vn-td shrink>{{::zone.hour | dateTime: 'HH:mm'}}</vn-td>
+                    <vn-td shrink>{{::zone.hour | date: 'HH:mm'}}</vn-td>
                     <vn-td number>{{::zone.price | currency: 'EUR':2}}</vn-td>
                     <vn-td shrink>
                         <vn-horizontal class="buttons">
diff --git a/modules/agency/front/location/index.html b/modules/agency/front/location/index.html
index 4931e02fd..e01f1257a 100644
--- a/modules/agency/front/location/index.html
+++ b/modules/agency/front/location/index.html
@@ -4,8 +4,9 @@
     filter="::$ctrl.filter">
 </vn-crud-model>
 <div class="vn-w-md">
-    <vn-card class="vn-px-lg">
-        <vn-searchbar auto-load="false"
+    <vn-card class="vn-pa-md">
+        <vn-searchbar
+            auto-load="false"
             on-search="$ctrl.onSearch($params)"
             vn-focus>
         </vn-searchbar>
diff --git a/modules/agency/front/summary/index.html b/modules/agency/front/summary/index.html
index eeb4d495e..f0336f0dc 100644
--- a/modules/agency/front/summary/index.html
+++ b/modules/agency/front/summary/index.html
@@ -14,7 +14,7 @@
         </vn-one>
         <vn-one>
             <vn-label-value label="Closing hour (ETD)"
-                value="{{$ctrl.summary.hour | dateTime: 'HH:mm'}}">
+                value="{{$ctrl.summary.hour | date: 'HH:mm'}}">
             </vn-label-value>
             <vn-label-value label="Traveling days"
                 value="{{$ctrl.summary.travelingDays}}">
diff --git a/modules/claim/front/action/index.html b/modules/claim/front/action/index.html
index 72207d418..329514b37 100644
--- a/modules/claim/front/action/index.html
+++ b/modules/claim/front/action/index.html
@@ -92,7 +92,7 @@
                             on-change="$ctrl.setClaimDestination(saleClaimed.id, value)">
                         </vn-autocomplete>
                     </vn-td>
-                    <vn-td>{{::saleClaimed.sale.ticket.landed | dateTime: 'dd/MM/yyyy'}}</vn-td>
+                    <vn-td>{{::saleClaimed.sale.ticket.landed | date: 'dd/MM/yyyy'}}</vn-td>
                     <vn-td number>{{::saleClaimed.sale.quantity}}</vn-td>
                     <vn-td expand>{{::saleClaimed.sale.concept}}</vn-td>
                     <vn-td number>{{::saleClaimed.sale.price | currency: 'EUR':2}}</vn-td>
@@ -145,7 +145,7 @@
                     class="clickable"
                     ng-click="$ctrl.addClaimedSale(sale.saleFk)">
                     <vn-td number>{{sale.saleFk}}</vn-td>
-                    <vn-td>{{sale.landed | dateTime: 'dd/MM/yyyy'}}</vn-td>
+                    <vn-td>{{sale.landed | date: 'dd/MM/yyyy'}}</vn-td>
                     <vn-td number>{{sale.quantity}}</vn-td>
                     <vn-td expand>{{sale.concept}}</vn-td>
                     <vn-td number>{{sale.price | currency: 'EUR':2}}</vn-td>
@@ -182,7 +182,7 @@
                     ng-repeat="ticket in lastTickets"
                     ng-click="$ctrl.importTicketLines(ticket.id)">
                     <vn-td number>{{::ticket.id}}</vn-td>
-                    <vn-td>{{::ticket.shipped | dateTime: 'dd/MM/yyyy'}}</vn-td>
+                    <vn-td>{{::ticket.shipped | date: 'dd/MM/yyyy'}}</vn-td>
                     <vn-td>{{::ticket.agencyMode.name}}</vn-td>
                     <vn-td>{{::ticket.warehouse.name}}</vn-td>
                 </vn-tr>
diff --git a/modules/claim/front/basic-data/index.html b/modules/claim/front/basic-data/index.html
index 289f8f197..1c68f6673 100644
--- a/modules/claim/front/basic-data/index.html
+++ b/modules/claim/front/basic-data/index.html
@@ -17,7 +17,7 @@
             <vn-textfield
                 vn-one
                 label="Created" 
-                field="::$ctrl.claim.created | dateTime:'yyyy-MM-dd hh:mm'"
+                field="::$ctrl.claim.created | date:'yyyy-MM-dd hh:mm'"
                 readonly="true">
             </vn-textfield>
         </vn-horizontal>
diff --git a/modules/claim/front/descriptor/index.html b/modules/claim/front/descriptor/index.html
index 431989bbd..313cf1b94 100644
--- a/modules/claim/front/descriptor/index.html
+++ b/modules/claim/front/descriptor/index.html
@@ -27,7 +27,7 @@
                 value="{{$ctrl.claim.claimState.description}}">
             </vn-label-value>
             <vn-label-value label="Created" 
-            value="{{$ctrl.claim.created | dateTime: 'dd/MM/yyyy HH:mm'}}">
+            value="{{$ctrl.claim.created | date: 'dd/MM/yyyy HH:mm'}}">
             </vn-label-value>
             <vn-label-value label="Salesperson" 
                 value="{{$ctrl.claim.client.salesPerson.user.nickname}}">
diff --git a/modules/claim/front/detail/index.html b/modules/claim/front/detail/index.html
index 30387ed43..ad59fadd9 100644
--- a/modules/claim/front/detail/index.html
+++ b/modules/claim/front/detail/index.html
@@ -34,7 +34,7 @@
         </vn-thead>
         <vn-tbody>
             <vn-tr ng-repeat="saleClaimed in $ctrl.salesClaimed" vn-repeat-last>
-                <vn-td center>{{::saleClaimed.sale.ticket.landed | dateTime:'dd/MM/yyyy'}}</vn-td>
+                <vn-td center>{{::saleClaimed.sale.ticket.landed | date:'dd/MM/yyyy'}}</vn-td>
                 <vn-td number>{{::saleClaimed.sale.quantity}}</vn-td>
                 <vn-td>
                     <vn-input-number
@@ -99,7 +99,7 @@
                 </vn-thead>
                 <vn-tbody>
                     <vn-tr ng-repeat="sale in $ctrl.salesToClaim" class="clickable" ng-click="$ctrl.addClaimedSale($index)">
-                        <vn-td number>{{sale.landed | dateTime: 'dd/MM/yyyy'}}</vn-td>
+                        <vn-td number>{{sale.landed | date: 'dd/MM/yyyy'}}</vn-td>
                         <vn-td number>{{sale.quantity}}</vn-td>
                         <vn-td expand title="{{::sale.concept}}">
                             <span 
diff --git a/modules/claim/front/index/index.html b/modules/claim/front/index/index.html
index 1dc510042..f9f42348f 100644
--- a/modules/claim/front/index/index.html
+++ b/modules/claim/front/index/index.html
@@ -41,7 +41,7 @@
                             {{::claim.name}}
                         </span>
                     </vn-td>
-                    <vn-td center>{{::claim.created | dateTime:'dd/MM/yyyy'}}</vn-td>
+                    <vn-td center>{{::claim.created | date:'dd/MM/yyyy'}}</vn-td>
                     <vn-td expand>
                         <span 
                             class="link" 
diff --git a/modules/claim/front/summary/index.html b/modules/claim/front/summary/index.html
index ecb3f0717..a4c95abd7 100644
--- a/modules/claim/front/summary/index.html
+++ b/modules/claim/front/summary/index.html
@@ -7,7 +7,7 @@
     <vn-horizontal>
         <vn-one>
             <vn-label-value label="Created" 
-                value="{{$ctrl.summary.claim.created | dateTime: 'dd/MM/yyyy'}}">
+                value="{{$ctrl.summary.claim.created | date: 'dd/MM/yyyy'}}">
             </vn-label-value>
             <vn-label-value label="State" 
                 value="{{$ctrl.summary.claim.claimState.description}}">
@@ -66,7 +66,7 @@
                                     {{::saleClaimed.sale.itemFk | zeroFill:6}}
                                 </span>
                             </vn-td>
-                            <vn-td>{{::saleClaimed.sale.ticket.landed | dateTime: 'dd/MM/yyyy'}}</vn-td>
+                            <vn-td>{{::saleClaimed.sale.ticket.landed | date: 'dd/MM/yyyy'}}</vn-td>
                             <vn-td number>{{::saleClaimed.sale.quantity}}</vn-td>
                             <vn-td number>{{::saleClaimed.quantity}}</vn-td>
                             <vn-td expand>{{::saleClaimed.sale.concept}}</vn-td>
@@ -157,7 +157,7 @@
                                 </span>
                             </vn-td>
                             <vn-td expand>{{::action.claimBeggining.description}}</vn-td>
-                            <vn-td number>{{::action.sale.ticket.landed | dateTime: 'dd/MM/yyyy'}}</vn-td>
+                            <vn-td number>{{::action.sale.ticket.landed | date: 'dd/MM/yyyy'}}</vn-td>
                             <vn-td number>{{::action.sale.quantity}}</vn-td>
                             <vn-td expand>{{::action.sale.concept}}</vn-td>
                             <vn-td number>{{::action.sale.price}}</vn-td>
diff --git a/modules/client/front/balance/index/index.html b/modules/client/front/balance/index/index.html
index 88dfe1222..2ae2aa2aa 100644
--- a/modules/client/front/balance/index/index.html
+++ b/modules/client/front/balance/index/index.html
@@ -62,13 +62,13 @@
             <vn-tbody>
                 <vn-tr ng-repeat="balance in $ctrl.balances">
                     <vn-td>
-                        <span title="{{::balance.payed | dateTime:'dd/MM/yyyy'}}">
-                            {{::balance.payed | dateTime:'dd/MM/yyyy'}}
+                        <span title="{{::balance.payed | date:'dd/MM/yyyy'}}">
+                            {{::balance.payed | date:'dd/MM/yyyy'}}
                         </span>
                     </vn-td>
                     <vn-td>
-                        <span title="{{::balance.created | dateTime:'dd/MM/yyyy HH:mm'}}">
-                            {{::balance.created | dateTime:'dd/MM/yyyy HH:mm'}}
+                        <span title="{{::balance.created | date:'dd/MM/yyyy HH:mm'}}">
+                            {{::balance.created | date:'dd/MM/yyyy HH:mm'}}
                         </span>
                     </vn-td>
                     <vn-td>
diff --git a/modules/client/front/credit-insurance/index/index.html b/modules/client/front/credit-insurance/index/index.html
index 83e34d62e..192af4671 100644
--- a/modules/client/front/credit-insurance/index/index.html
+++ b/modules/client/front/credit-insurance/index/index.html
@@ -19,8 +19,8 @@
                     </vn-icon-button>
                 </vn-none>
                 <vn-one class="border-solid-right">
-                    <div><vn-label translate>Since</vn-label> {{::classification.started | dateTime:'dd/MM/yyyy'}}</div>
-                    <div><vn-label translate>To</vn-label> {{classification.finished | dateTime:'dd/MM/yyyy'}}</div>
+                    <div><vn-label translate>Since</vn-label> {{::classification.started | date:'dd/MM/yyyy'}}</div>
+                    <div><vn-label translate>To</vn-label> {{classification.finished | date:'dd/MM/yyyy'}}</div>
                 </vn-one>
                 <vn-vertical vn-one class="vn-px-md">
                     <vn-horizontal ng-repeat="insurance in classification.insurances track by insurance.id">
@@ -36,7 +36,7 @@
                         </vn-one>
                         <vn-one>
                             <vn-label-value label="Date" 
-                                value="{{::insurance.created | dateTime:'dd/MM/yyyy' }}">
+                                value="{{::insurance.created | date:'dd/MM/yyyy' }}">
                             </vn-label-value>
                         </vn-one>
                     </vn-horizontal>
diff --git a/modules/client/front/credit-insurance/insurance/index/index.html b/modules/client/front/credit-insurance/insurance/index/index.html
index ac2cdda48..06e963781 100644
--- a/modules/client/front/credit-insurance/insurance/index/index.html
+++ b/modules/client/front/credit-insurance/insurance/index/index.html
@@ -19,7 +19,7 @@
         </vn-thead>
         <vn-tbody>
             <vn-tr ng-repeat="insurance in insurances">
-                <vn-td>{{::insurance.created | dateTime: 'dd/MM/yyyy'}}</vn-td>
+                <vn-td>{{::insurance.created | date: 'dd/MM/yyyy'}}</vn-td>
                 <vn-td number>{{::insurance.grade}}</vn-td>
                 <vn-td number>{{::insurance.credit | currency: 'EUR': 2}}</vn-td>
             </vn-tr>
diff --git a/modules/client/front/credit/index/index.html b/modules/client/front/credit/index/index.html
index dd2a9a88c..d9cfe7dee 100644
--- a/modules/client/front/credit/index/index.html
+++ b/modules/client/front/credit/index/index.html
@@ -22,7 +22,7 @@
         </vn-thead>
         <vn-tbody>
             <vn-tr ng-repeat="credit in credits track by credit.id">
-                <vn-td>{{::credit.created | dateTime:'dd/MM/yyyy HH:mm'}}</vn-td>
+                <vn-td>{{::credit.created | date:'dd/MM/yyyy HH:mm'}}</vn-td>
                 <vn-td>{{::credit.worker.user.nickname}}</vn-td>
                 <vn-td number>{{::credit.amount | currency:'EUR':2}}</vn-td>
             </vn-tr>
diff --git a/modules/client/front/dms/index/index.html b/modules/client/front/dms/index/index.html
index 0c936234c..1f306dc88 100644
--- a/modules/client/front/dms/index/index.html
+++ b/modules/client/front/dms/index/index.html
@@ -70,7 +70,7 @@
                         {{::document.dms.worker.user.nickname | dashIfEmpty}}
                     </span></vn-td>
                 <vn-td>
-                    {{::document.dms.created | dateTime:'dd/MM/yyyy HH:mm'}}
+                    {{::document.dms.created | date:'dd/MM/yyyy HH:mm'}}
                 </vn-td>
                 <vn-td shrink>
                     <a target="_blank"
diff --git a/modules/client/front/greuge/index/index.html b/modules/client/front/greuge/index/index.html
index 5932a66a9..51f31338f 100644
--- a/modules/client/front/greuge/index/index.html
+++ b/modules/client/front/greuge/index/index.html
@@ -36,7 +36,7 @@
                 </vn-thead>
                 <vn-tbody>
                     <vn-tr ng-repeat="greuge in greuges">
-                        <vn-td>{{::greuge.shipped | dateTime:'dd/MM/yyyy HH:mm' }}</vn-td>
+                        <vn-td>{{::greuge.shipped | date:'dd/MM/yyyy HH:mm' }}</vn-td>
                         <vn-td>{{::greuge.description}}</vn-td>
                         <vn-td>{{::greuge.greugeType.name}}</vn-td>
                         <vn-td number>{{::greuge.amount | currency: 'EUR': 2}}</vn-td>
diff --git a/modules/client/front/mandate/index.html b/modules/client/front/mandate/index.html
index c5bfb058a..42d3d96bd 100644
--- a/modules/client/front/mandate/index.html
+++ b/modules/client/front/mandate/index.html
@@ -27,8 +27,8 @@
                 <vn-td number>{{::mandate.id}}</vn-td>
                 <vn-td>{{::mandate.company.code}}</vn-td>
                 <vn-td>{{::mandate.mandateType.name}}</vn-td>
-                <vn-td>{{::mandate.created | dateTime:'dd/MM/yyyy HH:mm' }}</vn-td>
-                <vn-td>{{::mandate.finished | dateTime:'dd/MM/yyyy HH:mm' || '-'}}</vn-td>
+                <vn-td>{{::mandate.created | date:'dd/MM/yyyy HH:mm' }}</vn-td>
+                <vn-td>{{::mandate.finished | date:'dd/MM/yyyy HH:mm' || '-'}}</vn-td>
             </vn-tr>
         </vn-tbody>
     </vn-table>
diff --git a/modules/client/front/note/index/index.html b/modules/client/front/note/index/index.html
index db9ba0818..04bd7d28e 100644
--- a/modules/client/front/note/index/index.html
+++ b/modules/client/front/note/index/index.html
@@ -15,7 +15,7 @@
             class="note vn-pa-sm border-solid border-radius vn-mb-md">
             <vn-horizontal class="vn-mb-sm" style="color: #666">
                 <vn-one>{{::note.worker.user.nickname}}</vn-one>
-                <vn-auto>{{::note.created | dateTime:'dd/MM/yyyy HH:mm'}}</vn-auto>
+                <vn-auto>{{::note.created | date:'dd/MM/yyyy HH:mm'}}</vn-auto>
             </vn-horizontal>   
             <vn-horizontal class="text">
                 {{::note.text}}
diff --git a/modules/client/front/recovery/index/index.html b/modules/client/front/recovery/index/index.html
index 9e4345025..755556f37 100644
--- a/modules/client/front/recovery/index/index.html
+++ b/modules/client/front/recovery/index/index.html
@@ -33,8 +33,8 @@
                         ng-click="$ctrl.setFinished(recovery)">
                     </vn-icon-button>
                 </vn-td>
-                <vn-td>{{::recovery.started | dateTime:'dd/MM/yyyy' }}</vn-td>
-                <vn-td>{{recovery.finished | dateTime:'dd/MM/yyyy' }}</vn-td>
+                <vn-td>{{::recovery.started | date:'dd/MM/yyyy' }}</vn-td>
+                <vn-td>{{recovery.finished | date:'dd/MM/yyyy' }}</vn-td>
                 <vn-td number>{{::recovery.amount | currency: 'EUR': 0}}</vn-td>
                 <vn-td number>{{::recovery.period}}</vn-td>
             </vn-tr>
diff --git a/modules/client/front/sample/index/index.html b/modules/client/front/sample/index/index.html
index 2d7f63ba7..49be184f3 100644
--- a/modules/client/front/sample/index/index.html
+++ b/modules/client/front/sample/index/index.html
@@ -23,7 +23,7 @@
             </vn-thead>
             <vn-tbody>
                 <vn-tr ng-repeat="sample in samples">
-                    <vn-td>{{::sample.created | dateTime:'dd/MM/yyyy HH:mm' }}</vn-td>
+                    <vn-td>{{::sample.created | date:'dd/MM/yyyy HH:mm' }}</vn-td>
                     <vn-td 
                         title="{{::sample.type.description}}">
                         {{::sample.type.description}}
diff --git a/modules/client/front/summary/index.html b/modules/client/front/summary/index.html
index 2fae69572..eccf45873 100644
--- a/modules/client/front/summary/index.html
+++ b/modules/client/front/summary/index.html
@@ -192,7 +192,7 @@
             </vn-label-value>
             <vn-vertical ng-if="$ctrl.summary.recovery.started">
                 <vn-label-value label="Recovery since" 
-                    value="{{$ctrl.summary.recovery.started | dateTime:'dd/MM/yyyy'}}">
+                    value="{{$ctrl.summary.recovery.started | date:'dd/MM/yyyy'}}">
             </vn-label-value>
         </vn-vertical>
         </vn-one>
diff --git a/modules/client/front/web-payment/index.html b/modules/client/front/web-payment/index.html
index 326945c21..7f6042759 100644
--- a/modules/client/front/web-payment/index.html
+++ b/modules/client/front/web-payment/index.html
@@ -36,7 +36,7 @@
                     </vn-icon>
                 </vn-td>
                 <vn-td number>{{::transaction.id}}</vn-td>
-                <vn-td>{{::transaction.created | dateTime:'dd/MM/yyyy HH:mm'}}</vn-td>
+                <vn-td>{{::transaction.created | date:'dd/MM/yyyy HH:mm'}}</vn-td>
                 <vn-td number>{{::transaction.amount | currency: 'EUR':2}}</vn-td>
                 <vn-td shrink>
                     <vn-icon-button
diff --git a/modules/invoiceOut/front/descriptor/index.html b/modules/invoiceOut/front/descriptor/index.html
index 3960c3925..f84b90d41 100644
--- a/modules/invoiceOut/front/descriptor/index.html
+++ b/modules/invoiceOut/front/descriptor/index.html
@@ -21,7 +21,7 @@
         <div class="attributes">
             <h5>{{$ctrl.invoiceOut.ref}}</h5>
             <vn-label-value label="Date" 
-                value="{{$ctrl.invoiceOut.issued | dateTime: 'dd/MM/yyyy'}}">
+                value="{{$ctrl.invoiceOut.issued | date: 'dd/MM/yyyy'}}">
             </vn-label-value>
             <vn-label-value label="Import" 
                 value="{{$ctrl.invoiceOut.amount | currency: 'EUR': 2}}">
diff --git a/modules/invoiceOut/front/index/index.html b/modules/invoiceOut/front/index/index.html
index e88a1986d..a847018b6 100644
--- a/modules/invoiceOut/front/index/index.html
+++ b/modules/invoiceOut/front/index/index.html
@@ -37,7 +37,7 @@
                     class="clickable vn-tr searchResult"
                     ui-sref="invoiceOut.card.summary({id: {{::invoiceOut.id}}})">
                     <vn-td>{{::invoiceOut.ref | dashIfEmpty}}</vn-td>
-                    <vn-td>{{::invoiceOut.issued | dateTime:'dd/MM/yyyy' | dashIfEmpty}}</vn-td>
+                    <vn-td>{{::invoiceOut.issued | date:'dd/MM/yyyy' | dashIfEmpty}}</vn-td>
                     <vn-td number>{{::invoiceOut.amount | currency: 'EUR': 2 | dashIfEmpty}}</vn-td>
                     <vn-td>
                         <span
@@ -46,9 +46,9 @@
                             {{::invoiceOut.clientSocialName | dashIfEmpty}}
                         </span>
                     </vn-td>
-                    <vn-td>{{::invoiceOut.created | dateTime:'dd/MM/yyyy' | dashIfEmpty}}</vn-td>
+                    <vn-td>{{::invoiceOut.created | date:'dd/MM/yyyy' | dashIfEmpty}}</vn-td>
                     <vn-td>{{::invoiceOut.companyCode | dashIfEmpty}}</vn-td>
-                    <vn-td>{{::invoiceOut.dued | dateTime:'dd/MM/yyyy' | dashIfEmpty}}</vn-td>
+                    <vn-td>{{::invoiceOut.dued | date:'dd/MM/yyyy' | dashIfEmpty}}</vn-td>
                     <vn-td>
                         <vn-icon-button
                             ng-show="invoiceOut.hasPdf"
diff --git a/modules/invoiceOut/front/summary/index.html b/modules/invoiceOut/front/summary/index.html
index 312ca1def..cdcc1d7ee 100644
--- a/modules/invoiceOut/front/summary/index.html
+++ b/modules/invoiceOut/front/summary/index.html
@@ -3,16 +3,16 @@
     <vn-horizontal>
         <vn-one>
             <vn-label-value label="Date" 
-                value="{{$ctrl.summary.invoiceOut.issued | dateTime: 'dd/MM/yyyy'}}">
+                value="{{$ctrl.summary.invoiceOut.issued | date: 'dd/MM/yyyy'}}">
             </vn-label-value>
             <vn-label-value label="Due" 
-                value="{{$ctrl.summary.invoiceOut.dued | dateTime: 'dd/MM/yyyy'}}">
+                value="{{$ctrl.summary.invoiceOut.dued | date: 'dd/MM/yyyy'}}">
             </vn-label-value>
             <vn-label-value label="Created" 
-                value="{{$ctrl.summary.invoiceOut.created | dateTime: 'dd/MM/yyyy'}}">
+                value="{{$ctrl.summary.invoiceOut.created | date: 'dd/MM/yyyy'}}">
             </vn-label-value>
             <vn-label-value label="Booked" 
-                value="{{$ctrl.summary.invoiceOut.booked | dateTime: 'dd/MM/yyyy'}}">
+                value="{{$ctrl.summary.invoiceOut.booked | date: 'dd/MM/yyyy'}}">
             </vn-label-value>
             <vn-label-value label="Company" 
                 value="{{$ctrl.summary.invoiceOut.company.code | dashIfEmpty}}">
@@ -66,7 +66,7 @@
                                 {{ticket.nickname}}
                             </span>
                        </vn-td>
-                        <vn-td>{{ticket.shipped | dateTime: 'dd/MM/yyyy'}}</vn-td>
+                        <vn-td>{{ticket.shipped | date: 'dd/MM/yyyy'}}</vn-td>
                         <vn-td number>{{ticket.total | currency: 'EUR': 2}}</vn-td>
                     </vn-tr>
                 </vn-tbody>
diff --git a/modules/item/front/diary/index.html b/modules/item/front/diary/index.html
index cf8de3236..29f074ee4 100644
--- a/modules/item/front/diary/index.html
+++ b/modules/item/front/diary/index.html
@@ -43,7 +43,7 @@
                     <vn-td expand>
                         <span class="chip" 
                             ng-class="::{warning: $ctrl.isToday(sale.date)}">
-                            {{::sale.date | dateTime:'dd/MM/yyyy' }}
+                            {{::sale.date | date:'dd/MM/yyyy' }}
                         </span>
                     </vn-td>
                     <vn-td number>
diff --git a/modules/item/front/last-entries/index.html b/modules/item/front/last-entries/index.html
index 78f10c3af..d0fff0222 100644
--- a/modules/item/front/last-entries/index.html
+++ b/modules/item/front/last-entries/index.html
@@ -44,7 +44,7 @@
                             </vn-check>
                         </vn-td>
                         <vn-td>{{entry.warehouse| dashIfEmpty}}</vn-td>
-                        <vn-td>{{entry.landed | dateTime:'dd/MM/yyyy HH:mm'}}</vn-td>
+                        <vn-td>{{entry.landed | date:'dd/MM/yyyy HH:mm'}}</vn-td>
                         <vn-td number>{{entry.entryFk | dashIfEmpty}}</vn-td>
                         <vn-td number>{{entry.price2 | dashIfEmpty}}</vn-td>
                         <vn-td number>{{entry.price3 | dashIfEmpty}}</vn-td>
diff --git a/modules/item/front/request/index.html b/modules/item/front/request/index.html
index 20af5653a..de2750014 100644
--- a/modules/item/front/request/index.html
+++ b/modules/item/front/request/index.html
@@ -8,7 +8,7 @@
 </vn-crud-model>
 <form name="form">
     <div class="vn-ma-md">
-        <vn-card class="vn-px-md vn-list">
+        <vn-card class="vn-pa-md vn-list">
             <vn-horizontal>
                 <vn-searchbar 
                     auto-load="false"
@@ -47,9 +47,9 @@
                             </span>
                         </vn-td>
                         <vn-td>
-                            <span title="{{::request.shipped | dateTime: 'dd/MM/yyyy'}}"
+                            <span title="{{::request.shipped | date: 'dd/MM/yyyy'}}"
                                 class="chip {{$ctrl.compareDate(request.shipped)}}">
-                                {{::request.shipped | dateTime: 'dd/MM/yyyy'}}
+                                {{::request.shipped | date: 'dd/MM/yyyy'}}
                             </span>
                         </vn-td>
                         <vn-td>{{::request.warehouse}}</vn-td>
diff --git a/modules/order/front/descriptor/index.html b/modules/order/front/descriptor/index.html
index cf2a52e1a..fd83d5c71 100644
--- a/modules/order/front/descriptor/index.html
+++ b/modules/order/front/descriptor/index.html
@@ -31,7 +31,7 @@
                 value="{{$ctrl.order.client.salesPerson.user.nickname}}">
             </vn-label-value>
             <vn-label-value label="Landed" 
-                value="{{$ctrl.order.landed | dateTime: 'dd/MM/yyyy' }}">
+                value="{{$ctrl.order.landed | date: 'dd/MM/yyyy' }}">
             </vn-label-value>
             <vn-label-value label="Agency" 
                 value="{{$ctrl.order.agencyMode.name}}">
diff --git a/modules/order/front/index/index.html b/modules/order/front/index/index.html
index 750130a7f..c6a817742 100644
--- a/modules/order/front/index/index.html
+++ b/modules/order/front/index/index.html
@@ -55,7 +55,7 @@
                         </vn-check>
                     </vn-td>
                     <vn-td>{{::order.sourceApp}}</vn-td>
-                    <vn-td center>{{::order.created | dateTime: 'dd/MM/yyyy HH:mm'}}</vn-td>
+                    <vn-td center>{{::order.created | date: 'dd/MM/yyyy HH:mm'}}</vn-td>
                     <vn-td center>{{::order.landed | date:'dd/MM/yyyy'}}</vn-td>
                     <vn-td>{{::order.companyCode}}</vn-td>
                     <vn-td number>{{::order.total | currency: 'EUR': 2 | dashIfEmpty}}</vn-td>
diff --git a/modules/order/front/line/index.html b/modules/order/front/line/index.html
index cbf492dbf..cdff9b35c 100644
--- a/modules/order/front/line/index.html
+++ b/modules/order/front/line/index.html
@@ -48,7 +48,7 @@
                             </vn-fetched-tags>
                         </vn-td>
                         <vn-td>{{::row.warehouse.name}}</vn-td>
-                        <vn-td>{{::row.shipped | dateTime: 'dd/MM/yyyy'}}</vn-td>
+                        <vn-td>{{::row.shipped | date: 'dd/MM/yyyy'}}</vn-td>
                         <vn-td number>{{::row.quantity}}</vn-td>
                         <vn-td number>
                             {{::row.price | currency: 'EUR':2}}
diff --git a/modules/order/front/summary/index.html b/modules/order/front/summary/index.html
index 939a43244..c7ee5b4b6 100644
--- a/modules/order/front/summary/index.html
+++ b/modules/order/front/summary/index.html
@@ -14,10 +14,10 @@
         </vn-one>
         <vn-one>
             <vn-label-value label="Created" 
-                value="{{$ctrl.summary.created | dateTime: 'dd/MM/yyyy HH:mm'}}">
+                value="{{$ctrl.summary.created | date: 'dd/MM/yyyy HH:mm'}}">
             </vn-label-value>
             <vn-label-value label="Confirmed" 
-                value="{{$ctrl.summary.confirmed | dateTime: 'dd/MM/yyyy HH:mm'}}">
+                value="{{$ctrl.summary.confirmed | date: 'dd/MM/yyyy HH:mm'}}">
             </vn-label-value>
             <vn-label-value label="Address" 
                 value="{{$ctrl.formattedAddress}}">
diff --git a/modules/route/front/descriptor/index.html b/modules/route/front/descriptor/index.html
index 8ab44e9bf..312985cb4 100644
--- a/modules/route/front/descriptor/index.html
+++ b/modules/route/front/descriptor/index.html
@@ -24,7 +24,7 @@
                 value="{{$ctrl.route.id}}">
             </vn-label-value>
             <vn-label-value label="Date" 
-                value="{{$ctrl.route.created | dateTime: 'dd/MM/yyyy'}}">
+                value="{{$ctrl.route.created | date: 'dd/MM/yyyy'}}">
             </vn-label-value>
             <vn-label-value label="Agency" 
                 value="{{$ctrl.route.agencyMode.name}}">
diff --git a/modules/route/front/index/index.html b/modules/route/front/index/index.html
index e3ef4d98f..0f13c9021 100644
--- a/modules/route/front/index/index.html
+++ b/modules/route/front/index/index.html
@@ -47,7 +47,7 @@
                     </vn-td>
                     <vn-td>{{::route.agencyName | dashIfEmpty}}</vn-td>
                     <vn-td>{{::route.vehiclePlateNumber | dashIfEmpty}}</vn-td>
-                    <vn-td>{{::route.created | dateTime:'dd/MM/yyyy' | dashIfEmpty}}</vn-td>
+                    <vn-td>{{::route.created | date:'dd/MM/yyyy' | dashIfEmpty}}</vn-td>
                     <vn-td number>{{::route.m3 | dashIfEmpty}}</vn-td>
                     <vn-td>{{::route.description | dashIfEmpty}}</vn-td>
                     <vn-td>
diff --git a/modules/route/front/summary/index.html b/modules/route/front/summary/index.html
index 85a045106..0ec6c47fe 100644
--- a/modules/route/front/summary/index.html
+++ b/modules/route/front/summary/index.html
@@ -6,7 +6,7 @@
                 value="{{$ctrl.summary.route.id}}">
             </vn-label-value>
             <vn-label-value label="Date" 
-                value="{{$ctrl.summary.route.created | dateTime: 'dd/MM/yyyy'}}">
+                value="{{$ctrl.summary.route.created | date: 'dd/MM/yyyy'}}">
             </vn-label-value>
             <vn-label-value label="Agency" 
                 value="{{$ctrl.summary.route.agencyMode.name}}">
@@ -23,10 +23,10 @@
         </vn-one>
         <vn-one>
             <vn-label-value label="Starting time"
-                value="{{$ctrl.summary.route.time | dateTime: 'HH:MM'}}">
+                value="{{$ctrl.summary.route.time | date: 'HH:MM'}}">
             </vn-label-value>
             <vn-label-value label="Finishing time"
-                value="{{$ctrl.summary.route.finished | dateTime: 'HH:MM'}}">
+                value="{{$ctrl.summary.route.finished | date: 'HH:MM'}}">
             </vn-label-value>
             <vn-label-value label="Km Start" 
                 value="{{$ctrl.summary.route.kmStart}}">
diff --git a/modules/ticket/front/basic-data/step-one/index.html b/modules/ticket/front/basic-data/step-one/index.html
index 95cbcccf6..cd3ef442e 100644
--- a/modules/ticket/front/basic-data/step-one/index.html
+++ b/modules/ticket/front/basic-data/step-one/index.html
@@ -86,7 +86,7 @@
                 ng-model="$ctrl.zoneId"
                 vn-acl="productionBoss">
                 <tpl-item>
-                    <span>{{::name}} - {{::warehouse.name}} - Max. {{::hour | dateTime: 'HH:mm'}} h.</span>
+                    <span>{{::name}} - {{::warehouse.name}} - Max. {{::hour | date: 'HH:mm'}} h.</span>
                 </tpl-item>
             </vn-autocomplete>
         </vn-horizontal>
diff --git a/modules/ticket/front/descriptor/addStowaway.html b/modules/ticket/front/descriptor/addStowaway.html
index 963c9b6c1..e46292714 100644
--- a/modules/ticket/front/descriptor/addStowaway.html
+++ b/modules/ticket/front/descriptor/addStowaway.html
@@ -25,7 +25,7 @@
                     <vn-tbody>
                         <vn-tr ng-repeat="ticket in possibleStowaways" class="clickable" ng-click="$ctrl.addStowaway(ticket)">
                             <vn-td number>{{ticket.id}}</vn-td>
-                            <vn-td>{{ticket.landed | dateTime: 'dd/MM/yyyy'}}</vn-td>
+                            <vn-td>{{ticket.landed | date: 'dd/MM/yyyy'}}</vn-td>
                             <vn-td>{{ticket.agencyMode.name}}</vn-td>
                             <vn-td>{{ticket.warehouse.name}}</vn-td>
                             <vn-td>{{ticket.state.state.name}}</vn-td>
diff --git a/modules/ticket/front/descriptor/index.html b/modules/ticket/front/descriptor/index.html
index faa2acf5b..9b981f27a 100644
--- a/modules/ticket/front/descriptor/index.html
+++ b/modules/ticket/front/descriptor/index.html
@@ -33,7 +33,7 @@
                 value="{{$ctrl.ticket.client.salesPerson.user.nickname}}">
             </vn-label-value>
             <vn-label-value label="Shipped"
-                value="{{$ctrl.ticket.shipped | dateTime: 'dd/MM/yyyy HH:mm' }}">
+                value="{{$ctrl.ticket.shipped | date: 'dd/MM/yyyy HH:mm' }}">
             </vn-label-value>
             <vn-label-value label="Agency"
                 value="{{$ctrl.ticket.agencyMode.name}}">
diff --git a/modules/ticket/front/descriptor/removeStowaway.html b/modules/ticket/front/descriptor/removeStowaway.html
index 78ac5cf3f..e517206b3 100644
--- a/modules/ticket/front/descriptor/removeStowaway.html
+++ b/modules/ticket/front/descriptor/removeStowaway.html
@@ -19,7 +19,7 @@
                 <vn-tbody>
                     <vn-tr ng-repeat="stowaway in $ctrl.ticketStowaways" class="clickable" ng-click="$ctrl.showDeleteConfirm($index)">
                         <vn-td number>{{stowaway.id}}</vn-td>
-                        <vn-td number>{{stowaway.ticket.landed | dateTime: 'dd/MM/yyyy'}}</vn-td>
+                        <vn-td number>{{stowaway.ticket.landed | date: 'dd/MM/yyyy'}}</vn-td>
                         <vn-td number>{{stowaway.ticket.agencyMode.name}}</vn-td>
                         <vn-td number>{{stowaway.ticket.warehouse.name}}</vn-td>
                         <vn-td number>{{stowaway.ticket.state.state.name}}</vn-td>
diff --git a/modules/ticket/front/dms/index/index.html b/modules/ticket/front/dms/index/index.html
index 73607f246..1cc6d3b38 100644
--- a/modules/ticket/front/dms/index/index.html
+++ b/modules/ticket/front/dms/index/index.html
@@ -69,7 +69,7 @@
                         {{::document.dms.worker.user.nickname | dashIfEmpty}}
                     </span></vn-td>
                 <vn-td>
-                    {{::document.dms.created | dateTime:'dd/MM/yyyy HH:mm'}}
+                    {{::document.dms.created | date:'dd/MM/yyyy HH:mm'}}
                 </vn-td>
                 <vn-td shrink>
                     <a target="_blank"
diff --git a/modules/ticket/front/expedition/index.html b/modules/ticket/front/expedition/index.html
index 4342b2aec..569539917 100644
--- a/modules/ticket/front/expedition/index.html
+++ b/modules/ticket/front/expedition/index.html
@@ -52,7 +52,7 @@
                         {{::expedition.userNickname | dashIfEmpty}}
                     </span>
                 </vn-td>
-                <vn-td>{{::expedition.created | dateTime:'dd/MM/yyyy HH:mm'}}</vn-td>
+                <vn-td>{{::expedition.created | date:'dd/MM/yyyy HH:mm'}}</vn-td>
             </vn-tr>
         </vn-tbody>
     </vn-table>
diff --git a/modules/ticket/front/index/index.html b/modules/ticket/front/index/index.html
index 20eaf254a..e6c27f988 100644
--- a/modules/ticket/front/index/index.html
+++ b/modules/ticket/front/index/index.html
@@ -101,10 +101,10 @@
                     </vn-td>
                     <vn-td>
                         <span class="chip {{$ctrl.compareDate(ticket.shipped)}}">
-                            {{::ticket.shipped | dateTime: 'dd/MM/yyyy'}}
+                            {{::ticket.shipped | date: 'dd/MM/yyyy'}}
                         </span>
                     </vn-td>
-                    <vn-td>{{::ticket.shipped | dateTime: 'HH:mm'}}</vn-td>
+                    <vn-td>{{::ticket.shipped | date: 'HH:mm'}}</vn-td>
                     <vn-td expand>
                         <span 
                             class="link" 
@@ -121,7 +121,7 @@
                     <vn-td>{{::ticket.agencyMode}}</vn-td>
                     <vn-td>{{::ticket.warehouse}}</vn-td>
                     <vn-td class="expendable">{{::ticket.refFk | dashIfEmpty}}</vn-td>
-                    <vn-td shrink>{{::ticket.zoneLanding | dateTime: 'HH:mm'}}</vn-td>
+                    <vn-td shrink>{{::ticket.zoneLanding | date: 'HH:mm'}}</vn-td>
                     <vn-td number>
                         <span class="chip {{$ctrl.totalPriceColor(ticket)}}">
                             {{::ticket.total | currency: 'EUR': 2}}
diff --git a/modules/ticket/front/request/index/index.html b/modules/ticket/front/request/index/index.html
index 2e5d60f3d..28dd28dc0 100644
--- a/modules/ticket/front/request/index/index.html
+++ b/modules/ticket/front/request/index/index.html
@@ -32,7 +32,7 @@
             <vn-tr ng-repeat="request in purchaseRequests">
                 <vn-td number>{{::request.id}}</vn-td>
                 <vn-td expand>{{::request.description}}</vn-td>
-                <vn-td number>{{::request.created | dateTime: 'dd/MM/yyyy'}}</vn-td>
+                <vn-td number>{{::request.created | date: 'dd/MM/yyyy'}}</vn-td>
                 <vn-td expand>
                     <span 
                         class="link" 
diff --git a/modules/ticket/front/sale-tracking/index.html b/modules/ticket/front/sale-tracking/index.html
index f1ab0500d..950e6d7ef 100644
--- a/modules/ticket/front/sale-tracking/index.html
+++ b/modules/ticket/front/sale-tracking/index.html
@@ -57,7 +57,7 @@
                     </span>
                 </vn-td>
                 <vn-td>{{::sale.state}}</vn-td>
-                <vn-td>{{::sale.created | dateTime: 'dd/MM/yyyy HH:mm'}}</vn-td>
+                <vn-td>{{::sale.created | date: 'dd/MM/yyyy HH:mm'}}</vn-td>
             </vn-tr>
         </vn-tbody>
     </vn-table>
diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html
index 3061938a7..38ed007a0 100644
--- a/modules/ticket/front/sale/index.html
+++ b/modules/ticket/front/sale/index.html
@@ -320,7 +320,7 @@
                         ng-repeat="ticket in $ctrl.transfer.lastActiveTickets track by ticket.id"
                         ng-click="$ctrl.transferSales(ticket.id)">
                         <td number>{{::ticket.id}}</td>
-                        <td number>{{::ticket.shipped | dateTime: 'dd/MM/yyyy'}}</td>
+                        <td number>{{::ticket.shipped | date: 'dd/MM/yyyy'}}</td>
                         <td number>{{::ticket.agencyName}}</td>
                         <td number>{{::ticket.warehouseName}}</td>
                     </tr>
diff --git a/modules/ticket/front/summary/index.html b/modules/ticket/front/summary/index.html
index 89cf97ca9..83cdd8e40 100644
--- a/modules/ticket/front/summary/index.html
+++ b/modules/ticket/front/summary/index.html
@@ -36,10 +36,10 @@
         </vn-one>
         <vn-one>
             <vn-label-value label="Shipped" 
-                value="{{$ctrl.summary.shipped | dateTime: 'dd/MM/yyyy HH:mm'}}">
+                value="{{$ctrl.summary.shipped | date: 'dd/MM/yyyy HH:mm'}}">
             </vn-label-value>
             <vn-label-value label="Landed" 
-                value="{{$ctrl.summary.landed | dateTime: 'dd/MM/yyyy'}}">
+                value="{{$ctrl.summary.landed | date: 'dd/MM/yyyy'}}">
             </vn-label-value>
             <vn-label-value label="Route" 
                 value="{{$ctrl.summary.routeFk}}"
@@ -132,7 +132,7 @@
                 </vn-thead>
                 <vn-tbody>
                     <vn-tr ng-repeat="package in $ctrl.summary.packagings">
-                        <vn-td number>{{package.created | dateTime: 'dd/MM/yyyy'}}</vn-td>
+                        <vn-td number>{{package.created | date: 'dd/MM/yyyy'}}</vn-td>
                         <vn-td number>{{package.packaging.item.name}}</vn-td>
                         <vn-td number>{{package.quantity}}</vn-td>
                     </vn-tr>
@@ -180,7 +180,7 @@
                 <vn-tbody>
                     <vn-tr ng-repeat="request in $ctrl.summary.requests">
                         <vn-td expand>{{::request.description}}</vn-td>
-                        <vn-td number>{{::request.created | dateTime: 'dd/MM/yyyy'}}</vn-td>
+                        <vn-td number>{{::request.created | date: 'dd/MM/yyyy'}}</vn-td>
                         <vn-td>{{::request.requester.user.name}}</vn-td>
                         <vn-td>{{::request.atender.user.name}}</vn-td>
                         <vn-td number>{{::request.quantity}}</vn-td>
diff --git a/modules/ticket/front/tracking/index/index.html b/modules/ticket/front/tracking/index/index.html
index f919a636b..a5120a064 100644
--- a/modules/ticket/front/tracking/index/index.html
+++ b/modules/ticket/front/tracking/index/index.html
@@ -28,7 +28,7 @@
                         {{::tracking.worker.user.nickname | dashIfEmpty}}
                     </span>
                 </vn-td>
-                <vn-td>{{::tracking.created | dateTime:'dd/MM/yyyy HH:mm'}}</vn-td>
+                <vn-td>{{::tracking.created | date:'dd/MM/yyyy HH:mm'}}</vn-td>
             </vn-tr>
         </vn-tbody>
     </vn-table>
diff --git a/modules/ticket/front/weekly/index/index.html b/modules/ticket/front/weekly/index/index.html
index 3a251e37a..e25d115ba 100644
--- a/modules/ticket/front/weekly/index/index.html
+++ b/modules/ticket/front/weekly/index/index.html
@@ -9,7 +9,7 @@
     auto-load="true">
 </vn-crud-model>
 <div class="content-block">
-    <vn-card class="vn-px-md vn-w-sm">
+    <vn-card class="vn-pa-md vn-w-sm">
         <vn-searchbar
             vn-id="turnSearchbar"
             style="width: 100%"
diff --git a/modules/travel/front/index/index.html b/modules/travel/front/index/index.html
index 5f7a08fd4..637e9ac05 100644
--- a/modules/travel/front/index/index.html
+++ b/modules/travel/front/index/index.html
@@ -40,10 +40,10 @@
                     <vn-td expand>{{::travel.ref}}</vn-td>
                     <vn-td expand>{{::travel.agency.name}}</vn-td>
                     <vn-td center>{{::travel.warehouseOut.name}}</vn-td>
-                    <vn-td center>{{::travel.shipped | dateTime:'dd/MM/yyyy'}}</vn-td>
+                    <vn-td center>{{::travel.shipped | date:'dd/MM/yyyy'}}</vn-td>
                     <vn-td><vn-check ng-model="travel.isDelivered" disabled="true"></vn-check></vn-td>
                     <vn-td>{{::travel.warehouseIn.name}}</vn-td>
-                    <vn-td center>{{::travel.landed | dateTime:'dd/MM/yyyy'}}</vn-td>
+                    <vn-td center>{{::travel.landed | date:'dd/MM/yyyy'}}</vn-td>
                     <vn-td center><vn-check ng-model="travel.isReceived" disabled="true"></vn-check></vn-td>
                     <vn-td></vn-td>
                 </vn-tr>
diff --git a/modules/worker/back/methods/worker-time-control/addTime.js b/modules/worker/back/methods/worker-time-control/addTime.js
index 516519359..8130a16fd 100644
--- a/modules/worker/back/methods/worker-time-control/addTime.js
+++ b/modules/worker/back/methods/worker-time-control/addTime.js
@@ -34,9 +34,6 @@ module.exports = Self => {
         const subordinate = await Worker.findById(data.workerFk);
         const timed = new Date(data.timed);
 
-        let offset = timed.getTimezoneOffset() * 60000;
-        timed.setTime(timed.getTime() - offset);
-
         return Self.rawSql('CALL vn.workerTimeControl_add(?, ?, ?, ?)', [
             subordinate.userFk, null, timed, true]);
     };
diff --git a/modules/worker/front/log/index.html b/modules/worker/front/log/index.html
index 91166f045..674e5a200 100644
--- a/modules/worker/front/log/index.html
+++ b/modules/worker/front/log/index.html
@@ -26,7 +26,7 @@
             <vn-tbody>
                 <vn-tr ng-repeat="log in $ctrl.logs"> 
                     <vn-td>
-                        {{::log.creationDate | dateTime:'dd/MM/yyyy HH:mm'}}
+                        {{::log.creationDate | date:'dd/MM/yyyy HH:mm'}}
                         <div class="changes">
                             <div>
                                 <span translate class="label">Changed by</span><span class="label">: </span>
diff --git a/modules/worker/front/time-control/index.html b/modules/worker/front/time-control/index.html
index a00ebab45..7eaed4ec5 100644
--- a/modules/worker/front/time-control/index.html
+++ b/modules/worker/front/time-control/index.html
@@ -27,7 +27,7 @@
                                     icon="arrow_{{($index % 2) == 0 ? 'forward' : 'back'}}"
                                     title="{{(($index % 2) == 0 ? 'In' : 'Out') | translate}}">
                                 </vn-icon>
-                                <span class="chip {{$ctrl.hourColor(hour)}}">{{hour.timed | dateTime: 'HH:mm'}}</span>
+                                <span class="chip {{$ctrl.hourColor(hour)}}">{{hour.timed | date: 'HH:mm'}}</span>
                             </section>
                         </vn-td>
                     </vn-tr>

From 55f3390f85a331a0aec12c250cdcee760a6bf1a8 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Mon, 21 Oct 2019 07:08:47 +0200
Subject: [PATCH 30/41] added validation for confirmed purcharse requests

---
 modules/ticket/back/methods/ticket/isEmpty.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/ticket/back/methods/ticket/isEmpty.js b/modules/ticket/back/methods/ticket/isEmpty.js
index 7f9de98b1..0465589e6 100644
--- a/modules/ticket/back/methods/ticket/isEmpty.js
+++ b/modules/ticket/back/methods/ticket/isEmpty.js
@@ -40,7 +40,8 @@ module.exports = function(Self) {
         }, options);
 
         const hasPurchaseRequests = await models.TicketRequest.count({
-            ticketFk: id
+            ticketFk: id,
+            isOk: true
         }, options);
 
         const isEmpty = !hasSales && !hasPackages &&

From e2a7c09e4a944991e5ecb5b814f9d127adfe5604 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Mon, 21 Oct 2019 08:31:14 +0200
Subject: [PATCH 31/41] Uploadfile parameters are now required + fixed date
 filters

---
 back/methods/dms/uploadFile.js                | 18 ++++++----
 .../back/methods/claim/regularizeClaim.js     | 11 +++---
 .../claim/back/methods/claim/uploadFile.js    | 34 +++++++++----------
 .../client/back/methods/client/uploadFile.js  | 34 +++++++++----------
 modules/item/back/methods/item/regularize.js  | 11 +++---
 .../ticket/back/methods/ticket/uploadFile.js  | 34 +++++++++----------
 6 files changed, 74 insertions(+), 68 deletions(-)

diff --git a/back/methods/dms/uploadFile.js b/back/methods/dms/uploadFile.js
index 41d551f2b..e077eea30 100644
--- a/back/methods/dms/uploadFile.js
+++ b/back/methods/dms/uploadFile.js
@@ -9,25 +9,31 @@ module.exports = Self => {
             {
                 arg: 'warehouseId',
                 type: 'Number',
-                description: 'The warehouse id'
+                description: 'The warehouse id',
+                required: true
             }, {
                 arg: 'companyId',
                 type: 'Number',
-                description: 'The company id'
+                description: 'The company id',
+                required: true
             }, {
                 arg: 'dmsTypeId',
                 type: 'Number',
-                description: 'The dms type id'
+                description: 'The dms type id',
+                required: true
             }, {
                 arg: 'reference',
-                type: 'String'
+                type: 'String',
+                required: true
             }, {
                 arg: 'description',
-                type: 'String'
+                type: 'String',
+                required: true
             }, {
                 arg: 'hasFile',
                 type: 'Boolean',
-                description: 'True if has an attached file'
+                description: 'True if has an attached file',
+                required: true
             }],
         returns: {
             type: 'Object',
diff --git a/modules/claim/back/methods/claim/regularizeClaim.js b/modules/claim/back/methods/claim/regularizeClaim.js
index a2896174e..136016b1e 100644
--- a/modules/claim/back/methods/claim/regularizeClaim.js
+++ b/modules/claim/back/methods/claim/regularizeClaim.js
@@ -120,16 +120,19 @@ module.exports = Self => {
     }
 
     async function getTicketId(params, options) {
-        const currentDate = new Date();
-        currentDate.setHours(null, null, null);
+        const minDate = new Date();
+        minDate.setHours(0, 0, 0, 0);
+
+        const maxDate = new Date();
+        maxDate.setHours(23, 59, 59, 59);
 
         let ticket = await Self.app.models.Ticket.findOne({
             where: {
                 addressFk: params.addressFk,
                 companyFk: params.companyFk,
                 warehouseFk: params.warehouseFk,
-                shipped: currentDate,
-                landed: currentDate
+                shipped: {between: [minDate, maxDate]},
+                landed: {between: [minDate, maxDate]}
             }
         }, options);
 
diff --git a/modules/claim/back/methods/claim/uploadFile.js b/modules/claim/back/methods/claim/uploadFile.js
index f6dad3477..c7565701d 100644
--- a/modules/claim/back/methods/claim/uploadFile.js
+++ b/modules/claim/back/methods/claim/uploadFile.js
@@ -7,36 +7,34 @@ module.exports = Self => {
             type: 'Number',
             description: 'The claim id',
             http: {source: 'path'}
-        },
-        {
+        }, {
             arg: 'warehouseId',
             type: 'Number',
-            description: ''
-        },
-        {
+            description: 'The warehouse id',
+            required: true
+        }, {
             arg: 'companyId',
             type: 'Number',
-            description: ''
-        },
-        {
+            description: 'The company id',
+            required: true
+        }, {
             arg: 'dmsTypeId',
             type: 'Number',
-            description: ''
-        },
-        {
+            description: 'The dms type id',
+            required: true
+        }, {
             arg: 'reference',
             type: 'String',
-            description: ''
-        },
-        {
+            required: true
+        }, {
             arg: 'description',
             type: 'String',
-            description: ''
-        },
-        {
+            required: true
+        }, {
             arg: 'hasFile',
             type: 'Boolean',
-            description: ''
+            description: 'True if has an attached file',
+            required: true
         }],
         returns: {
             type: 'Object',
diff --git a/modules/client/back/methods/client/uploadFile.js b/modules/client/back/methods/client/uploadFile.js
index 6b7a49459..6ec96e301 100644
--- a/modules/client/back/methods/client/uploadFile.js
+++ b/modules/client/back/methods/client/uploadFile.js
@@ -7,36 +7,34 @@ module.exports = Self => {
             type: 'Number',
             description: 'The client id',
             http: {source: 'path'}
-        },
-        {
+        }, {
             arg: 'warehouseId',
             type: 'Number',
-            description: ''
-        },
-        {
+            description: 'The warehouse id',
+            required: true
+        }, {
             arg: 'companyId',
             type: 'Number',
-            description: ''
-        },
-        {
+            description: 'The company id',
+            required: true
+        }, {
             arg: 'dmsTypeId',
             type: 'Number',
-            description: ''
-        },
-        {
+            description: 'The dms type id',
+            required: true
+        }, {
             arg: 'reference',
             type: 'String',
-            description: ''
-        },
-        {
+            required: true
+        }, {
             arg: 'description',
             type: 'String',
-            description: ''
-        },
-        {
+            required: true
+        }, {
             arg: 'hasFile',
             type: 'Boolean',
-            description: ''
+            description: 'True if has an attached file',
+            required: true
         }],
         returns: {
             type: 'Object',
diff --git a/modules/item/back/methods/item/regularize.js b/modules/item/back/methods/item/regularize.js
index 17f1dbe1e..b9aa0d85f 100644
--- a/modules/item/back/methods/item/regularize.js
+++ b/modules/item/back/methods/item/regularize.js
@@ -105,15 +105,18 @@ module.exports = Self => {
 
 
         async function getTicketId(params, options) {
-            const currentDate = new Date();
-            currentDate.setHours(null, null, null);
+            const minDate = new Date();
+            minDate.setHours(0, 0, 0, 0);
+
+            const maxDate = new Date();
+            maxDate.setHours(23, 59, 59, 59);
 
             let ticket = await Self.app.models.Ticket.findOne({
                 where: {
                     addressFk: params.addressFk,
                     warehouseFk: params.warehouseFk,
-                    shipped: currentDate,
-                    landed: currentDate
+                    shipped: {between: [minDate, maxDate]},
+                    landed: {between: [minDate, maxDate]}
                 }
             }, options);
 
diff --git a/modules/ticket/back/methods/ticket/uploadFile.js b/modules/ticket/back/methods/ticket/uploadFile.js
index 7c968f5c9..e5ea465cb 100644
--- a/modules/ticket/back/methods/ticket/uploadFile.js
+++ b/modules/ticket/back/methods/ticket/uploadFile.js
@@ -7,36 +7,34 @@ module.exports = Self => {
             type: 'Number',
             description: 'The ticket id',
             http: {source: 'path'}
-        },
-        {
+        }, {
             arg: 'warehouseId',
             type: 'Number',
-            description: ''
-        },
-        {
+            description: 'The warehouse id',
+            required: true
+        }, {
             arg: 'companyId',
             type: 'Number',
-            description: ''
-        },
-        {
+            description: 'The company id',
+            required: true
+        }, {
             arg: 'dmsTypeId',
             type: 'Number',
-            description: ''
-        },
-        {
+            description: 'The dms type id',
+            required: true
+        }, {
             arg: 'reference',
             type: 'String',
-            description: ''
-        },
-        {
+            required: true
+        }, {
             arg: 'description',
             type: 'String',
-            description: ''
-        },
-        {
+            required: true
+        }, {
             arg: 'hasFile',
             type: 'Boolean',
-            description: ''
+            description: 'True if has an attached file',
+            required: true
         }],
         returns: {
             type: 'Object',

From 6adeb689ebc1960b144d0be0cb3c5453afadeead Mon Sep 17 00:00:00 2001
From: Bernat <bernat.verdnatura@gmail.com>
Date: Mon, 21 Oct 2019 08:52:42 +0200
Subject: [PATCH 32/41] Tarea #1814 refactor fixtures userPhone

---
 db/dump/fixtures.sql                      | 103 +++++++++++++---------
 modules/worker/front/phones/index.spec.js |  26 ++++++
 2 files changed, 88 insertions(+), 41 deletions(-)
 create mode 100644 modules/worker/front/phones/index.spec.js

diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index 7d2da8658..2d3353f15 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -1864,44 +1864,65 @@ INSERT INTO `vn`.`queuePriority`(`id`, `priority`)
         (2, 'Normal'),
         (3, 'Baja');
 
--- Fixtures para userPhone, #1814
-
-insert into vn.userPhone(userFk,typeFk,phone)
-	select id,'personalPhone', phone
-		from vn.client
-        where phone is not null;
-        
-insert into vn.userPhone(userFk,typeFk,phone)
-	select id,'businessPhone', phone
-		from vn.worker
-        where phone is not null AND phone > '';
-
-insert into vn.userPhone(userFk,typeFk,phone)
-    SELECT 
-        `w`.`userFk`,
-        'businessPhone',
-        `m`.`value` AS `mediaValue`
-    FROM
-        (((((`postgresql`.`person` `p`
-        JOIN `postgresql`.`profile` `po` ON ((`po`.`person_id` = `p`.`person_id`)))
-        JOIN `postgresql`.`profile_media` `pom` ON ((`pom`.`profile_id` = `po`.`profile_id`)))
-        JOIN `postgresql`.`media` `m` ON ((`m`.`media_id` = `pom`.`media_id`)))
-        JOIN `postgresql`.`media_type` `mt` ON ((`mt`.`media_type_id` = `m`.`media_type_id`)))
-        JOIN `vn`.`worker` `w` ON ((`w`.`id` = `p`.`id_trabajador`)))
-            WHERE
-        (`mt`.`name` = 'movil empresa');
-
-insert into vn.userPhone(userFk,typeFk,phone)
-    SELECT 
-        `w`.`userFk`,
-        'personalPhone',
-        `m`.`value` AS `mediaValue`
-    FROM
-        (((((`postgresql`.`person` `p`
-        JOIN `postgresql`.`profile` `po` ON ((`po`.`person_id` = `p`.`person_id`)))
-        JOIN `postgresql`.`profile_media` `pom` ON ((`pom`.`profile_id` = `po`.`profile_id`)))
-        JOIN `postgresql`.`media` `m` ON ((`m`.`media_id` = `pom`.`media_id`)))
-        JOIN `postgresql`.`media_type` `mt` ON ((`mt`.`media_type_id` = `m`.`media_type_id`)))
-        JOIN `vn`.`worker` `w` ON ((`w`.`id` = `p`.`id_trabajador`)))
-            WHERE
-        (`mt`.`name` = 'movil personal');
\ No newline at end of file
+INSERT INTO `vn`.`userPhone`(`id`, `userFk`, `typeFk`, `phone`)
+    VALUES
+        (1,     101,    'personalPhone', 1111111111),
+        (2,     102,    'personalPhone', 1111111111),
+        (3,     103,    'personalPhone', 1111111111),
+        (4,     104,    'personalPhone', 1111111111),
+        (5,     105,    'personalPhone', 1111111111),
+        (6,     106,    'personalPhone', 1111111111),
+        (7,     107,    'personalPhone', 1111111111),
+        (8,     108,    'personalPhone', 1111111111),
+        (9,     109,    'personalPhone', 1111111111),
+        (10,    110,    'personalPhone', 1111111111),
+        (11,    111,    'personalPhone', 1111111111),
+        (12,    112,    'personalPhone', 1111111111),
+        (13,    1,      'personalPhone', 623111111),
+        (14,    2,      'personalPhone', 623111111),
+        (15,    3,      'personalPhone', 623111111),
+        (16,    5,      'personalPhone', 623111111),
+        (17,    6,      'personalPhone', 623111111),
+        (18,    9,      'personalPhone', 623111111),
+        (19,    13,     'personalPhone', 623111111),
+        (20,    15,     'personalPhone', 623111111),
+        (21,    16,     'personalPhone', 623111111),
+        (22,    17,     'personalPhone', 623111111),
+        (23,    18,     'personalPhone', 623111111),
+        (24,    19,     'personalPhone', 623111111),
+        (25,    20,     'personalPhone', 623111111),
+        (26,    21,     'personalPhone', 623111111),
+        (27,    22,     'personalPhone', 623111111),
+        (28,    30,     'personalPhone', 623111111),
+        (29,    31,     'personalPhone', 623111111),
+        (30,    32,     'personalPhone', 623111111),
+        (31,    34,     'personalPhone', 623111111),
+        (32,    35,     'personalPhone', 623111111),
+        (33,    36,     'personalPhone', 623111111),
+        (34,    37,     'personalPhone', 623111111),
+        (35,    38,     'personalPhone', 623111111),
+        (36,    39,     'personalPhone', 623111111),
+        (37,    40,     'personalPhone', 623111111),
+        (38,    41,     'personalPhone', 623111111),
+        (39,    42,     'personalPhone', 623111111),
+        (40,    43,     'personalPhone', 623111111),
+        (41,    44,     'personalPhone', 623111111),
+        (42,    45,     'personalPhone', 623111111),
+        (43,    47,     'personalPhone', 623111111),
+        (44,    48,     'personalPhone', 623111111),
+        (45,    50,     'personalPhone', 623111111),
+        (46,    51,     'personalPhone', 623111111),
+        (47,    52,     'personalPhone', 623111111),
+        (48,    54,     'personalPhone', 623111111),
+        (49,    55,     'personalPhone', 623111111),
+        (50,    56,     'personalPhone', 623111111),
+        (51,    57,     'personalPhone', 623111111),
+        (52,    58,     'personalPhone', 623111111),
+        (53,    59,     'personalPhone', 623111111),
+        (54,    60,     'personalPhone', 623111111),
+        (55,    61,     'personalPhone', 623111111),
+        (56,    65,     'personalPhone', 623111111),
+        (57,    66,     'personalPhone', 623111111),
+        (65,    107,    'businessPhone', 700987987),
+        (67,    106,    'businessPhone', 1111111112),
+        (68,    106,    'personalPhone', 1111111113);
diff --git a/modules/worker/front/phones/index.spec.js b/modules/worker/front/phones/index.spec.js
new file mode 100644
index 000000000..0b3e9dc11
--- /dev/null
+++ b/modules/worker/front/phones/index.spec.js
@@ -0,0 +1,26 @@
+import './index';
+
+describe('Component vnWorkerPhones', () => {
+    let controller;
+
+    beforeEach(angular.mock.module('worker', $translateProvider => {
+        $translateProvider.translations('en', {});
+    }));
+
+    beforeEach(angular.mock.inject(($componentController, $rootScope) => {
+        let $scope = $rootScope.$new();
+        controller = $componentController('vnWorkerPhones', $scope);
+        controller.$scope.model = {link: 1};
+        controller.$scope.$applyAsync = () => {};
+    }));
+
+    describe('setLink()', () => {
+        it('set the link in the model and refreshes it', () => {
+            spyOn(controller.$scope, '$applyAsync');
+            let value = {userFk: 106};
+            controller.setLink(value);
+
+            expect(controller.$scope.$applyAsync).toHaveBeenCalledWith(jasmine.any(Function));
+        });
+    });
+});

From 188f4ae3bf9620f75f4d9f575417928405f7a26f Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Mon, 21 Oct 2019 11:08:41 +0200
Subject: [PATCH 33/41] mark item diary line

---
 modules/item/front/diary/index.js | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/modules/item/front/diary/index.js b/modules/item/front/diary/index.js
index a15c32644..e128369a2 100644
--- a/modules/item/front/diary/index.js
+++ b/modules/item/front/diary/index.js
@@ -52,24 +52,31 @@ class Controller {
 
     get freeLineIndex() {
         let lines = this.$scope.model.data;
-        let currentDate = new Date();
-        currentDate.setHours(0, 0, 0);
+        let minDate = new Date();
+        minDate.setHours(0, 0, 0, 0);
+
+        let maxDate = new Date();
+        maxDate.setHours(23, 59, 59, 59);
+
 
         for (let i = 0; i < lines.length; i++) {
-            let isFutureDate = new Date(lines[i].date) >= currentDate;
+            const dated = new Date(lines[i].date);
 
-            if (isFutureDate)
+            let isForFuture = dated > maxDate;
+            let isForToday = (dated >= minDate && dated <= maxDate);
+
+            if (isForFuture || isForToday)
                 return i;
         }
     }
 
     get onPreparationLineIndex() {
         let lines = this.$scope.model.data;
-
         for (let i = this.freeLineIndex; i >= 0; i--) {
             let line = lines[i];
+
             let currentDate = new Date();
-            currentDate.setHours(0, 0, 0);
+            currentDate.setHours(0, 0, 0, 0);
 
             let isPastDate = new Date(lines[i].date) < currentDate;
             let isPicked = line.alertLevel == 1 && line.isPicked;
@@ -95,6 +102,7 @@ class Controller {
         let selectedTicketLineIndex = this.givenTicketIndex;
         let lineIndex = this.onPreparationLineIndex;
 
+
         let lines = body.querySelector('vn-tbody').children;
 
         if (lineIndex == undefined || !lines.length) return;
@@ -120,7 +128,6 @@ class Controller {
             offsetTop = onPreparationLine.offsetTop - headerHeight;
 
         this.$window.scrollTo(0, offsetTop);
-
         this.ticketFk = null;
     }
 

From ff1924e442d51d9da1eb8db29860c7db715648ef Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Mon, 21 Oct 2019 11:09:18 +0200
Subject: [PATCH 34/41] added item-label report and configurable report options

---
 print/config/print.json                       |  7 ++
 print/config/routes.json                      |  1 +
 print/lib/reportEngine.js                     | 14 ++-
 print/package.json                            |  1 +
 .../report/rpt-item-label/assets/css/index.js |  8 ++
 .../rpt-item-label/assets/css/style.css       | 88 +++++++++++++++++++
 print/report/rpt-item-label/index.html        | 28 ++++++
 print/report/rpt-item-label/index.js          | 83 +++++++++++++++++
 print/report/rpt-item-label/locale.js         | 24 +++++
 print/report/rpt-item-label/options.json      | 10 +++
 10 files changed, 256 insertions(+), 8 deletions(-)
 create mode 100644 print/report/rpt-item-label/assets/css/index.js
 create mode 100644 print/report/rpt-item-label/assets/css/style.css
 create mode 100644 print/report/rpt-item-label/index.html
 create mode 100755 print/report/rpt-item-label/index.js
 create mode 100644 print/report/rpt-item-label/locale.js
 create mode 100644 print/report/rpt-item-label/options.json

diff --git a/print/config/print.json b/print/config/print.json
index cb98421fc..7ad2e1316 100755
--- a/print/config/print.json
+++ b/print/config/print.json
@@ -5,6 +5,13 @@
         "senderMail": "nocontestar@verdnatura.es",
         "senderName": "Verdnatura"
     },
+    "pdf": {
+        "format": "A4",
+        "border": "1.5cm",
+        "footer": {
+            "height": "55px"
+        }
+    },
     "mysql": {
         "host": "localhost",
         "port": 3306,
diff --git a/print/config/routes.json b/print/config/routes.json
index e658f4cc4..58d46193c 100644
--- a/print/config/routes.json
+++ b/print/config/routes.json
@@ -17,6 +17,7 @@
     {"type": "report", "name": "rpt-zone"},
     {"type": "report", "name": "rpt-route"},
     {"type": "report", "name": "rpt-lcr"},
+    {"type": "report", "name": "rpt-item-label"},
     {"type": "static", "name": "email-header"},
     {"type": "static", "name": "email-footer"},
     {"type": "static", "name": "report-header"},
diff --git a/print/lib/reportEngine.js b/print/lib/reportEngine.js
index 8c771c449..0903c0f78 100644
--- a/print/lib/reportEngine.js
+++ b/print/lib/reportEngine.js
@@ -2,9 +2,9 @@ const Vue = require('vue');
 const VueI18n = require('vue-i18n');
 const renderer = require('vue-server-renderer').createRenderer();
 const fs = require('fs-extra');
-// const pdf = require('phantom-html2pdf');
 const pdf = require('html-pdf');
 const juice = require('juice');
+const config = require('./config');
 
 Vue.use(VueI18n);
 
@@ -104,13 +104,11 @@ module.exports = {
 
     async toPdf(name, ctx) {
         const html = await this.render(name, ctx);
-        const options = {
-            format: 'A4',
-            border: '1.5cm',
-            footer: {
-                height: '55px',
-            }
-        };
+        let options = config.pdf;
+
+        const optionsPath = `${this.path}/${name}/options.json`;
+        if (fs.existsSync(optionsPath))
+            options = Object.assign(options, require(optionsPath));
 
         return new Promise(resolve => {
             pdf.create(html, options).toStream((err, stream) => {
diff --git a/print/package.json b/print/package.json
index bb7c32a3e..0332817c2 100755
--- a/print/package.json
+++ b/print/package.json
@@ -18,6 +18,7 @@
     "juice": "^5.0.1",
     "mysql2": "^1.6.5",
     "nodemailer": "^4.7.0",
+    "qrcode": "^1.4.2",
     "strftime": "^0.10.0",
     "vue": "^2.6.7",
     "vue-i18n": "^8.8.2",
diff --git a/print/report/rpt-item-label/assets/css/index.js b/print/report/rpt-item-label/assets/css/index.js
new file mode 100644
index 000000000..515dea750
--- /dev/null
+++ b/print/report/rpt-item-label/assets/css/index.js
@@ -0,0 +1,8 @@
+const CssReader = require(`${appPath}/lib/cssReader`);
+
+module.exports = new CssReader([
+    `${appPath}/common/css/layout.css`,
+    `${appPath}/common/css/report.css`,
+    `${appPath}/common/css/misc.css`,
+    `${__dirname}/style.css`])
+    .mergeStyles();
diff --git a/print/report/rpt-item-label/assets/css/style.css b/print/report/rpt-item-label/assets/css/style.css
new file mode 100644
index 000000000..98a3ec721
--- /dev/null
+++ b/print/report/rpt-item-label/assets/css/style.css
@@ -0,0 +1,88 @@
+* {
+    box-sizing: border-box;
+}
+.label {
+    font-size: 1.2em;
+}
+
+.barcode {
+    float: left;
+    width: 40%;
+}
+
+.barcode h1 {
+    text-align: center;
+    font-size: 1.8em;
+    margin: 0
+}
+
+.barcode .image {
+    text-align: center
+}
+
+.barcode .image img {
+    width: 180px
+}
+
+.data {
+    float: left;
+    width: 60%;
+}
+
+.data .header {
+    background-color: #000;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    margin-bottom: 25px;
+    text-align: right;
+    font-size: 1.2em;
+    padding: 0.2em;
+    color: #FFF
+}
+
+.data .color,
+.data .producer {
+    text-transform: uppercase;
+    text-align: right;
+    font-size: 1.5em;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+}
+
+.data .producer {
+    text-justify: inter-character;
+}
+
+.data .details {
+    border-top: 4px solid #000;
+    padding-top: 2px;
+}
+
+.data .details .package {
+    padding-right: 5px;
+    float: left;
+    width: 50%;
+}
+
+.package .packing,
+.package .dated,
+.package .labelNumber {
+    text-align: right
+}
+
+.package .packing {
+    font-size: 1.8em;
+    font-weight: 400
+}
+
+.data .details .size {
+    background-color: #000;
+    text-align: center;
+    font-size: 3em;
+    padding: 0.2em 0;
+    float: left;
+    width: 50%;
+    color: #FFF
+}
\ No newline at end of file
diff --git a/print/report/rpt-item-label/index.html b/print/report/rpt-item-label/index.html
new file mode 100644
index 000000000..0b46aee14
--- /dev/null
+++ b/print/report/rpt-item-label/index.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html lang="es">
+    <body>
+        <section class="container" id="report">
+            <section class="label">
+                <section class="barcode">
+                    <h1>{{item.id}}</h1>
+                    <section class="image">
+                        <img v-bind:src="barcode"/>
+                    </section>
+                </section>
+                <section class="data">
+                    <section class="header">{{item.name}}</section>
+                    <section class="color">{{tags.color}}</section>
+                    <section class="producer">{{tags.producer}}</section>
+                    <section class="details">
+                        <section class="package">
+                            <section class="packing">{{packing()}}</section>
+                            <section class="dated">{{dated}}</section>
+                            <section class="labelNumber">{{labelPage()}}</section>
+                        </section>
+                        <section class="size">{{item.size}}</section>
+                    </section>
+                </section>
+            </section>
+        </section>
+    </body>
+</html>
\ No newline at end of file
diff --git a/print/report/rpt-item-label/index.js b/print/report/rpt-item-label/index.js
new file mode 100755
index 000000000..7e6a61351
--- /dev/null
+++ b/print/report/rpt-item-label/index.js
@@ -0,0 +1,83 @@
+const database = require(`${appPath}/lib/database`);
+const UserException = require(`${appPath}/lib/exceptions/userException`);
+const strftime = require('strftime');
+const qrcode = require('qrcode');
+
+module.exports = {
+    name: 'rpt-item-label',
+    async asyncData(ctx, params) {
+        Object.assign(this, this.methods);
+
+        if (!params.itemId)
+            throw new UserException('No item id specified');
+
+        if (!params.warehouseId)
+            throw new UserException('No warehouse id specified');
+
+        const data = {
+            item: await this.fetchItem(params.itemId, params.warehouseId),
+            tags: await this.fetchItemTags(params.itemId),
+            barcode: await this.getBarcodeBase64(params.itemId),
+            labelNumber: params.labelNumber,
+            totalLabels: params.totalLabels
+        };
+
+        return data;
+    },
+    computed: {
+        dated() {
+            return strftime('%W/%d', new Date());
+        }
+    },
+    methods: {
+        fetchItem(id, warehouseId) {
+            return database.pool.query(
+                `SELECT 
+                    i.id, 
+                    i.name,
+                    i.stems, 
+                    i.size,
+                    b.packing
+                FROM vn.item i
+                    JOIN cache.last_buy clb ON clb.item_id = i.id
+                    JOIN vn.buy b ON b.id = clb.buy_id
+                    JOIN vn.entry e ON e.id = b.entryFk
+                WHERE i.id = ? AND clb.warehouse_id = ?`, [id, warehouseId])
+                .then(([rows]) => {
+                    if (rows.length == 0)
+                        throw new UserException(`Item #${id} not found on warehouse #${warehouseId}`);
+                    return rows[0];
+                });
+        },
+        fetchItemTags(itemId) {
+            return database.pool.query(
+                `SELECT t.code, t.name, it.value
+                    FROM vn.itemTag it
+                        JOIN vn.tag t ON t.id = it.tagFk
+                    WHERE it.itemFk = ?`, [itemId])
+                .then(([rows]) => {
+                    const tags = {};
+                    rows.forEach(row => tags[row.code] = row.value);
+
+                    return tags;
+                });
+        },
+        getBarcodeBase64(itemId) {
+            return qrcode.toDataURL(itemId);
+        },
+        packing() {
+            const stems = this.item.stems ? this.item.stems : 1;
+            return `${this.item.packing}x${stems}`;
+        },
+        labelPage() {
+            const labelNumber = this.labelNumber ? this.labelNumber : 1;
+            const totalLabels = this.totalLabels ? this.totalLabels : 1;
+
+            return `${labelNumber}/${totalLabels}`;
+        }
+    },
+    components: {
+        'report-header': require('../report-header'),
+        'report-footer': require('../report-footer'),
+    },
+};
diff --git a/print/report/rpt-item-label/locale.js b/print/report/rpt-item-label/locale.js
new file mode 100644
index 000000000..b8d524274
--- /dev/null
+++ b/print/report/rpt-item-label/locale.js
@@ -0,0 +1,24 @@
+module.exports = {
+    messages: {
+        es: {
+            title: 'Recibo',
+            date: 'Fecha',
+            payed: 'En {0}, a {1} de {2} de {3}',
+            client: 'Cliente {0}',
+            months: [
+                'Enero',
+                'Febrero',
+                'Marzo',
+                'Abril',
+                'Mayo',
+                'Junio',
+                'Julio',
+                'Agosto',
+                'Septiembre',
+                'Octubre',
+                'Noviembre',
+                'Diciembre'
+            ]
+        },
+    },
+};
diff --git a/print/report/rpt-item-label/options.json b/print/report/rpt-item-label/options.json
new file mode 100644
index 000000000..6b00b0443
--- /dev/null
+++ b/print/report/rpt-item-label/options.json
@@ -0,0 +1,10 @@
+{
+    "format": "A4",
+    "orientation": "landscape",
+    "width": "10.4cm",
+    "height": "4.8cm",
+    "border": "0cm",
+    "footer": {
+        "height": "0"
+    }
+}
\ No newline at end of file

From 1739a71e0d81e8761bb622d3124ae50d4df87827 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Mon, 21 Oct 2019 11:33:40 +0200
Subject: [PATCH 35/41] removed QR barcode margins

---
 print/report/rpt-item-label/assets/css/style.css | 4 ++--
 print/report/rpt-item-label/index.js             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/print/report/rpt-item-label/assets/css/style.css b/print/report/rpt-item-label/assets/css/style.css
index 98a3ec721..1101604b9 100644
--- a/print/report/rpt-item-label/assets/css/style.css
+++ b/print/report/rpt-item-label/assets/css/style.css
@@ -13,7 +13,7 @@
 .barcode h1 {
     text-align: center;
     font-size: 1.8em;
-    margin: 0
+    margin: 0 0 10px 0
 }
 
 .barcode .image {
@@ -21,7 +21,7 @@
 }
 
 .barcode .image img {
-    width: 180px
+    width: 170px
 }
 
 .data {
diff --git a/print/report/rpt-item-label/index.js b/print/report/rpt-item-label/index.js
index 7e6a61351..922965eb0 100755
--- a/print/report/rpt-item-label/index.js
+++ b/print/report/rpt-item-label/index.js
@@ -63,7 +63,7 @@ module.exports = {
                 });
         },
         getBarcodeBase64(itemId) {
-            return qrcode.toDataURL(itemId);
+            return qrcode.toDataURL(itemId, {margin: 0});
         },
         packing() {
             const stems = this.item.stems ? this.item.stems : 1;

From 8e1d594a132cebfe73e715ea73b73258a181a467 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Mon, 21 Oct 2019 13:43:17 +0200
Subject: [PATCH 36/41] was saving data on page load #1820

---
 modules/claim/front/action/index.html | 17 +++++++++--------
 modules/claim/front/action/index.js   | 13 ++-----------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/modules/claim/front/action/index.html b/modules/claim/front/action/index.html
index 329514b37..04ab71997 100644
--- a/modules/claim/front/action/index.html
+++ b/modules/claim/front/action/index.html
@@ -1,10 +1,14 @@
-<vn-crud-model auto-load="true"
-    vn-id="model"
+<vn-crud-model vn-id="model" auto-load="true" auto-save="true"
     url="claim/api/ClaimEnds"
     filter="$ctrl.filter"
     data="$ctrl.salesClaimed">
 </vn-crud-model>
 
+<vn-crud-model auto-load="true"
+    url="/claim/api/ClaimDestinations"
+    data="claimDestinations">
+</vn-crud-model>
+
 <vn-card class="vn-mb-md vn-pa-lg vn-w-lg" style="text-align: right" 
     ng-if="$ctrl.salesClaimed.length > 0">
     <vn-label-value label="Total claimed" 
@@ -28,7 +32,6 @@
                 translate-attr="{title: 'Imports ticket lines'}">
             </vn-button>
             <vn-range
-                vn-one 
                 label="Responsability"
                 min-label="Company"
                 max-label="Sales/Client"
@@ -82,14 +85,12 @@
                         </span>
                     </vn-td>
                     <vn-td>
-                        <vn-autocomplete vn-one
-                            id="claimDestinationFk"
+                        <vn-autocomplete vn-one id="claimDestinationFk"
                             ng-model="saleClaimed.claimDestinationFk"
-                            url="/claim/api/ClaimDestinations"
+                            data="claimDestinations"
                             fields="['id','description']"
                             value-field="id"
-                            show-field="description"
-                            on-change="$ctrl.setClaimDestination(saleClaimed.id, value)">
+                            show-field="description">
                         </vn-autocomplete>
                     </vn-td>
                     <vn-td>{{::saleClaimed.sale.ticket.landed | date: 'dd/MM/yyyy'}}</vn-td>
diff --git a/modules/claim/front/action/index.js b/modules/claim/front/action/index.js
index 439b70d39..63b283f1f 100644
--- a/modules/claim/front/action/index.js
+++ b/modules/claim/front/action/index.js
@@ -19,7 +19,8 @@ class Controller {
                         }
                     }
                 },
-                {relation: 'claimBeggining'}
+                {relation: 'claimBeggining'},
+                {relation: 'claimDestination'}
             ]
         };
         this.resolvedState = 3;
@@ -82,16 +83,6 @@ class Controller {
         this.calculateTotals();
     }
 
-    setClaimDestination(id, claimDestinationFk) {
-        if (claimDestinationFk) {
-            let params = {id: id, claimDestinationFk: claimDestinationFk};
-            let query = `claim/api/ClaimEnds/`;
-            this.$http.patch(query, params).then(() => {
-                this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
-            });
-        }
-    }
-
     calculateTotals() {
         this.claimedTotal = 0;
         this.salesClaimed.forEach(sale => {

From 58a763acf5314bdd98f083114f6fe39bde50d62f Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Mon, 21 Oct 2019 14:21:52 +0200
Subject: [PATCH 37/41] added quicklinks to worker descriptor

---
 modules/client/front/descriptor/index.js   |  8 ++---
 modules/ticket/front/sale/index.html       |  2 +-
 modules/worker/front/descriptor/index.html | 11 ++-----
 modules/worker/front/descriptor/index.js   | 34 ++++++++++++++++++++++
 4 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/modules/client/front/descriptor/index.js b/modules/client/front/descriptor/index.js
index 1eecdc15a..04d619f50 100644
--- a/modules/client/front/descriptor/index.js
+++ b/modules/client/front/descriptor/index.js
@@ -13,6 +13,10 @@ class Controller {
         callback.call(this);
     }
 
+    get client() {
+        return this._client;
+    }
+
     set client(value) {
         this._client = value;
 
@@ -32,10 +36,6 @@ class Controller {
         };
     }
 
-    get client() {
-        return this._client;
-    }
-
     set quicklinks(value = {}) {
         this._quicklinks = Object.assign(value, this._quicklinks);
     }
diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html
index 38ed007a0..b818d86e0 100644
--- a/modules/ticket/front/sale/index.html
+++ b/modules/ticket/front/sale/index.html
@@ -127,7 +127,7 @@
                     <vn-td-editable ng-if="sale.id" disabled="!$ctrl.isEditable" number>
                         <text>{{sale.quantity}}</text>
                         <field>
-                            <vn-input-number
+                            <vn-input-number class="dense"
                                 vn-focus
                                 ng-model="sale.quantity"
                                 on-change="$ctrl.onChangeQuantity(sale)">
diff --git a/modules/worker/front/descriptor/index.html b/modules/worker/front/descriptor/index.html
index 760f889ef..26c2f193e 100644
--- a/modules/worker/front/descriptor/index.html
+++ b/modules/worker/front/descriptor/index.html
@@ -34,13 +34,8 @@
                 value="{{$ctrl.worker.sip.extension}}">
             </vn-label-value>
         </div>
-        <div class="quicklinks">
-            <a
-                ui-sref="client.card.summary({id: $ctrl.worker.userFk})"
-                vn-tooltip="Go to client"
-                class="vn-button">
-                <vn-icon icon="person"></vn-icon>
-            </a>
-        </div>
+        <vn-quick-links
+            links="$ctrl.quicklinks">
+        </vn-quick-links>
     </div>
 </div>
\ No newline at end of file
diff --git a/modules/worker/front/descriptor/index.js b/modules/worker/front/descriptor/index.js
index c8c2cb5e6..82718a29e 100644
--- a/modules/worker/front/descriptor/index.js
+++ b/modules/worker/front/descriptor/index.js
@@ -1,7 +1,41 @@
 import ngModule from '../module';
 
+class Controller {
+    constructor($http, $state) {
+        this.$state = $state;
+        this.$http = $http;
+    }
+
+    get worker() {
+        return this._worker;
+    }
+
+    set worker(value) {
+        this._worker = value;
+
+        if (!value) return;
+
+        this._quicklinks = {
+            btnOne: {
+                icon: 'person',
+                state: `client.card.summary({id: ${value.userFk}})`,
+                tooltip: 'Go to client'
+            }
+        };
+    }
+
+    set quicklinks(value = {}) {
+        this._quicklinks = Object.assign(value, this._quicklinks);
+    }
+
+    get quicklinks() {
+        return this._quicklinks;
+    }
+}
+
 ngModule.component('vnWorkerDescriptor', {
     template: require('./index.html'),
+    controller: Controller,
     bindings: {
         worker: '<'
     }

From 2ed4cf3e4a333601ab1538e8e116d38f7f9926d8 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Tue, 22 Oct 2019 13:44:36 +0200
Subject: [PATCH 38/41] Item request refactor #1818

---
 e2e/helpers/selectors.js                      |   6 +-
 front/core/directives/focus.js                |   8 +-
 front/core/directives/specs/focus.spec.js     |   1 +
 front/salix/components/descriptor/index.html  |   6 +-
 modules/claim/front/action/index.spec.js      |  11 -
 modules/item/front/index/index.html           |   5 +-
 .../front/request-search-panel/index.html     |   2 +-
 modules/item/front/request/index.html         | 229 +++++++++---------
 modules/item/front/request/index.js           |  52 ++--
 modules/item/front/request/index.spec.js      |  21 +-
 modules/item/front/request/locale/es.yml      |   5 +-
 .../back/methods/ticket-request/confirm.js    |  16 +-
 .../back/methods/ticket-request/deny.js       |   2 +-
 .../back/methods/ticket-request/filter.js     |  10 +-
 .../ticket-request/specs/confirm.spec.js      |  33 +--
 .../methods/ticket-request/specs/deny.spec.js |   2 +-
 .../ticket-request/specs/filter.spec.js       |   2 +-
 .../ticket/back/models/ticket-request.json    |   9 +-
 modules/ticket/front/descriptor/index.js      |   2 +-
 .../ticket/front/request/create/index.html    |   2 +-
 modules/ticket/front/request/index/index.html |   4 +-
 21 files changed, 209 insertions(+), 219 deletions(-)

diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index c09c10f50..a9a66c616 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -61,7 +61,7 @@ export default {
         fiscalDataButton: 'vn-left-menu a[ui-sref="client.card.fiscalData"]',
         socialNameInput: `vn-textfield input[name="socialName"]`,
         fiscalIdInput: `vn-textfield input[name="fi"]`,
-        equalizationTaxCheckbox: 'vn-check[label="Is equalizated"]',
+        equalizationTaxCheckbox: 'vn-check[ng-model="$ctrl.client.isEqualizated"]',
         acceptPropagationButton: 'vn-client-fiscal-data > vn-confirm button[response=ACCEPT]',
         addressInput: `vn-textfield input[name="street"]`,
         postcodeInput: `vn-textfield input[name="postcode"]`,
@@ -482,7 +482,7 @@ export default {
         addRequestButton: 'vn-ticket-request-index > a > vn-float-button > button',
         request: 'vn-ticket-request-index vn-table vn-tr',
         descriptionInput: 'vn-ticket-request-create > form > div > vn-card > div > vn-horizontal:nth-child(1) > vn-textfield input',
-        atenderAutocomplete: 'vn-ticket-request-create vn-autocomplete[ng-model="$ctrl.ticketRequest.atenderFk"]',
+        atenderAutocomplete: 'vn-ticket-request-create vn-autocomplete[ng-model="$ctrl.ticketRequest.attenderFk"]',
         quantityInput: 'vn-ticket-request-create vn-input-number input[name=quantity]',
         priceInput: 'vn-ticket-request-create vn-input-number input[name=price]',
         firstRemoveRequestButton: 'vn-ticket-request-index vn-icon[icon="delete"]:nth-child(1)',
@@ -534,7 +534,7 @@ export default {
         itemDescriptorPopover: '.vn-popover.shown vn-item-descriptor',
         itemDescriptorPopoverItemDiaryButton: '.vn-popover.shown vn-item-descriptor a[href="#!/item/2/diary"]',
         firstDevelopmentWorker: 'vn-claim-summary vn-horizontal > vn-auto:nth-child(5) vn-table > div > vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(4) > span',
-        firstDevelopmentWorkerGoToClientButton: '.vn-popover.shown vn-worker-descriptor div.quicklinks > a[href="#!/client/21/summary"]',
+        firstDevelopmentWorkerGoToClientButton: '.vn-popover.shown vn-worker-descriptor vn-quick-links > a[href="#!/client/21/summary"]',
         firstActionTicketId: 'vn-claim-summary > vn-card > div > vn-horizontal > vn-auto:nth-child(6) vn-table > div > vn-tbody > vn-tr > vn-td:nth-child(2) > span',
         firstActionTicketDescriptor: '.vn-popover.shown vn-ticket-descriptor'
     },
diff --git a/front/core/directives/focus.js b/front/core/directives/focus.js
index 55e7d3496..b9527479b 100644
--- a/front/core/directives/focus.js
+++ b/front/core/directives/focus.js
@@ -3,7 +3,7 @@ import ngModule from '../module';
 const regex = /Android|webOS|iPhone|iPad|iPod|BlackBerry|Windows Phone/i;
 export const isMobile = regex.test(navigator.userAgent);
 
-export function focus(input) {
+export function focus($scope, input) {
     if (isMobile) return;
 
     const element = input;
@@ -23,9 +23,9 @@ export function focus(input) {
     }
 
     input.focus();
-
-    if (input.select)
+    $scope.$applyAsync(() => {
         input.select();
+    });
 }
 
 /**
@@ -37,7 +37,7 @@ export function directive() {
     return {
         restrict: 'A',
         link: function($scope, $element) {
-            $scope.$watch('', () => focus($element[0]));
+            $scope.$watch('', () => focus($scope, $element[0]));
         }
     };
 }
diff --git a/front/core/directives/specs/focus.spec.js b/front/core/directives/specs/focus.spec.js
index ecf28a692..4034657b4 100644
--- a/front/core/directives/specs/focus.spec.js
+++ b/front/core/directives/specs/focus.spec.js
@@ -40,6 +40,7 @@ describe('Directive focus', () => {
     it('should call select function on the element', () => {
         let html = `<input vn-focus></input>`;
         compile(html);
+        $scope.$apply();
 
         expect($element[0].select).toHaveBeenCalledWith();
     });
diff --git a/front/salix/components/descriptor/index.html b/front/salix/components/descriptor/index.html
index a3ee34563..3804be627 100644
--- a/front/salix/components/descriptor/index.html
+++ b/front/salix/components/descriptor/index.html
@@ -1,7 +1,7 @@
 <a ng-if="$ctrl.links.btnOne"
     vn-tooltip="{{::$ctrl.links.btnOne.tooltip}}"
     class="vn-button colored"
-    ui-sref="{{::$ctrl.links.btnOne.state}}" target="_blank">
+    ui-sref="{{::$ctrl.links.btnOne.state}}">
     <vn-icon
         icon="{{::$ctrl.links.btnOne.icon}}">
     </vn-icon>
@@ -9,7 +9,7 @@
 <a ng-if="$ctrl.links.btnTwo"
     vn-tooltip="{{::$ctrl.links.btnTwo.tooltip}}"
     class="vn-button colored" 
-    ui-sref="{{::$ctrl.links.btnTwo.state}}" target="_blank">
+    ui-sref="{{::$ctrl.links.btnTwo.state}}">
     <vn-icon 
         icon="{{::$ctrl.links.btnTwo.icon}}">
     </vn-icon>
@@ -17,7 +17,7 @@
 <a ng-if="$ctrl.links.btnThree"
     vn-tooltip="{{::$ctrl.links.btnThree.tooltip}}"
     class="vn-button colored" 
-    ui-sref="{{::$ctrl.links.btnThree.state}}" target="_blank">
+    ui-sref="{{::$ctrl.links.btnThree.state}}">
     <vn-icon
         icon="{{::$ctrl.links.btnThree.icon}}">
     </vn-icon>
diff --git a/modules/claim/front/action/index.spec.js b/modules/claim/front/action/index.spec.js
index d1f8f9766..e526680c3 100644
--- a/modules/claim/front/action/index.spec.js
+++ b/modules/claim/front/action/index.spec.js
@@ -82,17 +82,6 @@ describe('claim', () => {
             });
         });
 
-        describe('setClaimDestination(id, claimDestinationFk)', () => {
-            it('should make a patch and call refresh and showSuccess', () => {
-                spyOn(controller.vnApp, 'showSuccess');
-                $httpBackend.expectPATCH(`claim/api/ClaimEnds/`).respond({});
-                controller.setClaimDestination(1, 1);
-                $httpBackend.flush();
-
-                expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!');
-            });
-        });
-
         describe('calculateTotals()', () => {
             it('should calculate the total price of the items claimed', () => {
                 controller.salesClaimed = [
diff --git a/modules/item/front/index/index.html b/modules/item/front/index/index.html
index 3ed297baa..2f53c9c08 100644
--- a/modules/item/front/index/index.html
+++ b/modules/item/front/index/index.html
@@ -8,12 +8,11 @@
 <div class="content-block">
     <vn-card class="vn-pa-md vn-w-sm">
         <vn-horizontal style="align-items: center;">
-            <vn-searchbar
+            <vn-searchbar vn-focus
                 panel="vn-item-search-panel"
                 on-search="$ctrl.onSearch($params)"
                 info="Search items by id, name or barcode"
-                suggested-filter="{isActive: true}"
-                vn-focus>
+                suggested-filter="{isActive: true}">
             </vn-searchbar>
             <vn-icon-menu
                 vn-id="more-button"
diff --git a/modules/item/front/request-search-panel/index.html b/modules/item/front/request-search-panel/index.html
index 8e15be8fb..999bfd500 100644
--- a/modules/item/front/request-search-panel/index.html
+++ b/modules/item/front/request-search-panel/index.html
@@ -16,7 +16,7 @@
             </vn-textfield>
             <vn-autocomplete
                 vn-one
-                ng-model="filter.atenderFk"
+                ng-model="filter.attenderFk"
                 url="/client/api/Clients/activeWorkersWithRole"
                 search-function="{firstName: $search}"
                 value-field="id"
diff --git a/modules/item/front/request/index.html b/modules/item/front/request/index.html
index de2750014..6b8c63bb6 100644
--- a/modules/item/front/request/index.html
+++ b/modules/item/front/request/index.html
@@ -1,121 +1,116 @@
-<vn-crud-model 
+<vn-crud-model auto-load="true"
     vn-id="model"
     url="/ticket/api/TicketRequests/filter"
     limit="20"
     data="requests"
-    order="isOk ASC"
-    auto-load="false">
+    order="shipped ASC, isOk ASC">
 </vn-crud-model>
 <form name="form">
     <div class="vn-ma-md">
         <vn-card class="vn-pa-md vn-list">
-            <vn-horizontal>
-                <vn-searchbar 
-                    auto-load="false"
-                    panel="vn-request-search-panel"
-                    on-search="$ctrl.onSearch($params)"
-                    info="Search request by id or alias"
-                    vn-one
-                    vn-focus>
-                </vn-searchbar>
-            </vn-horizontal>
+            <vn-searchbar vn-one vn-focus
+                auto-load="false"
+                panel="vn-request-search-panel"
+                on-search="$ctrl.onSearch($params)"
+                info="Search request by id or alias"
+                suggested-filter="$ctrl.filter.where">
+            </vn-searchbar>
         </vn-card>
-        <vn-card class="vn-my-md">
-            <vn-table model="model" auto-load="false">
-                <vn-thead>
-                    <vn-tr>
-                        <vn-th field="ticketFk" number>Ticket ID</vn-th>
-                        <vn-th field="shipped">Shipped</vn-th>
-                        <vn-th field="warehouse">Warehouse</vn-th>
-                        <vn-th field="salesPersonNickname">SalesPerson</vn-th>
-                        <vn-th field="description">Description</vn-th>
-                        <vn-th field="quantity" number editable>Quantity</vn-th>
-                        <vn-th field="price" number>Price</vn-th>
-                        <vn-th field="atenderNickname">Atender</vn-th>
-                        <vn-th field="itemFk">Item</vn-th>
-                        <vn-th field="description">Concept</vn-th>
-                        <vn-th field="saleQuantity" number>Sale quantity</vn-th>
-                        <vn-th field="isOk">State</vn-th>
-                    </vn-tr>
-                </vn-thead>
-                <vn-tbody>
-                    <vn-tr ng-repeat="request in requests">
-                        <vn-td number>
-                            <span class="link"
-                                ng-click="$ctrl.showTicketDescriptor($event, request.ticketFk)">
-                                {{request.ticketFk}}
-                            </span>
-                        </vn-td>
-                        <vn-td>
-                            <span title="{{::request.shipped | date: 'dd/MM/yyyy'}}"
-                                class="chip {{$ctrl.compareDate(request.shipped)}}">
-                                {{::request.shipped | date: 'dd/MM/yyyy'}}
-                            </span>
-                        </vn-td>
-                        <vn-td>{{::request.warehouse}}</vn-td>
-                        <vn-td>
-                            <span 
-                                class="link" 
-                                ng-click="$ctrl.showWorkerDescriptor($event, request.salesPersonFk)">
-                                {{::request.salesPersonNickname}}
-                            </span>
-                        </vn-td>
-                        <vn-td title="{{::request.description}}">{{::request.description}}</vn-td>
-                        <vn-td number>{{::request.quantity}}</vn-td>
-                        <vn-td number>{{::request.price | currency: 'EUR':2}}</vn-td>
-                        <vn-td>
-                            <span
-                            class="link"
-                            ng-click="$ctrl.showWorkerDescriptor($event, request.atenderFk)">
-                            {{::request.atenderNickname}}
-                            </span>
-                        </vn-td>
-                        <vn-td-editable disabled="request.isOk === 0" number>
-                            <text>{{request.itemFk}}</text>
-                            <field>
-                                <vn-input-number
-                                    ng-model="request.itemFk"
-                                    on-change="$ctrl.confirmRequest(request)">
-                                </vn-input-number>
-                            </field>
-                        </vn-td-editable>
-                        <vn-td>
-                            <span                             
-                                class="link" 
-                                ng-click="$ctrl.showItemDescriptor($event, request.itemFk)"
-                                title="{{::request.itemDescription}}">
-                                {{::request.itemDescription}}
-                            </span>
-                        </vn-td>
-                        <vn-td-editable disabled="request.isOk === 0" number>
-                            <text number>{{request.saleQuantity}}</text>
-                            <field>
-                                <vn-input-number
-                                    ng-model="request.saleQuantity"
-                                    on-change="$ctrl.changeQuantity(request)">
-                                </vn-input-number>
-                            </field>
-                        </vn-td-editable>
-                        <vn-td>{{::$ctrl.getState(request.isOk)}}</vn-td>
-                        <vn-td>
-                            <vn-icon
-                                ng-if="request.response.length"
-                                vn-tooltip="{{request.response}}"
-                                icon="insert_drive_file">
-                            </vn-icon>
-                            <vn-icon-button
-                                ng-if="request.isOk != 0"
-                                number
-                                icon="thumb_down"
-                                ng-click="$ctrl.showDenyReason($event, request.id)"
-                                vn-tooltip="Discard">
-                            </vn-icon-button>
-                        </vn-td>
-                    </vn-tr>
-                </vn-tbody>
-            </vn-table>
-        </vn-card>
-        <vn-pagination model="model"></vn-pagination>
+        <vn-data-viewer model="model" class="vn-my-md">
+            <vn-card>
+                <vn-table model="model">
+                    <vn-thead>
+                        <vn-tr>
+                            <vn-th field="ticketFk" number>Ticket ID</vn-th>
+                            <vn-th field="shipped">Shipped</vn-th>
+                            <vn-th field="warehouse">Warehouse</vn-th>
+                            <vn-th field="salesPersonNickname">SalesPerson</vn-th>
+                            <vn-th field="description">Description</vn-th>
+                            <vn-th field="quantity" number editable>Requested</vn-th>
+                            <vn-th field="price" number>Price</vn-th>
+                            <vn-th field="atenderNickname">Atender</vn-th>
+                            <vn-th field="itemFk">Item</vn-th>
+                            <vn-th field="saleQuantity">Achieved</vn-th>
+                            <vn-th field="description">Concept</vn-th>
+                            <vn-th field="isOk">State</vn-th>
+                        </vn-tr>
+                    </vn-thead>
+                    <vn-tbody>
+                        <vn-tr ng-repeat="request in requests">
+                            <vn-td number>
+                                <span class="link"
+                                    ng-click="$ctrl.showTicketDescriptor($event, request.ticketFk)">
+                                    {{request.ticketFk}}
+                                </span>
+                            </vn-td>
+                            <vn-td>
+                                <span title="{{::request.shipped | date: 'dd/MM/yyyy'}}"
+                                    class="chip {{$ctrl.compareDate(request.shipped)}}">
+                                    {{::request.shipped | date: 'dd/MM/yyyy'}}
+                                </span>
+                            </vn-td>
+                            <vn-td>{{::request.warehouse}}</vn-td>
+                            <vn-td>
+                                <span 
+                                    class="link" 
+                                    ng-click="$ctrl.showWorkerDescriptor($event, request.salesPersonFk)">
+                                    {{::request.salesPersonNickname}}
+                                </span>
+                            </vn-td>
+                            <vn-td title="{{::request.description}}">{{::request.description}}</vn-td>
+                            <vn-td number>{{::request.quantity}}</vn-td>
+                            <vn-td number>{{::request.price | currency: 'EUR':2}}</vn-td>
+                            <vn-td>
+                                <span
+                                class="link"
+                                ng-click="$ctrl.showWorkerDescriptor($event, request.attenderFk)">
+                                {{::request.atenderNickname}}
+                                </span>
+                            </vn-td>
+                            <vn-td-editable disabled="request.isOk != null" number>
+                                <text>{{request.itemFk}}</text>
+                                <field>
+                                    <vn-input-number class="dense" vn-focus
+                                        ng-model="request.itemFk">
+                                    </vn-input-number>
+                                </field>
+                            </vn-td-editable>
+                            <vn-td-editable disabled="!request.itemFk || request.isOk != null" number>
+                                <text number>{{request.saleQuantity}}</text>
+                                <field>
+                                    <vn-input-number class="dense" vn-focus
+                                        ng-model="request.saleQuantity"
+                                        on-change="$ctrl.changeQuantity(request)">
+                                    </vn-input-number>
+                                </field>
+                            </vn-td-editable>
+                            <vn-td>
+                                <span                             
+                                    class="link" 
+                                    ng-click="$ctrl.showItemDescriptor($event, request.itemFk)"
+                                    title="{{request.itemDescription}}">
+                                    {{request.itemDescription}}
+                                </span>
+                            </vn-td>
+                            <vn-td>{{$ctrl.getState(request.isOk)}}</vn-td>
+                            <vn-td>
+                                <vn-icon
+                                    ng-if="request.response.length"
+                                    ranslate-attr="{title: request.response}"
+                                    icon="insert_drive_file">
+                                </vn-icon>
+                                <vn-icon-button
+                                    ng-if="request.isOk != 0"
+                                    icon="thumb_down"
+                                    ng-click="$ctrl.showDenyReason($event, request)"
+                                    translate-attr="{title: 'Discard'}">
+                                </vn-icon-button>
+                            </vn-td>
+                        </vn-tr>
+                    </vn-tbody>
+                </vn-table>
+            </vn-card>
+        </vn-data-viewer>
     </div>
 </form>
 <vn-worker-descriptor-popover 
@@ -129,21 +124,17 @@
 </vn-item-descriptor-popover>
 <vn-dialog
     vn-id="denyReason"
-    class="modal-form">
+    on-response="$ctrl.denyRequest(response)">
     <tpl-body>
-        <vn-horizontal class="header">
-            <h5><span translate>Indicate the reasons to deny this request</span></h5>
-        </vn-horizontal>
+        <h5 class="vn-pa-md" translate>Specify the reasons to deny this request</h5>
         <vn-horizontal class="vn-pa-md">
             <vn-textarea
                 ng-model="$ctrl.denyObservation">
             </vn-textarea>
         </vn-horizontal>
-        <vn-horizontal class="vn-pa-md">
-            <vn-button 
-                label="Save" 
-                ng-click="$ctrl.denyRequest()">
-            </vn-button>
-        </vn-horizontal>
     </tpl-body>
+    <tpl-buttons>
+        <input type="button" response="CANCEL" translate-attr="{value: 'Cancel'}"/>
+        <button response="ACCEPT" translate>Save</button>
+    </tpl-buttons>
 </vn-dialog>
\ No newline at end of file
diff --git a/modules/item/front/request/index.js b/modules/item/front/request/index.js
index f887be9a8..c18800001 100644
--- a/modules/item/front/request/index.js
+++ b/modules/item/front/request/index.js
@@ -9,8 +9,23 @@ export default class Controller {
         this.$ = $;
         this.vnApp = vnApp;
         this._ = $translate;
-        if (!$stateParams.q)
-            this.filter = {isOk: false, mine: true};
+        if (!$stateParams.q) {
+            const today = new Date();
+            today.setHours(23, 59, 59, 59);
+
+            const lastWeek = new Date();
+            lastWeek.setHours(0, 0, 0, 0);
+            lastWeek.setDate(lastWeek.getDate() - 7);
+
+            this.filter = {
+                where: {
+                    isOk: false,
+                    mine: true,
+                    from: lastWeek,
+                    to: today
+                }
+            };
+        }
     }
 
     $postLink() {
@@ -21,7 +36,7 @@ export default class Controller {
     getState(isOk) {
         if (isOk === null)
             return 'Nueva';
-        else if (isOk === -1 || isOk === 1)
+        else if (isOk === -1 || isOk)
             return 'Aceptada';
         else
             return 'Denegada';
@@ -34,14 +49,12 @@ export default class Controller {
                 quantity: request.saleQuantity
             };
 
-            let endpoint = `/api/TicketRequests/${request.id}/confirm`;
+            let query = `/api/TicketRequests/${request.id}/confirm`;
+            this.$http.post(query, params).then(res => {
+                request.itemDescription = res.data.concept;
+                request.isOk = true;
 
-            this.$http.post(endpoint, params).then(() => {
                 this.vnApp.showSuccess(this._.instant('Data saved!'));
-                this.$.model.refresh();
-            }).catch( e => {
-                this.$.model.refresh();
-                throw e;
             });
         }
     }
@@ -56,10 +69,7 @@ export default class Controller {
 
             this.$http.patch(endpoint, params).then(() => {
                 this.vnApp.showSuccess(this._.instant('Data saved!'));
-            }).catch( e => {
-                this.$.model.refresh();
-                throw e;
-            });
+            }).then(() => this.confirmRequest(request));
         } else
             this.confirmRequest(request);
     }
@@ -86,7 +96,7 @@ export default class Controller {
     }
 
     showDenyReason(event, requestId) {
-        this.denyRequestId = requestId;
+        this.selectedRequest = requestId;
         this.$.denyReason.parent = event.target;
         this.$.denyReason.show();
         document.querySelector('vn-item-request vn-textarea textArea').focus();
@@ -96,17 +106,21 @@ export default class Controller {
         delete this.denyRequestId;
     }
 
-    denyRequest() {
+    denyRequest(response) {
+        if (response !== 'ACCEPT') return;
+
         let params = {
             observation: this.denyObservation
         };
 
-        let endpoint = `/api/TicketRequests/${this.denyRequestId}/deny`;
+        let query = `/api/TicketRequests/${this.selectedRequest.id}/deny`;
+        this.$http.post(query, params).then(res => {
+            const request = res.data;
+            this.selectedRequest.isOk = request.isOk;
+            this.selectedRequest.attenderFk = request.attenderFk;
+            this.selectedRequest.response = request.response;
 
-        this.$http.post(endpoint, params).then(() => {
             this.vnApp.showSuccess(this._.instant('Data saved!'));
-            this.$.model.refresh();
-            this.$.denyReason.hide();
             this.denyObservation = null;
         });
     }
diff --git a/modules/item/front/request/index.spec.js b/modules/item/front/request/index.spec.js
index e27bc3879..1704c61a1 100644
--- a/modules/item/front/request/index.spec.js
+++ b/modules/item/front/request/index.spec.js
@@ -53,15 +53,15 @@ describe('Item', () => {
                 let model = controller.$.model;
                 spyOn(model, 'refresh');
 
+                const expectedResult = {concept: 'Melee Weapon'};
                 let request = {itemFk: 1, saleQuantity: 1, id: 1};
 
-                $httpBackend.when('POST', `/api/TicketRequests/${request.id}/confirm`).respond();
-                $httpBackend.expect('POST', `/api/TicketRequests/${request.id}/confirm`).respond();
+                $httpBackend.when('POST', `/api/TicketRequests/${request.id}/confirm`).respond(expectedResult);
+                $httpBackend.expect('POST', `/api/TicketRequests/${request.id}/confirm`).respond(expectedResult);
                 controller.confirmRequest(request);
                 $httpBackend.flush();
 
                 expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!');
-                expect($scope.model.refresh).toHaveBeenCalledWith();
             });
         });
 
@@ -110,20 +110,17 @@ describe('Item', () => {
         describe('denyRequest()', () => {
             it(`should perform a query and call vnApp.showSuccess(), refresh(), hide() and set denyObservation to null in the controller`, () => {
                 spyOn(controller.vnApp, 'showSuccess');
-                let model = controller.$.model;
-                spyOn(model, 'refresh');
-                spyOn(controller.$.denyReason, 'hide');
 
-                controller.denyRequestId = 1;
+                const request = {id: 1};
+                const expectedResult = {isOk: false, attenderFk: 106, response: 'Denied!'};
+                controller.selectedRequest = request;
 
-                $httpBackend.when('POST', `/api/TicketRequests/${controller.denyRequestId}/deny`).respond();
-                $httpBackend.expect('POST', `/api/TicketRequests/${controller.denyRequestId}/deny`).respond();
-                controller.denyRequest();
+                $httpBackend.when('POST', `/api/TicketRequests/${request.id}/deny`).respond(expectedResult);
+                $httpBackend.expect('POST', `/api/TicketRequests/${request.id}/deny`).respond(expectedResult);
+                controller.denyRequest('ACCEPT');
                 $httpBackend.flush();
 
                 expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!');
-                expect($scope.model.refresh).toHaveBeenCalledWith();
-                expect($scope.denyReason.hide).toHaveBeenCalledWith();
             });
         });
     });
diff --git a/modules/item/front/request/locale/es.yml b/modules/item/front/request/locale/es.yml
index 760f30bd3..33710a327 100644
--- a/modules/item/front/request/locale/es.yml
+++ b/modules/item/front/request/locale/es.yml
@@ -1,5 +1,6 @@
 Discard: Descartar
-Indicate the reasons to deny this request: Indique las razones para descartar esta peticion
+Specify the reasons to deny this request: Especifica las razones para descartar la petición
 Buy requests:  Peticiones de compra
 Search request by id or alias: Buscar peticiones por identificador o alias
-Sale quantity: C. conseguida
\ No newline at end of file
+Requested: Solicitado
+Achieved: Conseguido
\ No newline at end of file
diff --git a/modules/ticket/back/methods/ticket-request/confirm.js b/modules/ticket/back/methods/ticket-request/confirm.js
index 92dd06dae..53fb2527c 100644
--- a/modules/ticket/back/methods/ticket-request/confirm.js
+++ b/modules/ticket/back/methods/ticket-request/confirm.js
@@ -38,27 +38,27 @@ module.exports = Self => {
         try {
             let options = {transaction: tx};
 
-            let item = await models.Item.findById(ctx.args.itemFk);
+            let item = await models.Item.findById(ctx.args.itemFk, null, options);
             if (!item)
                 throw new UserError(`That item doesn't exists`);
 
             let request = await models.TicketRequest.findById(ctx.args.id, {
                 include: {relation: 'ticket'}
-            });
+            }, options);
 
             let [[stock]] = await Self.rawSql(`CALL vn.getItemVisibleAvailable(?,?,?,?)`, [
                 ctx.args.itemFk,
                 request.ticket().shipped,
                 request.ticket().warehouseFk,
                 false
-            ]);
+            ], options);
 
             if (stock.available < 0)
                 throw new UserError(`This item is not available`);
 
 
             if (request.saleFk) {
-                sale = await models.Sale.findById(request.saleFk);
+                sale = await models.Sale.findById(request.saleFk, null, options);
                 sale.updateAttributes({
                     itemFk: ctx.args.itemFk,
                     quantity: ctx.args.quantity,
@@ -71,7 +71,11 @@ module.exports = Self => {
                     quantity: ctx.args.quantity,
                     concept: item.name
                 }, options);
-                request.updateAttributes({saleFk: sale.id, itemFk: sale.itemFk, isOk: true}, options);
+                request.updateAttributes({
+                    saleFk: sale.id,
+                    itemFk: sale.itemFk,
+                    isOk: true
+                }, options);
             }
 
             query = `CALL vn.ticketCalculateSale(?)`;
@@ -86,6 +90,8 @@ module.exports = Self => {
             }, options);
 
             await tx.commit();
+
+            return sale;
         } catch (error) {
             await tx.rollback();
             throw error;
diff --git a/modules/ticket/back/methods/ticket-request/deny.js b/modules/ticket/back/methods/ticket-request/deny.js
index 817c90782..e663ef1bc 100644
--- a/modules/ticket/back/methods/ticket-request/deny.js
+++ b/modules/ticket/back/methods/ticket-request/deny.js
@@ -29,7 +29,7 @@ module.exports = Self => {
 
         let params = {
             isOk: false,
-            atenderFk: worker.id,
+            attenderFk: worker.id,
             response: ctx.args.observation,
         };
 
diff --git a/modules/ticket/back/methods/ticket-request/filter.js b/modules/ticket/back/methods/ticket-request/filter.js
index 40c1f7652..82e1ee8e0 100644
--- a/modules/ticket/back/methods/ticket-request/filter.js
+++ b/modules/ticket/back/methods/ticket-request/filter.js
@@ -28,7 +28,7 @@ module.exports = Self => {
                 type: 'Number',
                 description: `Search by warehouse`
             }, {
-                arg: 'atenderFk',
+                arg: 'attenderFk',
                 type: 'Number',
                 description: `Search requests atended by the given worker`
             }, {
@@ -65,7 +65,7 @@ module.exports = Self => {
         let worker = await Self.app.models.Worker.findOne({where: {userFk: userId}});
 
         if (ctx.args.mine)
-            ctx.args.atenderFk = worker.id;
+            ctx.args.attenderFk = worker.id;
 
         let where = buildFilter(ctx.args, (param, value) => {
             switch (param) {
@@ -75,7 +75,7 @@ module.exports = Self => {
                     : {'t.nickname': {like: `%${value}%`}};
             case 'ticketFk':
                 return {'t.id': value};
-            case 'atenderFk':
+            case 'attenderFk':
                 return {'tr.atenderFk': value};
             case 'isOk':
                 return {'tr.isOk': value};
@@ -106,13 +106,13 @@ module.exports = Self => {
                 tr.ticketFk,
                 tr.quantity,
                 tr.price,
-                tr.atenderFk,
+                tr.atenderFk attenderFk,
                 tr.description,
                 tr.response,
                 tr.saleFk,
                 tr.isOk,
                 s.quantity AS saleQuantity,
-                s.itemFK,
+                s.itemFk,
                 i.name AS itemDescription,
                 t.shipped,
                 t.nickname,
diff --git a/modules/ticket/back/methods/ticket-request/specs/confirm.spec.js b/modules/ticket/back/methods/ticket-request/specs/confirm.spec.js
index 574469d86..2383fe560 100644
--- a/modules/ticket/back/methods/ticket-request/specs/confirm.spec.js
+++ b/modules/ticket/back/methods/ticket-request/specs/confirm.spec.js
@@ -1,27 +1,14 @@
 const app = require('vn-loopback/server/server');
 
 describe('ticket-request confirm()', () => {
-    let request;
-    let sale;
+    let originalRequest;
+    let originalSale;
     let createdSaleId;
 
     afterAll(async done => {
-        const paramsForRequest = {
-            saleFk: request.saleFk,
-            isOk: request.isOk,
-            itemFk: request.itemFk,
-            ticketFk: request.ticketFk
-        };
-
-        const paramsForSale = {
-            itemFk: sale.itemFk,
-            quantity: sale.quantity,
-            concept: sale.concept,
-        };
-
-        await request.updateAttributes(paramsForRequest);
-        await sale.updateAttributes(paramsForSale);
-        app.models.Sale.destroyById(createdSaleId);
+        await originalRequest.updateAttributes(originalRequest);
+        await originalSale.updateAttributes(originalSale);
+        await app.models.Sale.destroyById(createdSaleId);
         done();
     });
 
@@ -65,10 +52,11 @@ describe('ticket-request confirm()', () => {
         const itemId = 1;
         const quantity = 10;
 
-        request = await app.models.TicketRequest.findById(requestId);
-        sale = await app.models.Sale.findById(saleId);
+        originalRequest = await app.models.TicketRequest.findById(requestId);
+        originalSale = await app.models.Sale.findById(saleId);
 
-        request.updateAttributes({saleFk: saleId});
+        const request = await app.models.TicketRequest.findById(requestId);
+        await request.updateAttributes({saleFk: saleId});
 
         let ctx = {req: {accessToken: {userId: 9}}, args: {
             itemFk: itemId,
@@ -89,7 +77,8 @@ describe('ticket-request confirm()', () => {
         const itemId = 1;
         const quantity = 10;
 
-        request.updateAttributes({saleFk: null});
+        const request = await app.models.TicketRequest.findById(requestId);
+        await request.updateAttributes({saleFk: null});
 
         let ctx = {req: {accessToken: {userId: 9}}, args: {
             itemFk: itemId,
diff --git a/modules/ticket/back/methods/ticket-request/specs/deny.spec.js b/modules/ticket/back/methods/ticket-request/specs/deny.spec.js
index cac63586e..04152fa21 100644
--- a/modules/ticket/back/methods/ticket-request/specs/deny.spec.js
+++ b/modules/ticket/back/methods/ticket-request/specs/deny.spec.js
@@ -5,7 +5,7 @@ describe('ticket-request deny()', () => {
     afterAll(async done => {
         let params = {
             isOk: null,
-            atenderFk: request.atenderFk,
+            attenderFk: request.attenderFk,
             response: null,
         };
 
diff --git a/modules/ticket/back/methods/ticket-request/specs/filter.spec.js b/modules/ticket/back/methods/ticket-request/specs/filter.spec.js
index 24e74e4df..329688866 100644
--- a/modules/ticket/back/methods/ticket-request/specs/filter.spec.js
+++ b/modules/ticket/back/methods/ticket-request/specs/filter.spec.js
@@ -37,7 +37,7 @@ describe('ticket-request filter()', () => {
     });
 
     it('should return the ticket request matching the atender ID', async() => {
-        let ctx = {req: {accessToken: {userId: 9}}, args: {atenderFk: 35}};
+        let ctx = {req: {accessToken: {userId: 9}}, args: {attenderFk: 35}};
 
         let result = await app.models.TicketRequest.filter(ctx);
         let requestId = result[0].id;
diff --git a/modules/ticket/back/models/ticket-request.json b/modules/ticket/back/models/ticket-request.json
index dfb609e3c..7f1cb4b02 100644
--- a/modules/ticket/back/models/ticket-request.json
+++ b/modules/ticket/back/models/ticket-request.json
@@ -33,9 +33,12 @@
         "isOk": {
             "type": "Boolean"
         },
-        "atenderFk": {
+        "attenderFk": {
             "type": "Number",
-            "required": true
+            "required": true,
+            "mysql": {
+                "columnName": "atenderFk"
+            }
         },
         "response": {
             "type": "String"
@@ -55,7 +58,7 @@
         "atender": {
             "type": "belongsTo",
             "model": "Worker",
-            "foreignKey": "atenderFk"
+            "foreignKey": "attenderFk"
         },
         "requester": {
             "type": "belongsTo",
diff --git a/modules/ticket/front/descriptor/index.js b/modules/ticket/front/descriptor/index.js
index a33e57e14..05b4e719a 100644
--- a/modules/ticket/front/descriptor/index.js
+++ b/modules/ticket/front/descriptor/index.js
@@ -176,7 +176,7 @@ class Controller {
             links.btnTwo = {
                 icon: 'icon-stowaway',
                 state: `ticket.card.summary({id: ${value.stowaway.shipFk}})`,
-                tooltip: 'Ship'
+                tooltip: 'Ship stowaways'
             };
         }
 
diff --git a/modules/ticket/front/request/create/index.html b/modules/ticket/front/request/create/index.html
index 1b7044c20..dd10d8afe 100644
--- a/modules/ticket/front/request/create/index.html
+++ b/modules/ticket/front/request/create/index.html
@@ -18,7 +18,7 @@
                 </vn-textfield>
                 <vn-autocomplete 
                     vn-one
-                    ng-model="$ctrl.ticketRequest.atenderFk"
+                    ng-model="$ctrl.ticketRequest.attenderFk"
                     url="/client/api/Clients/activeWorkersWithRole"
                     show-field="nickname"
                     search-function="{firstName: $search}"
diff --git a/modules/ticket/front/request/index/index.html b/modules/ticket/front/request/index/index.html
index 28dd28dc0..fd8f7d05d 100644
--- a/modules/ticket/front/request/index/index.html
+++ b/modules/ticket/front/request/index/index.html
@@ -1,7 +1,7 @@
 <vn-crud-model
     vn-id="model"
     url="/ticket/api/TicketRequests"
-    fields="['id', 'description', 'created', 'requesterFk', 'atenderFk', 'quantity', 'price', 'saleFk', 'isOk']"
+    fields="['id', 'description', 'created', 'requesterFk', 'attenderFk', 'quantity', 'price', 'saleFk', 'isOk']"
     order="created ASC"
     link="{ticketFk: $ctrl.$stateParams.id}"
     filter="::$ctrl.filter"
@@ -43,7 +43,7 @@
                 <vn-td expand>
                     <span
                         class="link" 
-                        ng-click="$ctrl.showWorkerDescriptor($event, request.atenderFk)">
+                        ng-click="$ctrl.showWorkerDescriptor($event, request.attenderFk)">
                         {{::request.atender.user.nickname | dashIfEmpty}}
                     </span>
                 </vn-td>

From 137f701434178978702c94c22b37c847a0eb3e37 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Tue, 22 Oct 2019 14:20:50 +0200
Subject: [PATCH 39/41] changed order

---
 modules/item/front/request/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/item/front/request/index.html b/modules/item/front/request/index.html
index 6b8c63bb6..93a8dd13a 100644
--- a/modules/item/front/request/index.html
+++ b/modules/item/front/request/index.html
@@ -3,7 +3,7 @@
     url="/ticket/api/TicketRequests/filter"
     limit="20"
     data="requests"
-    order="shipped ASC, isOk ASC">
+    order="shipped DESC, isOk ASC">
 </vn-crud-model>
 <form name="form">
     <div class="vn-ma-md">

From b6d666d223a53e1226bb58241d7b215941156534 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Wed, 23 Oct 2019 07:14:12 +0200
Subject: [PATCH 40/41] removed IOS worker-time-controls endpoints

---
 .../worker-time-control/addAutoTime.js        |  48 -------
 .../worker-time-control/getHoursWorked.js     | 121 ------------------
 .../worker-time-control/getWorkedWeek.js      |  78 -----------
 .../worker/back/models/worker-time-control.js |   3 -
 4 files changed, 250 deletions(-)
 delete mode 100644 modules/worker/back/methods/worker-time-control/addAutoTime.js
 delete mode 100644 modules/worker/back/methods/worker-time-control/getHoursWorked.js
 delete mode 100644 modules/worker/back/methods/worker-time-control/getWorkedWeek.js

diff --git a/modules/worker/back/methods/worker-time-control/addAutoTime.js b/modules/worker/back/methods/worker-time-control/addAutoTime.js
deleted file mode 100644
index 7d58d2c22..000000000
--- a/modules/worker/back/methods/worker-time-control/addAutoTime.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-Author : Enrique Blasco BLanquer
-Date: 27 de mayo de 2019
-*/
-module.exports = Self => {
-    Self.remoteMethodCtx('addAutoTime', {
-        description: 'Adds a new hour registry by app in manual 0',
-        accessType: 'WRITE',
-        accepts: [{
-            arg: 'data',
-            type: 'object',
-            required: true,
-            description: 'timed',
-            http: {source: 'body'}
-        }],
-        returns: [{
-            type: 'Object',
-            root: true
-        }],
-        http: {
-            path: `/addAutoTime`,
-            verb: 'POST'
-        }
-    });
-
-    Self.addAutoTime = async(ctx, data) => {
-        const myUserId = ctx.req.accessToken.userId;
-
-        // get all worked time control, needed to calculate order
-        let hours = await Self.rawSql(`SELECT * FROM vn.workerTimeControl
-                                            WHERE userFk = ?
-                                            AND DATE(timed) = CURDATE()
-                                            ORDER BY timed DESC LIMIT 1`, [myUserId]);
-
-        // 1 get next order
-        let order = 0;
-        if (hours.length > 0)
-            order = hours[hours.length - 1].order;
-
-        // 2 create element in db
-        return Self.create({
-            userFk: myUserId,
-            timed: data.timed,
-            order: order + 1,
-            manual: 0
-        });
-    };
-};
diff --git a/modules/worker/back/methods/worker-time-control/getHoursWorked.js b/modules/worker/back/methods/worker-time-control/getHoursWorked.js
deleted file mode 100644
index 315b68cd1..000000000
--- a/modules/worker/back/methods/worker-time-control/getHoursWorked.js
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-Author : Enrique Blasco BLanquer
-Date: 28 de mayo de 2019
-*/
-module.exports = Self => {
-    Self.remoteMethodCtx('getHoursWorked', {
-        description: 'Get worked hours in current week, month and year',
-        accessType: 'WRITE',
-        returns: [{
-            type: 'Object',
-            root: true
-        }],
-        http: {
-            path: `/getHoursWorked`,
-            verb: 'GET'
-        }
-    });
-
-    Self.getHoursWorked = async(ctx, data) => {
-        let totalHours = 0; // total hours worked in one year
-        let totalMinutes = 0; // total minutes worked in one year
-        let totalHoursMonth = 0; // total hours worked in one month
-        let totalMinutesMonth = 0; // total minutes worked in one month
-        let totalHoursWeek = 0; // total hours worked in one week
-        let totalMinutesWeek = 0; // total minutes worked in one week
-        const myUserId = ctx.req.accessToken.userId; // user id
-        let today = new Date(); // needed to calculate total hours worked to current date
-        let fromDate = today.getFullYear() + '-01-01'; // from date, current year
-        let toDate = today.getFullYear() + '-12-31'; // to date, current year
-
-
-        // 1  hours worked in a year
-        let hoursYear = await Self.rawSql(`SELECT  wtc.userFk, DATE(wtc.timed) dated,  
-                                                    UNIX_TIMESTAMP(MIN(timed))timedStart,  
-                                                    SEC_TO_TIME(SUM(if( mod(wtc.order,2)=1, 
-                                                    UNIX_TIMESTAMP(timed) *-1, 
-                                                    UNIX_TIMESTAMP(timed)))) timeWorkDay 
-                                           FROM vn.workerTimeControl wtc 
-                                           WHERE wtc.timed BETWEEN ? AND ? AND userFk = ? 
-                                           GROUP BY wtc.userFk,dated ORDER BY dated DESC`, [fromDate, toDate, myUserId]);
-
-
-        // 2 Get days of week
-        let week = [];
-        // Starting Monday not Sunday
-        let current = new Date();
-        current.setDate((current.getDate() - current.getDay() + 1));
-        for (let i = 0; i < 7; i++) {
-            week.push(
-                new Date(current)
-            );
-            current.setDate(current.getDate() + 1);
-        }
-
-        // 3 I have all timed control for one year... NOW I CALCULATE  TOTAL HOURS IN YEAR, MONTH, WEEK, Let's GO!
-        for (hour of hoursYear) {
-            if (parseInt(hour.timeWorkDay.split(':')[0]) > 0) {
-                // YEAR
-                totalHours += parseInt(hour.timeWorkDay.split(':')[0]);
-                totalMinutes += parseInt(hour.timeWorkDay.split(':')[1]);
-                // If it exceeds 5 hours we add 20 minutes of breakfast.
-                if (parseInt(hour.timeWorkDay.split(':')[0]) >= 5)
-                    totalMinutes += 20;
-                // MONTH
-
-                if ((new Date(hour.dated)).getMonth() == today.getMonth()) {
-                    totalHoursMonth += parseInt(hour.timeWorkDay.split(':')[0]);
-                    totalMinutesMonth += parseInt(hour.timeWorkDay.split(':')[1]);
-                    // If it exceeds 5 hours we add 20 minutes of breakfast.
-                    if (parseInt(hour.timeWorkDay.split(':')[0]) >= 5)
-                        totalMinutesMonth += 20;
-                }
-                // WEEK
-                for (day of week) {
-                    let dayOfWeek = new Date(day);
-                    let dayOfCurrentWeek = new Date(hour.dated);
-                    if (dayOfWeek.getMonth() == dayOfCurrentWeek.getMonth() && dayOfWeek.getDate() == dayOfCurrentWeek.getDate()) {
-                        totalHoursWeek += parseInt(hour.timeWorkDay.split(':')[0]);
-                        totalMinutesWeek += parseInt(hour.timeWorkDay.split(':')[1]);
-                        // If it exceeds 5 hours we add 20 minutes of breakfast.
-                        if (parseInt(hour.timeWorkDay.split(':')[0]) >= 5)
-                            totalMinutesWeek += 20;
-                        break;
-                    }
-                }
-            }
-        }
-
-        // TOTAL WORKED HOURS IN THE YEAR
-        totalHours += totalMinutes / 60;
-        totalHours = decimalToHour(totalHours);
-
-        // TOTAL WORKED HOURS IN THE MONTH
-        totalHoursMonth += totalMinutesMonth / 60;
-        totalHoursMonth = decimalToHour(totalHoursMonth);
-
-        // TOTAL WORKED HOURS IN THE WEEK
-        totalHoursWeek += totalMinutesWeek / 60;
-        totalHoursWeek = decimalToHour(totalHoursWeek);
-
-        return {
-            'totalWorekdYear': totalHours,
-            'totalWorekdMonth': totalHoursMonth,
-            'totalWorkedWeek': totalHoursWeek
-        };
-    };
-};
-
-/*
-function to calculate hours and minutes from decimal value
-*/
-function decimalToHour(value) {
-    let decimalTime = parseFloat(value);
-    decimalTime = decimalTime * 60 * 60;
-    let hoursDay = Math.floor((decimalTime / (60 * 60)));
-    decimalTime = decimalTime - (hoursDay * 60 * 60);
-    let minutesDay = Math.floor((decimalTime / 60));
-    return hoursDay + ':' + minutesDay;
-}
-
-
diff --git a/modules/worker/back/methods/worker-time-control/getWorkedWeek.js b/modules/worker/back/methods/worker-time-control/getWorkedWeek.js
deleted file mode 100644
index 67e864344..000000000
--- a/modules/worker/back/methods/worker-time-control/getWorkedWeek.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-Author : Enrique Blasco BLanquer
-Date: 29 de mayo de 2019
-*/
-module.exports = Self => {
-    Self.remoteMethodCtx('getWorkedWeek', {
-        description: 'get worked week info',
-        accessType: 'WRITE',
-        returns: [{
-            type: 'Object',
-            root: true
-        }],
-        http: {
-            path: `/getWorkedWeek`,
-            verb: 'GET'
-        }
-    });
-
-    Self.getWorkedWeek = async(ctx, data) => {
-        const myUserId = ctx.req.accessToken.userId; // user id
-        let lastDate = new Date('1986-09-24'); // reference date
-        let diff = 0; // difference of value between two dates
-        let total = 0; // total hours
-
-        // 1 Get days of week
-        let week = [];
-        // 2 Starting Monday not Sunday
-        let current = new Date();
-        current.setDate((current.getDate() - current.getDay() + 1));
-        for (let i = 0; i < 7; i++) {
-            week.push(
-                new Date(current)
-            );
-            current.setDate(current.getDate() + 1);
-        }
-
-        let fromDate = week[0].getFullYear() + '-' + (week[0].getMonth() + 1) + '-' + week[0].getDate();
-        let toDate = week[week.length - 1].getFullYear() + '-' + (week[week.length - 1].getMonth() + 1) + '-' + week[week.length - 1].getDate();
-
-
-        // 3 hours worked in a current week
-        let hoursWeek = await Self.rawSql(`SELECT wtc.timed  ,wtc.order
-                                           FROM vn.workerTimeControl wtc 
-                                           WHERE userFk = ? 
-                                            AND DATE(timed) BETWEEN ? AND ? ORDER BY timed DESC;`, [myUserId, fromDate, toDate]);
-
-        // 4 treat data
-        let isFirst = true;
-        for (let i = hoursWeek.length - 1; i >= 0; i--) {
-            let d = new Date(hoursWeek[i].timed);
-            if (isFirst) {
-                lastDate = d;
-                isFirst = false;
-            } else {
-                if (lastDate.getDate() === d.getDate()) {
-                    diff += Math.abs(d.getTime() - lastDate.getTime());
-                    lastDate = d;
-                } else {
-                    total += diff;
-                    diff = 0;
-                    lastDate = d;
-                }
-            }
-        }
-        total += diff;
-
-        // 5 calculate hours and minutes
-        let decimalTime = total / 1000 / 3600;
-        decimalTime = decimalTime * 60 * 60;
-        let hours = Math.floor((decimalTime / (60 * 60)));
-        decimalTime = decimalTime - (hours * 60 * 60);
-        let minutes = Math.floor((decimalTime / 60));
-
-        return {'timeds': hoursWeek, 'totalWorked': hours + ':' + minutes};
-    };
-};
-
-
diff --git a/modules/worker/back/models/worker-time-control.js b/modules/worker/back/models/worker-time-control.js
index 4ec5bf8dd..4a065f430 100644
--- a/modules/worker/back/models/worker-time-control.js
+++ b/modules/worker/back/models/worker-time-control.js
@@ -3,9 +3,6 @@ const UserError = require('vn-loopback/util/user-error');
 module.exports = Self => {
     require('../methods/worker-time-control/filter')(Self);
     require('../methods/worker-time-control/addTime')(Self);
-    require('../methods/worker-time-control/addAutoTime')(Self);
-    require('../methods/worker-time-control/getHoursWorked')(Self);
-    require('../methods/worker-time-control/getWorkedWeek')(Self);
 
     Self.rewriteDbError(function(err) {
         if (err.code === 'ER_DUP_ENTRY')

From d1e8f5fb1c84457011327e9893f1ecb042f98058 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Wed, 23 Oct 2019 07:18:09 +0200
Subject: [PATCH 41/41] removed endpoints

---
 .../worker-time-control/specs/addAutoTime.spec.js     | 11 -----------
 .../worker-time-control/specs/getHoursWorked.spec.js  | 10 ----------
 .../worker-time-control/specs/getWorkedWeek.spec.js   | 10 ----------
 3 files changed, 31 deletions(-)
 delete mode 100644 modules/worker/back/methods/worker-time-control/specs/addAutoTime.spec.js
 delete mode 100644 modules/worker/back/methods/worker-time-control/specs/getHoursWorked.spec.js
 delete mode 100644 modules/worker/back/methods/worker-time-control/specs/getWorkedWeek.spec.js

diff --git a/modules/worker/back/methods/worker-time-control/specs/addAutoTime.spec.js b/modules/worker/back/methods/worker-time-control/specs/addAutoTime.spec.js
deleted file mode 100644
index bdc5d6ecb..000000000
--- a/modules/worker/back/methods/worker-time-control/specs/addAutoTime.spec.js
+++ /dev/null
@@ -1,11 +0,0 @@
-const app = require('vn-loopback/server/server');
-
-describe('workerTimeControl addAutoTime()', () => {
-    it('should return an undefined value', async() => {
-        let ctx = {req: {accessToken: {userId: 9}}};
-        let data = {'timed': new Date()};
-        let result = await app.models.WorkerTimeControl.addAutoTime(ctx, data);
-
-        expect(result).toBeUndefined();
-    });
-});
diff --git a/modules/worker/back/methods/worker-time-control/specs/getHoursWorked.spec.js b/modules/worker/back/methods/worker-time-control/specs/getHoursWorked.spec.js
deleted file mode 100644
index 2cfd28b77..000000000
--- a/modules/worker/back/methods/worker-time-control/specs/getHoursWorked.spec.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const app = require('vn-loopback/server/server');
-
-describe('workerTimeControl getHoursWorked()', () => {
-    it('should return an totalWorkedYear to be defined', async() => {
-        let ctx = {req: {accessToken: {userId: 9}}};
-        let result = await app.models.WorkerTimeControl.getHoursWorked(ctx, null);
-
-        expect(result.totalWorekdYear).toBeDefined();
-    });
-});
diff --git a/modules/worker/back/methods/worker-time-control/specs/getWorkedWeek.spec.js b/modules/worker/back/methods/worker-time-control/specs/getWorkedWeek.spec.js
deleted file mode 100644
index 4ea7bc727..000000000
--- a/modules/worker/back/methods/worker-time-control/specs/getWorkedWeek.spec.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const app = require('vn-loopback/server/server');
-
-describe('workerTimeControl getWorkedWeek()', () => {
-    it('should return an timeds to be defined', async() => {
-        let ctx = {req: {accessToken: {userId: 9}}};
-        let result = await app.models.WorkerTimeControl.getWorkedWeek(ctx, null);
-
-        expect(result.timeds).toBeDefined();
-    });
-});