From eb1bf5bf58bd9baec9e22bc0c2a28909d3108808 Mon Sep 17 00:00:00 2001
From: joan <joan@verdnatura.es>
Date: Fri, 16 Jul 2021 12:10:44 +0200
Subject: [PATCH 01/12] 2423 - Hide left menu

---
 front/salix/components/layout/index.html      |  2 +-
 front/salix/components/layout/style.scss      |  9 +++++---
 front/salix/components/side-menu/side-menu.js | 22 +++++++++++++++++--
 front/salix/components/side-menu/style.scss   | 17 +++++++-------
 4 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/front/salix/components/layout/index.html b/front/salix/components/layout/index.html
index cb0fb93b4..cd13c565e 100644
--- a/front/salix/components/layout/index.html
+++ b/front/salix/components/layout/index.html
@@ -3,7 +3,7 @@
         icon="menu"
         class="show-menu"
         ng-if="$ctrl.leftMenu"
-        ng-click="$ctrl.leftMenu.show()">
+        ng-click="$ctrl.leftMenu.toggle()">
     </vn-icon-button>
     <div class="side start">
         <a class="logo" ui-sref="home" title="{{'Home' | translate}}">
diff --git a/front/salix/components/layout/style.scss b/front/salix/components/layout/style.scss
index d12f3a5cd..4e342570a 100644
--- a/front/salix/components/layout/style.scss
+++ b/front/salix/components/layout/style.scss
@@ -46,7 +46,7 @@ vn-layout {
             justify-content: flex-end;
         }
         .show-menu {
-            display: none;
+            margin-right: 5px
         }
         .vn-button {
             color: inherit;
@@ -68,7 +68,7 @@ vn-layout {
         & > vn-topbar > .start {
             width: 80px + $menu-width;
         }
-        & > .main-view {
+        &.shown > .main-view {
             padding-left: $menu-width;
         }
     }
@@ -85,6 +85,8 @@ vn-layout {
     }
     & > .main-view {
         padding-top: $topbar-height;
+
+        transition: padding-left 200ms ease-out;
     }
     ui-view {
         & > * {
@@ -134,7 +136,8 @@ vn-layout {
             & > vn-topbar {
                 left: 0;
             }
-            & > .main-view {
+            & > .main-view,
+            &.shown > .main-view  {
                 padding-left: 0;
             }
         }
diff --git a/front/salix/components/side-menu/side-menu.js b/front/salix/components/side-menu/side-menu.js
index 0e683b4bb..4b363cd73 100644
--- a/front/salix/components/side-menu/side-menu.js
+++ b/front/salix/components/side-menu/side-menu.js
@@ -26,6 +26,11 @@ export default class SideMenu extends Component {
             this.layout.leftMenu = this;
             this.layout.element.classList.add('left-menu');
         }
+
+        const stateParts = this.$state.current.name.split('.');
+        if (stateParts[1] === 'card') this.show();
+
+        this.stateHandler = this.$transitions.onStart({}, t => this.onTransition(t));
     }
 
     $onDestroy() {
@@ -48,8 +53,19 @@ export default class SideMenu extends Component {
     }
 
     onTransition(transition) {
-        if (transition.from().name !== transition.to().name)
-            this.hide();
+        const stateParts = transition.to().name.split('.');
+
+        if (transition.from().name !== transition.to().name) {
+            if (stateParts[1] === 'card')
+                this.show();
+            else
+                this.hide();
+        }
+    }
+
+    toggle() {
+        if (this.shown) this.hide();
+        else this.show();
     }
 
     show() {
@@ -58,6 +74,7 @@ export default class SideMenu extends Component {
         this.handler = e => this.onEscape(e);
         this.$window.addEventListener('keydown', this.handler);
         this.stateHandler = this.$transitions.onStart({}, t => this.onTransition(t));
+        this.layout.element.classList.add('shown');
     }
 
     hide() {
@@ -65,6 +82,7 @@ export default class SideMenu extends Component {
         this.$window.removeEventListener('keydown', this.handler);
         this.stateHandler();
         this.shown = false;
+        this.layout.element.classList.remove('shown');
     }
 }
 
diff --git a/front/salix/components/side-menu/style.scss b/front/salix/components/side-menu/style.scss
index b9722d519..e11ed347a 100644
--- a/front/salix/components/side-menu/style.scss
+++ b/front/salix/components/side-menu/style.scss
@@ -14,28 +14,29 @@ vn-side-menu > .menu {
     box-shadow: 0 1px 3px $color-shadow;
     overflow: auto;
     top: $topbar-height;
+    transition: transform 200ms ease-out;
 
     &.left {
-        left: 0;
+        transform: translateZ(0) translateX(-$menu-width);
     }
     &.right {
-        right: 0;
+        transform: translateZ(0) translateX($menu-width);
+    }
+
+    &.shown {
+        transform: translateZ(0) translateX(0);
     }
 
     @media screen and (max-width: $mobile-width) {
-        transition: transform 200ms ease-out;
         z-index: 15;
         top: 0;
 
         &.left {
-            transform: translateZ(0) translateX(-$menu-width);
+            transform: 0;
         }
         &.right {
             top: 0;
-            transform: translateZ(0) translateX($menu-width);
-        }
-        &.shown {
-            transform: translateZ(0) translateX(0);
+            transform: 0;
         }
     }
 }

From 647f114c4ad5405b2ad36f403d63e5e8e954afa7 Mon Sep 17 00:00:00 2001
From: joan <joan@verdnatura.es>
Date: Mon, 19 Jul 2021 09:02:59 +0200
Subject: [PATCH 02/12] Hide menus on mobile version

---
 front/salix/components/layout/style.scss      |  6 +++-
 front/salix/components/side-menu/side-menu.js | 36 ++++++++++++++++---
 front/salix/components/side-menu/style.scss   |  2 ++
 3 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/front/salix/components/layout/style.scss b/front/salix/components/layout/style.scss
index 4e342570a..39a6783ac 100644
--- a/front/salix/components/layout/style.scss
+++ b/front/salix/components/layout/style.scss
@@ -46,7 +46,11 @@ vn-layout {
             justify-content: flex-end;
         }
         .show-menu {
-            margin-right: 5px
+            display: none;
+        }
+        & > .show-menu {
+            margin-right: 5px;
+            display: block
         }
         .vn-button {
             color: inherit;
diff --git a/front/salix/components/side-menu/side-menu.js b/front/salix/components/side-menu/side-menu.js
index 4b363cd73..7cf2fd9eb 100644
--- a/front/salix/components/side-menu/side-menu.js
+++ b/front/salix/components/side-menu/side-menu.js
@@ -12,6 +12,7 @@ export default class SideMenu extends Component {
     constructor($element, $) {
         super($element, $);
         this.side = 'left';
+        this.mobileWidth = 800;
     }
 
     $onInit() {
@@ -27,10 +28,30 @@ export default class SideMenu extends Component {
             this.layout.element.classList.add('left-menu');
         }
 
-        const stateParts = this.$state.current.name.split('.');
-        if (stateParts[1] === 'card') this.show();
-
+        // Eliminar todos los eventos keydown para prevenir pulsar escape despues de minimizar y maximizar ventana
         this.stateHandler = this.$transitions.onStart({}, t => this.onTransition(t));
+
+        const resizeHandler = target => {
+            const stateParts = this.$state.current.name.split('.');
+            const handler = e => this.onEscape(e);
+            if (target.innerWidth <= this.mobileWidth) {
+                this.handler = handler;
+                this.$window.addEventListener('keydown', this.handler);
+
+                this.hide();
+            } else {
+                this.$window.removeEventListener('keydown', handler);
+                if (this.side == 'right' || stateParts[1] === 'card')
+                    this.show();
+            }
+        };
+
+        this.$window.addEventListener('resize', event => {
+            resizeHandler(event.target);
+            this.$.$digest();
+        });
+
+        resizeHandler(this.$window);
     }
 
     $onDestroy() {
@@ -46,6 +67,7 @@ export default class SideMenu extends Component {
     }
 
     onEscape(event) {
+        console.log('onEscape');
         if (!event.defaultPrevented && event.key == 'Escape') {
             this.hide();
             this.$.$digest();
@@ -71,8 +93,12 @@ export default class SideMenu extends Component {
     show() {
         if (this.shown) return;
         this.shown = true;
-        this.handler = e => this.onEscape(e);
-        this.$window.addEventListener('keydown', this.handler);
+
+        if (this.$window.innerWidth <= this.mobileWidth) {
+            this.handler = e => this.onEscape(e);
+            this.$window.addEventListener('keydown', this.handler);
+        }
+
         this.stateHandler = this.$transitions.onStart({}, t => this.onTransition(t));
         this.layout.element.classList.add('shown');
     }
diff --git a/front/salix/components/side-menu/style.scss b/front/salix/components/side-menu/style.scss
index e11ed347a..f94bd50b5 100644
--- a/front/salix/components/side-menu/style.scss
+++ b/front/salix/components/side-menu/style.scss
@@ -18,9 +18,11 @@ vn-side-menu > .menu {
 
     &.left {
         transform: translateZ(0) translateX(-$menu-width);
+        left: 0
     }
     &.right {
         transform: translateZ(0) translateX($menu-width);
+        right: 0
     }
 
     &.shown {

From 558c79315f33333e652ee62d77236477903796ce Mon Sep 17 00:00:00 2001
From: joan <joan@verdnatura.es>
Date: Mon, 18 Oct 2021 09:31:25 +0200
Subject: [PATCH 03/12] changes

---
 front/salix/components/layout/style.scss      |  6 +++-
 front/salix/components/side-menu/side-menu.js | 35 ++-----------------
 front/salix/components/side-menu/style.scss   | 13 +++----
 3 files changed, 14 insertions(+), 40 deletions(-)

diff --git a/front/salix/components/layout/style.scss b/front/salix/components/layout/style.scss
index 39a6783ac..aa35f8d14 100644
--- a/front/salix/components/layout/style.scss
+++ b/front/salix/components/layout/style.scss
@@ -72,9 +72,13 @@ vn-layout {
         & > vn-topbar > .start {
             width: 80px + $menu-width;
         }
-        &.shown > .main-view {
+        & > .main-view {
             padding-left: $menu-width;
         }
+
+        &.shown > .main-view {
+            padding-left: 0;
+        }
     }
     &.right-menu {
         & > vn-topbar > .end {
diff --git a/front/salix/components/side-menu/side-menu.js b/front/salix/components/side-menu/side-menu.js
index 7cf2fd9eb..cef43430b 100644
--- a/front/salix/components/side-menu/side-menu.js
+++ b/front/salix/components/side-menu/side-menu.js
@@ -27,31 +27,6 @@ export default class SideMenu extends Component {
             this.layout.leftMenu = this;
             this.layout.element.classList.add('left-menu');
         }
-
-        // Eliminar todos los eventos keydown para prevenir pulsar escape despues de minimizar y maximizar ventana
-        this.stateHandler = this.$transitions.onStart({}, t => this.onTransition(t));
-
-        const resizeHandler = target => {
-            const stateParts = this.$state.current.name.split('.');
-            const handler = e => this.onEscape(e);
-            if (target.innerWidth <= this.mobileWidth) {
-                this.handler = handler;
-                this.$window.addEventListener('keydown', this.handler);
-
-                this.hide();
-            } else {
-                this.$window.removeEventListener('keydown', handler);
-                if (this.side == 'right' || stateParts[1] === 'card')
-                    this.show();
-            }
-        };
-
-        this.$window.addEventListener('resize', event => {
-            resizeHandler(event.target);
-            this.$.$digest();
-        });
-
-        resizeHandler(this.$window);
     }
 
     $onDestroy() {
@@ -75,14 +50,8 @@ export default class SideMenu extends Component {
     }
 
     onTransition(transition) {
-        const stateParts = transition.to().name.split('.');
-
-        if (transition.from().name !== transition.to().name) {
-            if (stateParts[1] === 'card')
-                this.show();
-            else
-                this.hide();
-        }
+        if (transition.from().name !== transition.to().name)
+            this.hide();
     }
 
     toggle() {
diff --git a/front/salix/components/side-menu/style.scss b/front/salix/components/side-menu/style.scss
index f94bd50b5..50066309a 100644
--- a/front/salix/components/side-menu/style.scss
+++ b/front/salix/components/side-menu/style.scss
@@ -17,16 +17,14 @@ vn-side-menu > .menu {
     transition: transform 200ms ease-out;
 
     &.left {
-        transform: translateZ(0) translateX(-$menu-width);
         left: 0
     }
     &.right {
-        transform: translateZ(0) translateX($menu-width);
-        right: 0
+        right: 0;
     }
 
     &.shown {
-        transform: translateZ(0) translateX(0);
+        transform: translateZ(0) translateX(-$menu-width);
     }
 
     @media screen and (max-width: $mobile-width) {
@@ -34,11 +32,14 @@ vn-side-menu > .menu {
         top: 0;
 
         &.left {
-            transform: 0;
+            transform: translateZ(0) translateX(-$menu-width);
         }
         &.right {
             top: 0;
-            transform: 0;
+            transform: translateZ(0) translateX($menu-width);
+        }
+        &.shown {
+            transform: translateZ(0) translateX(0);
         }
     }
 }

From faa8269228c597af4e14258f128221768779705b Mon Sep 17 00:00:00 2001
From: carlosjr <carlosjr@verdnatura.es>
Date: Mon, 18 Oct 2021 11:49:26 +0200
Subject: [PATCH 04/12] refactor(e2e): added waitForTimeout on descriptor more
 menus

---
 e2e/paths/04-item/08_regularize.spec.js   | 1 +
 e2e/paths/05-ticket/12_descriptor.spec.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/e2e/paths/04-item/08_regularize.spec.js b/e2e/paths/04-item/08_regularize.spec.js
index d7bab3b7b..a18f81e53 100644
--- a/e2e/paths/04-item/08_regularize.spec.js
+++ b/e2e/paths/04-item/08_regularize.spec.js
@@ -38,6 +38,7 @@ describe('Item regularize path', () => {
     });
 
     it('should open the regularize dialog and check the warehouse matches the local user settings', async() => {
+        await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
         await page.waitToClick(selectors.itemDescriptor.moreMenu);
         await page.waitToClick(selectors.itemDescriptor.moreMenuRegularizeButton);
         const result = await page.waitToGetProperty(selectors.itemDescriptor.regularizeWarehouse, 'value');
diff --git a/e2e/paths/05-ticket/12_descriptor.spec.js b/e2e/paths/05-ticket/12_descriptor.spec.js
index dcca61eab..e63d4f431 100644
--- a/e2e/paths/05-ticket/12_descriptor.spec.js
+++ b/e2e/paths/05-ticket/12_descriptor.spec.js
@@ -41,6 +41,7 @@ describe('Ticket descriptor path', () => {
         });
 
         it('should delete the ticket using the descriptor menu', async() => {
+            await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
             await page.waitToClick(selectors.ticketDescriptor.moreMenu);
             await page.waitToClick(selectors.ticketDescriptor.moreMenuDeleteTicket);
             await page.waitToClick(selectors.ticketDescriptor.acceptDialog);
@@ -183,7 +184,6 @@ describe('Ticket descriptor path', () => {
         it('should send the payment SMS using the descriptor menu', async() => {
             await page.waitForTimeout(2000); // initialization of functionality takes about 1000ms to work
             await page.waitToClick(selectors.ticketDescriptor.moreMenu);
-            await page.waitForContentLoaded();
             await page.waitToClick(selectors.ticketDescriptor.moreMenuPaymentSMS);
             await page.waitForSelector(selectors.ticketDescriptor.SMStext);
             await page.waitPropertyLength(selectors.ticketDescriptor.SMStext, 'value', 128);

From cec04a307da2c60622dde2ff9d7db97cbd89b000 Mon Sep 17 00:00:00 2001
From: carlosjr <carlosjr@verdnatura.es>
Date: Mon, 18 Oct 2021 12:05:38 +0200
Subject: [PATCH 05/12] refactor:(item): deprecation of isBargain and isOnOffer
 columns at model and fixtures

---
 db/dump/fixtures.sql               | 36 +++++++++++++++---------------
 modules/item/back/models/item.json |  8 -------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index 1635335c4..66bd821cf 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -795,25 +795,25 @@ INSERT INTO `vn`.`itemFamily`(`code`, `description`)
         ('SER', 'Services'),
         ('VT',  'Sales');
 
-INSERT INTO `vn`.`item`(`id`, `typeFk`, `size`, `inkFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `isOnOffer`, `expenceFk`, `isBargain`, `comment`, `relevancy`, `image`, `subName`, `minPrice`, `stars`, `family`)
+INSERT INTO `vn`.`item`(`id`, `typeFk`, `size`, `inkFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `expenceFk`, `comment`, `relevancy`, `image`, `subName`, `minPrice`, `stars`, `family`)
     VALUES
-        (1,  2, 70,   'YEL', 1,    1, NULL,              1,    06021010, 0, 2000000000, 0, NULL, 0, '1',  NULL, 0, 1, 'VT'),
-        (2,  2, 70,   'BLU', 1,    2, NULL,              1,    06021010, 0, 2000000000, 0, NULL, 0, '2',  NULL, 0, 2, 'VT'),
-        (3,  1, 60,   'YEL', 1,    3, NULL,              1,    05080000, 0, 4751000000, 0, NULL, 0, '3',  NULL, 0, 5, 'VT'),
-        (4,  1, 60,   'YEL', 1,    1, 'Increases block', 1,    05080000, 1, 4751000000, 0, NULL, 0, '4',  NULL, 0, 3, 'VT'),
-        (5,  3, 30,   'RED', 1,    2, NULL,              2,    06021010, 1, 4751000000, 0, NULL, 0, '5',  NULL, 0, 3, 'VT'),
-        (6,  5, 30,   'RED', 1,    2, NULL,              NULL, 06021010, 0, 4751000000, 0, NULL, 0, '6',  NULL, 0, 4, 'VT'),
-        (7,  5, 90,   'BLU', 1,    2, NULL,              NULL, 06021010, 0, 4751000000, 0, NULL, 0, '7',  NULL, 0, 4, 'VT'),
-        (8,  2, 70,   'YEL', 1,    1, NULL,              1,    06021010, 0, 2000000000, 0, NULL, 0, '8',  NULL, 0, 5, 'VT'),
-        (9,  2, 70,   'BLU', 1,    2, NULL,              1,    06021010, 0, 2000000000, 0, NULL, 0, '9',  NULL, 0, 4, 'VT'),
-        (10, 1, 60,   'YEL', 1,    3, NULL,              1,    05080000, 0, 4751000000, 0, NULL, 0, '10', NULL, 0, 4, 'VT'),
-        (11, 1, 60,   'YEL', 1,    1, NULL,              1,    05080000, 1, 4751000000, 0, NULL, 0, '11', NULL, 0, 4, 'VT'),
-        (12, 3, 30,   'RED', 1,    2, NULL,              2,    06021010, 1, 4751000000, 0, NULL, 0, '12', NULL, 0, 3, 'VT'),
-        (13, 5, 30,   'RED', 1,    2, NULL,              NULL, 06021010, 0, 4751000000, 0, NULL, 0, '13', NULL, 0, 2, 'VT'),
-        (14, 5, 90,   'BLU', 1,    2, NULL,              NULL, 06021010, 0, 4751000000, 0, NULL, 0, '',   NULL, 0, 4, 'VT'),
-        (15, 4, NULL,  NULL, NULL, 1, NULL,              NULL, 06021010, 0, 4751000000, 0, NULL, 0, '',   NULL, 0, 0, 'EMB'),
-        (16, 4, NULL,  NULL, NULL, 1, NULL,              NULL, 06021010, 0, 4751000000, 0, NULL, 0, '',   NULL, 0, 0, 'EMB'),
-        (71, 4, NULL,  NULL, NULL, 1, NULL,              NULL, 06021010, 1, 4751000000, 0, NULL, 0, '',   NULL, 0, 0, 'VT');
+        (1,  2, 70,   'YEL', 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '1',  NULL, 0, 1, 'VT'),
+        (2,  2, 70,   'BLU', 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '2',  NULL, 0, 2, 'VT'),
+        (3,  1, 60,   'YEL', 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '3',  NULL, 0, 5, 'VT'),
+        (4,  1, 60,   'YEL', 1,    1, 'Increases block', 1,    05080000, 4751000000, NULL, 0, '4',  NULL, 0, 3, 'VT'),
+        (5,  3, 30,   'RED', 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '5',  NULL, 0, 3, 'VT'),
+        (6,  5, 30,   'RED', 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '6',  NULL, 0, 4, 'VT'),
+        (7,  5, 90,   'BLU', 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '7',  NULL, 0, 4, 'VT'),
+        (8,  2, 70,   'YEL', 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '8',  NULL, 0, 5, 'VT'),
+        (9,  2, 70,   'BLU', 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '9',  NULL, 0, 4, 'VT'),
+        (10, 1, 60,   'YEL', 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '10', NULL, 0, 4, 'VT'),
+        (11, 1, 60,   'YEL', 1,    1, NULL,              1,    05080000, 4751000000, NULL, 0, '11', NULL, 0, 4, 'VT'),
+        (12, 3, 30,   'RED', 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '12', NULL, 0, 3, 'VT'),
+        (13, 5, 30,   'RED', 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '13', NULL, 0, 2, 'VT'),
+        (14, 5, 90,   'BLU', 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 4, 'VT'),
+        (15, 4, NULL,  NULL, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 0, 'EMB'),
+        (16, 4, NULL,  NULL, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 0, 'EMB'),
+        (71, 4, NULL,  NULL, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 0, 'VT');
 
 -- Update the taxClass after insert of the items
 UPDATE `vn`.`itemTaxCountry` SET `taxClassFk` = 2
diff --git a/modules/item/back/models/item.json b/modules/item/back/models/item.json
index 1c09ca4f4..d39b39178 100644
--- a/modules/item/back/models/item.json
+++ b/modules/item/back/models/item.json
@@ -41,14 +41,6 @@
             "type": "string",
             "description": "Description"
         },
-        "isOnOffer": {
-            "type": "boolean",
-            "description": "Offer"
-        },
-        "isBargain": {
-            "type": "boolean",
-            "description": "Bargain"
-        },
         "isActive": {
             "type": "boolean",
             "description": "Active"

From 81bcc9202db1acca8e3f6fb807685daea67e4d5e Mon Sep 17 00:00:00 2001
From: joan <joan@verdnatura.es>
Date: Mon, 18 Oct 2021 14:17:53 +0200
Subject: [PATCH 06/12] Removed console.log()

---
 front/salix/components/side-menu/side-menu.js | 1 -
 print/templates/reports/invoice/invoice.js    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/front/salix/components/side-menu/side-menu.js b/front/salix/components/side-menu/side-menu.js
index cef43430b..549837c59 100644
--- a/front/salix/components/side-menu/side-menu.js
+++ b/front/salix/components/side-menu/side-menu.js
@@ -42,7 +42,6 @@ export default class SideMenu extends Component {
     }
 
     onEscape(event) {
-        console.log('onEscape');
         if (!event.defaultPrevented && event.key == 'Escape') {
             this.hide();
             this.$.$digest();
diff --git a/print/templates/reports/invoice/invoice.js b/print/templates/reports/invoice/invoice.js
index 3e8734306..b56a5533c 100755
--- a/print/templates/reports/invoice/invoice.js
+++ b/print/templates/reports/invoice/invoice.js
@@ -95,7 +95,6 @@ module.exports = {
         },
         ticketSubtotal(ticket) {
             let subTotal = 0.00;
-            console.log(ticket.sales);
             for (let sale of ticket.sales)
                 subTotal += this.saleImport(sale);
 

From f87c8989e4cb27b78ff0bf9fc8ba4b8070efdee6 Mon Sep 17 00:00:00 2001
From: joan <joan@verdnatura.es>
Date: Mon, 18 Oct 2021 14:23:37 +0200
Subject: [PATCH 07/12] Event rollback

---
 front/salix/components/side-menu/side-menu.js | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/front/salix/components/side-menu/side-menu.js b/front/salix/components/side-menu/side-menu.js
index 549837c59..3af3ce9df 100644
--- a/front/salix/components/side-menu/side-menu.js
+++ b/front/salix/components/side-menu/side-menu.js
@@ -12,7 +12,6 @@ export default class SideMenu extends Component {
     constructor($element, $) {
         super($element, $);
         this.side = 'left';
-        this.mobileWidth = 800;
     }
 
     $onInit() {
@@ -61,12 +60,8 @@ export default class SideMenu extends Component {
     show() {
         if (this.shown) return;
         this.shown = true;
-
-        if (this.$window.innerWidth <= this.mobileWidth) {
-            this.handler = e => this.onEscape(e);
-            this.$window.addEventListener('keydown', this.handler);
-        }
-
+        this.handler = e => this.onEscape(e);
+        this.$window.addEventListener('keydown', this.handler);
         this.stateHandler = this.$transitions.onStart({}, t => this.onTransition(t));
         this.layout.element.classList.add('shown');
     }

From e3942c0bb9280c76ae7e5e2906610e7e92cedaa3 Mon Sep 17 00:00:00 2001
From: carlosjr <carlosjr@verdnatura.es>
Date: Tue, 19 Oct 2021 10:58:58 +0200
Subject: [PATCH 08/12] refactor(thermograph): empty fields handler added and
 correct usage of thermograph.code

---
 db/dump/fixtures.sql                             |  4 ++--
 modules/travel/front/thermograph/create/index.js | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index 66bd821cf..008434dd6 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -2232,8 +2232,8 @@ INSERT IGNORE INTO `vn`.`greugeConfig` (`id`, `freightPickUpPrice`) VALUES ('1',
 
 INSERT INTO `vn`.`temperature`(`code`, `name`, `description`)
     VALUES
-        ('WARM', 'Warm', 'Warm'),
-        ('COOL', 'Cool', 'Cool');
+        ('warm', 'Warm', 'Warm'),
+        ('cool', 'Cool', 'Cool');
         
 INSERT INTO `vn`.`thermograph`(`id`, `model`)
     VALUES
diff --git a/modules/travel/front/thermograph/create/index.js b/modules/travel/front/thermograph/create/index.js
index b6d78fc50..fa2c1261a 100644
--- a/modules/travel/front/thermograph/create/index.js
+++ b/modules/travel/front/thermograph/create/index.js
@@ -1,5 +1,6 @@
 import ngModule from '../../module';
 import Section from 'salix/components/section';
+import UserError from 'core/lib/user-error';
 
 class Controller extends Section {
     constructor($element, $) {
@@ -56,7 +57,7 @@ class Controller extends Section {
     }
 
     onAddThermographClick(event) {
-        const defaultTemperature = 'COOL';
+        const defaultTemperature = 'cool';
         const defaultModel = 'DISPOSABLE';
 
         event.preventDefault();
@@ -72,6 +73,15 @@ class Controller extends Section {
     }
 
     onNewThermographAccept() {
+        const hasMissingField =
+            !this.newThermograph.thermographId ||
+            !this.newThermograph.warehouseId ||
+            !this.newThermograph.temperatureFk ||
+            !this.newThermograph.model;
+
+        if (hasMissingField)
+            throw new UserError(`Some fields are invalid`);
+
         return this.$http.post(`Thermographs/createThermograph`, this.newThermograph)
             .then(res => this.dms.thermographId = res.data.id);
     }

From 5be2eb974f9d03328ebed6c589a59e727829b7aa Mon Sep 17 00:00:00 2001
From: carlosjr <carlosjr@verdnatura.es>
Date: Tue, 19 Oct 2021 11:08:03 +0200
Subject: [PATCH 09/12] refactor(test): adapted the new thermograph front unit
 test to expect thermograph data to be defined

---
 .../front/thermograph/create/index.spec.js    | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/modules/travel/front/thermograph/create/index.spec.js b/modules/travel/front/thermograph/create/index.spec.js
index c2b94d3e8..1ad263d31 100644
--- a/modules/travel/front/thermograph/create/index.spec.js
+++ b/modules/travel/front/thermograph/create/index.spec.js
@@ -79,8 +79,24 @@ describe('Ticket', () => {
         });
 
         describe('onNewThermographAccept()', () => {
-            it('should set the created thermograph id on to the controller for the autocomplete to use it', () => {
-                const response = {id: 'the created id'};
+            it('should set the created thermograph data on to the controller for the autocomplete to use it', () => {
+                const id = 'the created id';
+                const warehouseId = 1;
+                const temperatureId = 'cool';
+                const model = 'my model';
+
+                controller.newThermograph = {
+                    thermographId: id,
+                    warehouseId: warehouseId,
+                    temperatureFk: temperatureId,
+                    model: model
+                };
+                const response = {
+                    id: id,
+                    warehouseId: warehouseId,
+                    temperatureFk: temperatureId,
+                    model: model
+                };
                 $httpBackend.when('POST', `Thermographs/createThermograph`).respond(response);
                 controller.onNewThermographAccept();
                 $httpBackend.flush();

From da00b231ba28b29e1603ec44cafbf0ff5388f7f4 Mon Sep 17 00:00:00 2001
From: carlosjr <carlosjr@verdnatura.es>
Date: Tue, 19 Oct 2021 13:00:24 +0200
Subject: [PATCH 10/12] refactor(puppeteer): added slowMo 5 to puppeteer
 actions for stability

---
 e2e/helpers/puppeteer.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/e2e/helpers/puppeteer.js b/e2e/helpers/puppeteer.js
index 70546b080..f562cf588 100644
--- a/e2e/helpers/puppeteer.js
+++ b/e2e/helpers/puppeteer.js
@@ -5,10 +5,11 @@ import {url as defaultURL} from './config';
 
 export async function getBrowser() {
     const args = [
-        '--no-sandbox',
         `--window-size=${ 1920 },${ 1080 }`,
-        '--single-process',
-        '--no-zygote'
+        // '--disable-gpu'
+        // '--no-sandbox',
+        // '--single-process',
+        // '--no-zygote',
         // '--disable-dev-shm-usage'
         // '--full-memory-crash-report',
         // '--unlimited-storage'
@@ -26,7 +27,7 @@ export async function getBrowser() {
         args,
         defaultViewport: null,
         headless: headless,
-        slowMo: 0, // slow down by ms
+        slowMo: 5, // slow down by ms
         // ignoreDefaultArgs: ['--disable-extensions'],
         // executablePath: '/usr/bin/google-chrome-stable',
         // executablePath: '/usr/bin/firefox-developer-edition',

From 4a47c136a09dbe1742b2dd7adf9e7b0c26e647f7 Mon Sep 17 00:00:00 2001
From: carlosjr <carlosjr@verdnatura.es>
Date: Tue, 19 Oct 2021 13:11:31 +0200
Subject: [PATCH 11/12] refactor(e2e): removed waitForTimeout from e2e paths

---
 e2e/paths/04-item/08_regularize.spec.js                  | 2 --
 e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js         | 4 +---
 e2e/paths/05-ticket/09_weekly.spec.js                    | 2 --
 e2e/paths/05-ticket/12_descriptor.spec.js                | 8 --------
 e2e/paths/05-ticket/14_create_ticket.spec.js             | 2 --
 e2e/paths/05-ticket/15_create_ticket_from_client.spec.js | 1 -
 e2e/paths/09-invoice-in/02_descriptor.spec.js            | 2 --
 e2e/paths/09-invoice-out/02_descriptor.spec.js           | 1 -
 e2e/paths/09-invoice-out/03_manualInvoice.spec.js        | 3 ---
 e2e/paths/10-travel/03_descriptor.spec.js                | 3 ---
 e2e/paths/11-zone/02_descriptor.spec.js                  | 1 -
 e2e/paths/14-account/01_create_and_basic_data.spec.js    | 2 --
 12 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/e2e/paths/04-item/08_regularize.spec.js b/e2e/paths/04-item/08_regularize.spec.js
index a18f81e53..97c45643f 100644
--- a/e2e/paths/04-item/08_regularize.spec.js
+++ b/e2e/paths/04-item/08_regularize.spec.js
@@ -38,7 +38,6 @@ describe('Item regularize path', () => {
     });
 
     it('should open the regularize dialog and check the warehouse matches the local user settings', async() => {
-        await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
         await page.waitToClick(selectors.itemDescriptor.moreMenu);
         await page.waitToClick(selectors.itemDescriptor.moreMenuRegularizeButton);
         const result = await page.waitToGetProperty(selectors.itemDescriptor.regularizeWarehouse, 'value');
@@ -108,7 +107,6 @@ describe('Item regularize path', () => {
     });
 
     it('should regularize the item once more', async() => {
-        await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
         await page.waitToClick(selectors.itemDescriptor.moreMenu);
         await page.waitToClick(selectors.itemDescriptor.moreMenuRegularizeButton);
         await page.write(selectors.itemDescriptor.regularizeQuantity, '100');
diff --git a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js b/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js
index 0ce803bea..55bbdf9ff 100644
--- a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js
+++ b/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js
@@ -196,7 +196,6 @@ describe('Ticket Edit sale path', () => {
     });
 
     it('should select the third sale and create a claim of it', async() => {
-        await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
         await page.waitToClick(selectors.ticketSales.thirdSaleCheckbox);
         await page.waitToClick(selectors.ticketSales.moreMenu);
         await page.waitToClick(selectors.ticketSales.moreMenuCreateClaim);
@@ -355,7 +354,7 @@ describe('Ticket Edit sale path', () => {
 
     it('should mark the first sale as reserved', async() => {
         await page.waitToClick(selectors.ticketSales.firstSaleCheckbox);
-        await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
+
         await page.waitToClick(selectors.ticketSales.moreMenu);
         await page.waitToClick(selectors.ticketSales.moreMenuReserve);
         await page.closePopup();
@@ -366,7 +365,6 @@ describe('Ticket Edit sale path', () => {
     });
 
     it('should unmark the first sale as reserved', async() => {
-        await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
         await page.waitToClick(selectors.ticketSales.moreMenu);
         await page.waitToClick(selectors.ticketSales.moreMenuUnmarkReseved);
         await page.waitForClassPresent(selectors.ticketSales.firstSaleReservedIcon, 'ng-hide');
diff --git a/e2e/paths/05-ticket/09_weekly.spec.js b/e2e/paths/05-ticket/09_weekly.spec.js
index be5b1e153..2392de28f 100644
--- a/e2e/paths/05-ticket/09_weekly.spec.js
+++ b/e2e/paths/05-ticket/09_weekly.spec.js
@@ -28,7 +28,6 @@ describe('Ticket descriptor path', () => {
     });
 
     it('should add the ticket to thursday turn using the descriptor more menu', async() => {
-        await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
         await page.waitToClick(selectors.ticketDescriptor.moreMenu);
         await page.waitToClick(selectors.ticketDescriptor.moreMenuAddToTurn);
         await page.waitToClick(selectors.ticketDescriptor.thursdayButton);
@@ -64,7 +63,6 @@ describe('Ticket descriptor path', () => {
     });
 
     it('should add the ticket to saturday turn using the descriptor more menu', async() => {
-        await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
         await page.waitToClick(selectors.ticketDescriptor.moreMenu);
         await page.waitToClick(selectors.ticketDescriptor.moreMenuAddToTurn);
         await page.waitToClick(selectors.ticketDescriptor.saturdayButton);
diff --git a/e2e/paths/05-ticket/12_descriptor.spec.js b/e2e/paths/05-ticket/12_descriptor.spec.js
index e63d4f431..3429acc89 100644
--- a/e2e/paths/05-ticket/12_descriptor.spec.js
+++ b/e2e/paths/05-ticket/12_descriptor.spec.js
@@ -22,7 +22,6 @@ describe('Ticket descriptor path', () => {
         });
 
         it(`should update the shipped hour using the descriptor menu`, async() => {
-            await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
             await page.waitToClick(selectors.ticketDescriptor.moreMenu);
             await page.waitToClick(selectors.ticketDescriptor.moreMenuChangeShippedHour);
             await page.pickTime(selectors.ticketDescriptor.changeShippedHour, '08:15');
@@ -41,7 +40,6 @@ describe('Ticket descriptor path', () => {
         });
 
         it('should delete the ticket using the descriptor menu', async() => {
-            await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
             await page.waitToClick(selectors.ticketDescriptor.moreMenu);
             await page.waitToClick(selectors.ticketDescriptor.moreMenuDeleteTicket);
             await page.waitToClick(selectors.ticketDescriptor.acceptDialog);
@@ -67,7 +65,6 @@ describe('Ticket descriptor path', () => {
 
     describe('Restore ticket', () => {
         it('should restore the ticket using the descriptor menu', async() => {
-            await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
             await page.waitToClick(selectors.ticketDescriptor.moreMenu);
             await page.waitToClick(selectors.ticketDescriptor.moreMenuRestoreTicket);
             await page.waitToClick(selectors.ticketDescriptor.acceptDialog);
@@ -85,7 +82,6 @@ describe('Ticket descriptor path', () => {
         });
 
         it('should open the add stowaway dialog', async() => {
-            await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
             await page.waitForFunction(() => {
                 let element = document.querySelector('vn-ticket-descriptor-menu');
                 return element.$ctrl.canShowStowaway === true;
@@ -118,7 +114,6 @@ describe('Ticket descriptor path', () => {
         });
 
         it('should delete the stowaway', async() => {
-            await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
             await page.waitToClick(selectors.ticketDescriptor.moreMenu);
             await page.waitForContentLoaded();
             await page.waitToClick(selectors.ticketDescriptor.moreMenuDeleteStowawayButton);
@@ -150,7 +145,6 @@ describe('Ticket descriptor path', () => {
         });
 
         it('should invoice the ticket using the descriptor menu', async() => {
-            await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
             await page.waitToClick(selectors.ticketDescriptor.moreMenu);
             await page.waitForContentLoaded();
             await page.waitToClick(selectors.ticketDescriptor.moreMenuMakeInvoice);
@@ -182,7 +176,6 @@ describe('Ticket descriptor path', () => {
 
     describe('SMS', () => {
         it('should send the payment SMS using the descriptor menu', async() => {
-            await page.waitForTimeout(2000); // initialization of functionality takes about 1000ms to work
             await page.waitToClick(selectors.ticketDescriptor.moreMenu);
             await page.waitToClick(selectors.ticketDescriptor.moreMenuPaymentSMS);
             await page.waitForSelector(selectors.ticketDescriptor.SMStext);
@@ -194,7 +187,6 @@ describe('Ticket descriptor path', () => {
         });
 
         it('should send the import SMS using the descriptor menu', async() => {
-            await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
             await page.waitToClick(selectors.ticketDescriptor.moreMenu);
             await page.waitForContentLoaded();
             await page.waitToClick(selectors.ticketDescriptor.moreMenuSendImportSms);
diff --git a/e2e/paths/05-ticket/14_create_ticket.spec.js b/e2e/paths/05-ticket/14_create_ticket.spec.js
index 1c0e10e6d..bfaa08775 100644
--- a/e2e/paths/05-ticket/14_create_ticket.spec.js
+++ b/e2e/paths/05-ticket/14_create_ticket.spec.js
@@ -62,7 +62,6 @@ describe('Ticket create path', () => {
     });
 
     it('should make the previously created ticket the stowaway of the current ticket', async() => {
-        await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
         await page.waitToClick(selectors.ticketDescriptor.moreMenu);
         await page.waitToClick(selectors.ticketDescriptor.moreMenuAddStowaway);
         await page.waitToClick(selectors.ticketDescriptor.addStowawayDialogFirstTicket);
@@ -72,7 +71,6 @@ describe('Ticket create path', () => {
     });
 
     it('should delete the current ticket', async() => {
-        await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
         await page.waitToClick(selectors.ticketDescriptor.moreMenu);
         await page.waitToClick(selectors.ticketDescriptor.moreMenuDeleteTicket);
         await page.waitToClick(selectors.ticketDescriptor.acceptDialog);
diff --git a/e2e/paths/05-ticket/15_create_ticket_from_client.spec.js b/e2e/paths/05-ticket/15_create_ticket_from_client.spec.js
index a27050daa..a68ce894e 100644
--- a/e2e/paths/05-ticket/15_create_ticket_from_client.spec.js
+++ b/e2e/paths/05-ticket/15_create_ticket_from_client.spec.js
@@ -17,7 +17,6 @@ describe('Ticket create from client path', () => {
     });
 
     it('should click the create simple ticket on the descriptor menu', async() => {
-        await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
         await page.waitToClick(selectors.clientDescriptor.moreMenu);
         await page.waitToClick(selectors.clientDescriptor.simpleTicketButton);
         await page.waitForState('ticket.create');
diff --git a/e2e/paths/09-invoice-in/02_descriptor.spec.js b/e2e/paths/09-invoice-in/02_descriptor.spec.js
index 28b8e7ae3..02bbce7ac 100644
--- a/e2e/paths/09-invoice-in/02_descriptor.spec.js
+++ b/e2e/paths/09-invoice-in/02_descriptor.spec.js
@@ -18,7 +18,6 @@ describe('InvoiceIn descriptor path', () => {
     });
 
     it('should clone the invoiceIn using the descriptor more menu', async() => {
-        await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
         await page.waitToClick(selectors.invoiceInDescriptor.moreMenu);
         await page.waitToClick(selectors.invoiceInDescriptor.moreMenuCloneInvoiceIn);
         await page.waitToClick(selectors.invoiceInDescriptor.acceptButton);
@@ -32,7 +31,6 @@ describe('InvoiceIn descriptor path', () => {
     });
 
     it('should delete the cloned invoiceIn using the descriptor more menu', async() => {
-        await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
         await page.waitToClick(selectors.invoiceInDescriptor.moreMenu);
         await page.waitToClick(selectors.invoiceInDescriptor.moreMenuDeleteInvoiceIn);
         await page.waitToClick(selectors.invoiceInDescriptor.acceptButton);
diff --git a/e2e/paths/09-invoice-out/02_descriptor.spec.js b/e2e/paths/09-invoice-out/02_descriptor.spec.js
index 222237b4f..8d403e083 100644
--- a/e2e/paths/09-invoice-out/02_descriptor.spec.js
+++ b/e2e/paths/09-invoice-out/02_descriptor.spec.js
@@ -38,7 +38,6 @@ describe('InvoiceOut descriptor path', () => {
         });
 
         it('should delete the invoiceOut using the descriptor more menu', async() => {
-            await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
             await page.waitToClick(selectors.invoiceOutDescriptor.moreMenu);
             await page.waitToClick(selectors.invoiceOutDescriptor.moreMenuDeleteInvoiceOut);
             await page.waitToClick(selectors.invoiceOutDescriptor.acceptDeleteButton);
diff --git a/e2e/paths/09-invoice-out/03_manualInvoice.spec.js b/e2e/paths/09-invoice-out/03_manualInvoice.spec.js
index 71ece0030..396f84bfb 100644
--- a/e2e/paths/09-invoice-out/03_manualInvoice.spec.js
+++ b/e2e/paths/09-invoice-out/03_manualInvoice.spec.js
@@ -16,9 +16,7 @@ describe('InvoiceOut manual invoice path', () => {
     });
 
     it('should open the manual invoice form', async() => {
-        await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
         await page.waitToClick(selectors.invoiceOutIndex.createInvoice);
-        await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
         await page.waitToClick(selectors.invoiceOutIndex.createManualInvoice);
         await page.waitForSelector(selectors.invoiceOutIndex.manualInvoiceForm);
     });
@@ -46,7 +44,6 @@ describe('InvoiceOut manual invoice path', () => {
     });
 
     it('should now open the manual invoice form', async() => {
-        await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
         await page.waitToClick(selectors.invoiceOutIndex.createInvoice);
         await page.waitToClick(selectors.invoiceOutIndex.createManualInvoice);
         await page.waitForSelector(selectors.invoiceOutIndex.manualInvoiceForm);
diff --git a/e2e/paths/10-travel/03_descriptor.spec.js b/e2e/paths/10-travel/03_descriptor.spec.js
index d61818866..619228f35 100644
--- a/e2e/paths/10-travel/03_descriptor.spec.js
+++ b/e2e/paths/10-travel/03_descriptor.spec.js
@@ -34,7 +34,6 @@ describe('Travel descriptor path', () => {
     });
 
     it('should be redirected to the create entry view', async() => {
-        await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
         await page.waitToClick(selectors.travelDescriptor.dotMenu);
         await page.waitToClick(selectors.travelDescriptor.dotMenuAddEntry);
         await page.waitForState('entry.create');
@@ -90,7 +89,6 @@ describe('Travel descriptor path', () => {
     });
 
     it('should be redirected to the create travel when using the clone option of the dot menu', async() => {
-        await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
         await page.waitToClick(selectors.travelDescriptor.dotMenu);
         await page.waitToClick(selectors.travelDescriptor.dotMenuClone);
         await page.respondToDialog('accept');
@@ -116,7 +114,6 @@ describe('Travel descriptor path', () => {
     });
 
     it('should atempt to clone the travel and its entries using the descriptor menu but receive an error', async() => {
-        await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
         await page.waitToClick(selectors.travelDescriptor.dotMenu);
         await page.waitToClick(selectors.travelDescriptor.dotMenuCloneWithEntries);
         await page.waitToClick(selectors.travelDescriptor.acceptClonation);
diff --git a/e2e/paths/11-zone/02_descriptor.spec.js b/e2e/paths/11-zone/02_descriptor.spec.js
index d88829907..1de84d601 100644
--- a/e2e/paths/11-zone/02_descriptor.spec.js
+++ b/e2e/paths/11-zone/02_descriptor.spec.js
@@ -17,7 +17,6 @@ describe('Zone descriptor path', () => {
     });
 
     it('should eliminate the zone using the descriptor option', async() => {
-        await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
         await page.waitToClick(selectors.zoneDescriptor.menu);
         await page.waitToClick(selectors.zoneDescriptor.deleteZone);
         await page.respondToDialog('accept');
diff --git a/e2e/paths/14-account/01_create_and_basic_data.spec.js b/e2e/paths/14-account/01_create_and_basic_data.spec.js
index 204da363c..5a07119e7 100644
--- a/e2e/paths/14-account/01_create_and_basic_data.spec.js
+++ b/e2e/paths/14-account/01_create_and_basic_data.spec.js
@@ -91,7 +91,6 @@ describe('Account create and basic data path', () => {
             });
 
             it('should activate the account using the descriptor menu', async() => {
-                await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
                 await page.waitToClick(selectors.accountDescriptor.menuButton);
                 await page.waitToClick(selectors.accountDescriptor.activateAccount);
                 await page.waitToClick(selectors.accountDescriptor.acceptButton);
@@ -139,7 +138,6 @@ describe('Account create and basic data path', () => {
 
         describe('Set password', () => {
             it('should set the password using the descriptor menu', async() => {
-                await page.waitForTimeout(1000); // initialization of functionality takes about 1000ms to work
                 await page.waitToClick(selectors.accountDescriptor.menuButton);
                 await page.waitToClick(selectors.accountDescriptor.setPassword);
                 await page.write(selectors.accountDescriptor.newPassword, 'quantum.crypt0graphy');

From 52094146135bf9b6f832805aa3820271a504843d Mon Sep 17 00:00:00 2001
From: joan <joan@verdnatura.es>
Date: Tue, 19 Oct 2021 13:46:17 +0200
Subject: [PATCH 12/12] feat(closure): should mail the PDF invoice invoiceable
 clients Refs: 3211

---
 db/dump/fixtures.sql     |  3 ++-
 print/methods/closure.js | 39 +++++++++++++++++++++++++++++----------
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index 66bd821cf..d37fc9c75 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -485,7 +485,8 @@ INSERT INTO `vn`.`invoiceOutSerial` (`code`, `description`, `isTaxed`, `taxAreaF
     VALUES
         ('A', 'Global nacional',         1, 'NATIONAL',  0),
         ('T', 'Española rapida',         1, 'NATIONAL',  0),
-        ('V', 'Intracomunitaria global', 0, 'CEE',       1);
+        ('V', 'Intracomunitaria global', 0, 'CEE',       1),
+        ('M', 'Múltiple nacional',       1, 'NATIONAL',  0);
 
 INSERT INTO `vn`.`invoiceOut`(`id`, `serial`, `amount`, `issued`,`clientFk`, `created`, `companyFk`, `dued`, `booked`, `bankFk`, `hasPdf`)
     VALUES
diff --git a/print/methods/closure.js b/print/methods/closure.js
index daa2d5e7c..450bd0ed2 100644
--- a/print/methods/closure.js
+++ b/print/methods/closure.js
@@ -190,8 +190,7 @@ module.exports = app => {
             try {
                 await db.rawSql(`CALL vn.ticket_closeByTicket(?)`, [ticket.id]);
 
-                const hasToInvoice = ticket.hasToInvoice && ticket.hasDailyInvoice;
-                if (!ticket.salesPersonFk || !ticket.isToBeMailed || hasToInvoice) continue;
+                if (!ticket.salesPersonFk || !ticket.isToBeMailed) continue;
 
                 if (!ticket.recipient) {
                     const body = `No se ha podido enviar el albarán <strong>${ticket.id}</strong> 
@@ -206,15 +205,35 @@ module.exports = app => {
                     continue;
                 }
 
-                const args = Object.assign({
-                    ticketId: ticket.id,
-                    recipientId: ticket.clientFk,
-                    recipient: ticket.recipient,
-                    replyTo: ticket.salesPersonEmail
-                }, reqArgs);
+                const hasToInvoice = ticket.hasToInvoice && ticket.hasDailyInvoice;
+                if (hasToInvoice) {
+                    const invoiceId = await db.findValue(`
+                        SELECT io.id
+                            FROM ticket t
+                                JOIN invoiceOut io ON io.ref = t.refFk
+                            WHERE t.id = ?
+                    `, [ticket.id]);
 
-                const email = new Email('delivery-note-link', args);
-                await email.send();
+                    const args = Object.assign({
+                        invoiceId: invoiceId,
+                        recipientId: ticket.clientFk,
+                        recipient: ticket.recipient,
+                        replyTo: ticket.salesPersonEmail
+                    }, reqArgs);
+
+                    const email = new Email('invoice', args);
+                    await email.send();
+                } else {
+                    const args = Object.assign({
+                        ticketId: ticket.id,
+                        recipientId: ticket.clientFk,
+                        recipient: ticket.recipient,
+                        replyTo: ticket.salesPersonEmail
+                    }, reqArgs);
+
+                    const email = new Email('delivery-note-link', args);
+                    await email.send();
+                }
             } catch (error) {
                 // Domain not found
                 if (error.responseCode == 450)