From 943c27142ff204474268242ad04efea02e8af9b0 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 2 Sep 2024 13:00:22 +0200
Subject: [PATCH 01/28] feat: refs #7354 deleted code and redirect to Lilium

---
 e2e/paths/11-zone/01_basic-data.spec.js       | 104 ------
 e2e/paths/11-zone/02_descriptor.spec.js       |  32 --
 modules/zone/front/basic-data/index.html      | 114 ------
 modules/zone/front/basic-data/index.js        |  21 --
 modules/zone/front/calendar/index.html        |  33 --
 modules/zone/front/calendar/index.js          | 191 ----------
 modules/zone/front/calendar/index.spec.js     | 172 ---------
 modules/zone/front/calendar/style.scss        |  43 ---
 modules/zone/front/card/index.html            |   5 -
 modules/zone/front/card/index.js              |  21 --
 modules/zone/front/card/index.spec.js         |  26 --
 modules/zone/front/create/index.html          |  98 -----
 modules/zone/front/create/index.js            |  24 --
 modules/zone/front/create/index.spec.js       |  40 ---
 modules/zone/front/create/locale/es.yml       |   3 -
 modules/zone/front/delivery-days/index.html   | 102 ------
 modules/zone/front/delivery-days/index.js     |  95 -----
 .../zone/front/delivery-days/index.spec.js    | 126 -------
 modules/zone/front/delivery-days/style.scss   |  36 --
 .../zone/front/descriptor-popover/index.html  |   4 -
 .../zone/front/descriptor-popover/index.js    |   9 -
 modules/zone/front/descriptor/index.html      |  57 ---
 modules/zone/front/descriptor/index.js        |  65 ----
 modules/zone/front/descriptor/index.spec.js   |  74 ----
 modules/zone/front/descriptor/locale/es.yml   |   4 -
 modules/zone/front/events/index.html          | 277 --------------
 modules/zone/front/events/index.js            | 316 ----------------
 modules/zone/front/events/index.spec.js       | 340 ------------------
 modules/zone/front/events/locale/es.yml       |  12 -
 modules/zone/front/events/style.scss          |  11 -
 modules/zone/front/index.js                   |  16 -
 modules/zone/front/index/index.html           |  68 ----
 modules/zone/front/index/index.js             |  21 --
 modules/zone/front/index/locale/es.yml        |   2 -
 modules/zone/front/location/index.html        |  28 --
 modules/zone/front/location/index.js          |  56 ---
 modules/zone/front/location/index.spec.js     |  50 ---
 modules/zone/front/location/style.scss        |  21 --
 modules/zone/front/log/index.html             |   1 -
 modules/zone/front/log/index.js               |   7 -
 modules/zone/front/main/index.html            |  19 -
 modules/zone/front/main/index.js              |  23 +-
 modules/zone/front/routes.json                |  68 ----
 modules/zone/front/search-panel/index.html    |  34 --
 modules/zone/front/search-panel/index.js      |   7 -
 modules/zone/front/summary/index.html         |  59 ---
 modules/zone/front/summary/index.js           |  56 ---
 modules/zone/front/summary/index.spec.js      |  76 ----
 .../zone/front/upcoming-deliveries/index.html |  31 --
 .../zone/front/upcoming-deliveries/index.js   |  23 --
 .../front/upcoming-deliveries/index.spec.js   |  22 --
 .../front/upcoming-deliveries/locale/es.yml   |   3 -
 .../zone/front/upcoming-deliveries/style.scss |  26 --
 modules/zone/front/warehouses/index.html      |  57 ---
 modules/zone/front/warehouses/index.js        |  56 ---
 modules/zone/front/warehouses/index.spec.js   |  60 ----
 56 files changed, 4 insertions(+), 3341 deletions(-)
 delete mode 100644 e2e/paths/11-zone/01_basic-data.spec.js
 delete mode 100644 e2e/paths/11-zone/02_descriptor.spec.js
 delete mode 100644 modules/zone/front/basic-data/index.html
 delete mode 100644 modules/zone/front/basic-data/index.js
 delete mode 100644 modules/zone/front/calendar/index.html
 delete mode 100644 modules/zone/front/calendar/index.js
 delete mode 100644 modules/zone/front/calendar/index.spec.js
 delete mode 100644 modules/zone/front/calendar/style.scss
 delete mode 100644 modules/zone/front/card/index.html
 delete mode 100644 modules/zone/front/card/index.js
 delete mode 100644 modules/zone/front/card/index.spec.js
 delete mode 100644 modules/zone/front/create/index.html
 delete mode 100644 modules/zone/front/create/index.js
 delete mode 100644 modules/zone/front/create/index.spec.js
 delete mode 100644 modules/zone/front/create/locale/es.yml
 delete mode 100644 modules/zone/front/delivery-days/index.html
 delete mode 100644 modules/zone/front/delivery-days/index.js
 delete mode 100644 modules/zone/front/delivery-days/index.spec.js
 delete mode 100644 modules/zone/front/delivery-days/style.scss
 delete mode 100644 modules/zone/front/descriptor-popover/index.html
 delete mode 100644 modules/zone/front/descriptor-popover/index.js
 delete mode 100644 modules/zone/front/descriptor/index.html
 delete mode 100644 modules/zone/front/descriptor/index.js
 delete mode 100644 modules/zone/front/descriptor/index.spec.js
 delete mode 100644 modules/zone/front/descriptor/locale/es.yml
 delete mode 100644 modules/zone/front/events/index.html
 delete mode 100644 modules/zone/front/events/index.js
 delete mode 100644 modules/zone/front/events/index.spec.js
 delete mode 100644 modules/zone/front/events/locale/es.yml
 delete mode 100644 modules/zone/front/events/style.scss
 delete mode 100644 modules/zone/front/index/index.html
 delete mode 100644 modules/zone/front/index/index.js
 delete mode 100644 modules/zone/front/index/locale/es.yml
 delete mode 100644 modules/zone/front/location/index.html
 delete mode 100644 modules/zone/front/location/index.js
 delete mode 100644 modules/zone/front/location/index.spec.js
 delete mode 100644 modules/zone/front/location/style.scss
 delete mode 100644 modules/zone/front/log/index.html
 delete mode 100644 modules/zone/front/log/index.js
 delete mode 100644 modules/zone/front/search-panel/index.html
 delete mode 100644 modules/zone/front/search-panel/index.js
 delete mode 100644 modules/zone/front/summary/index.html
 delete mode 100644 modules/zone/front/summary/index.js
 delete mode 100644 modules/zone/front/summary/index.spec.js
 delete mode 100644 modules/zone/front/upcoming-deliveries/index.html
 delete mode 100644 modules/zone/front/upcoming-deliveries/index.js
 delete mode 100644 modules/zone/front/upcoming-deliveries/index.spec.js
 delete mode 100644 modules/zone/front/upcoming-deliveries/locale/es.yml
 delete mode 100644 modules/zone/front/upcoming-deliveries/style.scss
 delete mode 100644 modules/zone/front/warehouses/index.html
 delete mode 100644 modules/zone/front/warehouses/index.js
 delete mode 100644 modules/zone/front/warehouses/index.spec.js

diff --git a/e2e/paths/11-zone/01_basic-data.spec.js b/e2e/paths/11-zone/01_basic-data.spec.js
deleted file mode 100644
index 34d08c57f..000000000
--- a/e2e/paths/11-zone/01_basic-data.spec.js
+++ /dev/null
@@ -1,104 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
-
-describe('Zone basic data path', () => {
-    let browser;
-    let page;
-
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-
-        await page.loginAndModule('deliveryAssistant',
-            'zone'); // turns up the zone module name and route aint the same lol
-        await page.accessToSearchResult('10');
-        await page.accessToSection('zone.card.basicData');
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it('should reach the basic data section', async() => {
-        await page.waitForState('zone.card.basicData');
-    });
-
-    it('should edit de form and then save', async() => {
-        await page.clearInput(selectors.zoneBasicData.name);
-        await page.write(selectors.zoneBasicData.name, 'Brimstone teleportation');
-        await page.autocompleteSearch(selectors.zoneBasicData.agency, 'Quantum break device');
-        await page.clearInput(selectors.zoneBasicData.maxVolume);
-        await page.write(selectors.zoneBasicData.maxVolume, '10');
-        await page.clearInput(selectors.zoneBasicData.travelingDays);
-        await page.write(selectors.zoneBasicData.travelingDays, '1');
-        await page.clearInput(selectors.zoneBasicData.closing);
-        await page.pickTime(selectors.zoneBasicData.closing, '21:00');
-        await page.clearInput(selectors.zoneBasicData.price);
-        await page.write(selectors.zoneBasicData.price, '999');
-        await page.clearInput(selectors.zoneBasicData.bonus);
-        await page.write(selectors.zoneBasicData.bonus, '100');
-        await page.clearInput(selectors.zoneBasicData.inflation);
-        await page.write(selectors.zoneBasicData.inflation, '200');
-        await page.waitToClick(selectors.zoneBasicData.volumetric);
-        await page.waitToClick(selectors.zoneBasicData.saveButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should now reload the section', async() => {
-        await page.reloadSection('zone.card.basicData');
-    });
-
-    it('should confirm the name was updated', async() => {
-        const result = await page.waitToGetProperty(selectors.zoneBasicData.name, 'value');
-
-        expect(result).toEqual('Brimstone teleportation');
-    });
-
-    it('should confirm the agency was updated', async() => {
-        const result = await page.waitToGetProperty(selectors.zoneBasicData.agency, 'value');
-
-        expect(result).toEqual('Quantum break device');
-    });
-
-    it('should confirm the max volume was updated', async() => {
-        const result = await page.waitToGetProperty(selectors.zoneBasicData.maxVolume, 'value');
-
-        expect(result).toEqual('10');
-    });
-
-    it('should confirm the traveling days were updated', async() => {
-        const result = await page.waitToGetProperty(selectors.zoneBasicData.travelingDays, 'value');
-
-        expect(result).toEqual('1');
-    });
-
-    it('should confirm the closing hour was updated', async() => {
-        const result = await page.waitToGetProperty(selectors.zoneBasicData.closing, 'value');
-
-        expect(result).toEqual('21:00');
-    });
-
-    it('should confirm the price was updated', async() => {
-        const result = await page.waitToGetProperty(selectors.zoneBasicData.price, 'value');
-
-        expect(result).toEqual('999');
-    });
-
-    it('should confirm the bonus was updated', async() => {
-        const result = await page.waitToGetProperty(selectors.zoneBasicData.bonus, 'value');
-
-        expect(result).toEqual('100');
-    });
-
-    it('should confirm the inflation was updated', async() => {
-        const result = await page.waitToGetProperty(selectors.zoneBasicData.inflation, 'value');
-
-        expect(result).toEqual('200');
-    });
-
-    it('should confirm the volumetric checkbox was checked', async() => {
-        await page.waitForClassPresent(selectors.zoneBasicData.volumetric, 'checked');
-    });
-});
diff --git a/e2e/paths/11-zone/02_descriptor.spec.js b/e2e/paths/11-zone/02_descriptor.spec.js
deleted file mode 100644
index baccc910f..000000000
--- a/e2e/paths/11-zone/02_descriptor.spec.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
-
-describe('Zone descriptor path', () => {
-    let browser;
-    let page;
-
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('deliveryAssistant', 'zone');
-        await page.accessToSearchResult('13');
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it('should eliminate the zone using the descriptor option', async() => {
-        await page.waitToClick(selectors.zoneDescriptor.menu);
-        await page.waitToClick(selectors.zoneDescriptor.deleteZone);
-        await page.respondToDialog('accept');
-        await page.waitForState('zone.index');
-    });
-
-    it('should search for the deleted zone to find no results', async() => {
-        await page.doSearch('13');
-        const count = await page.countElement(selectors.zoneIndex.searchResult);
-
-        expect(count).toEqual(0);
-    });
-});
diff --git a/modules/zone/front/basic-data/index.html b/modules/zone/front/basic-data/index.html
deleted file mode 100644
index 5070a3aea..000000000
--- a/modules/zone/front/basic-data/index.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<mg-ajax path="Zones/{{patch.params.id}}" options="vnPatch"></mg-ajax>
-<vn-watcher
-    vn-id="watcher"
-    data="$ctrl.zone"
-    form="form"
-    save="patch">
-</vn-watcher>
-<form
-    name="form"
-    ng-submit="$ctrl.onSubmit()"
-    class="vn-w-md">
-    <vn-card class="vn-pa-lg">
-        <vn-horizontal>
-            <vn-textfield
-                label="Name"
-                ng-model="$ctrl.zone.name"
-                vn-acl="deliveryAssistant"
-                rule>
-            </vn-textfield>
-        </vn-horizontal>
-        <vn-horizontal>
-            <vn-autocomplete
-                vn-one
-                ng-model="$ctrl.zone.agencyModeFk"
-                url="AgencyModes"
-                show-field="name"
-                value-field="id"
-                label="Agency"
-                vn-acl="deliveryAssistant"
-                rule>
-            </vn-autocomplete>
-            <vn-input-number
-                vn-one
-                label="Max m³"
-                ng-model="$ctrl.zone.itemMaxSize"
-                min="0"
-                vn-acl="deliveryAssistant"
-                rule>
-            </vn-input-number>
-            <vn-input-number
-                vn-one
-                label="Maximum m³"
-                ng-model="$ctrl.zone.m3Max"
-                min="0"
-                vn-acl="deliveryAssistant"
-                rule>
-            </vn-input-number>
-        </vn-horizontal>
-        <vn-horizontal>
-            <vn-input-number
-                label="Traveling days"
-                ng-model="$ctrl.zone.travelingDays"
-                min="0"
-                step="1"
-                vn-acl="deliveryAssistant"
-                rule>
-            </vn-input-number>
-            <vn-input-time
-                label="Closing"
-                ng-model="$ctrl.zone.hour"
-                vn-acl="deliveryAssistant"
-                rule>
-            </vn-input-time>
-        </vn-horizontal>
-        <vn-horizontal>
-            <vn-input-number
-                label="Price"
-                ng-model="$ctrl.zone.price"
-                min="0"
-                step="0.01"
-                vn-acl="deliveryAssistant"
-                rule>
-            </vn-input-number>
-            <vn-input-number
-                label="Bonus"
-                ng-model="$ctrl.zone.bonus"
-                step="0.01"
-                vn-acl="deliveryAssistant"
-                rule>
-            </vn-input-number>
-        </vn-horizontal>
-        <vn-horizontal>
-            <vn-input-number
-                vn-one
-                label="Inflation"
-                ng-model="$ctrl.zone.inflation"
-                min="0"
-                step="0.01"
-                vn-acl="deliveryAssistant"
-                rule>
-            </vn-input-number>
-            <vn-check
-                vn-one
-                label="Volumetric"
-                ng-model="$ctrl.zone.isVolumetric"
-                vn-acl="deliveryAssistant"
-                rule>
-            </vn-check>
-        </vn-horizontal>
-    </vn-card>
-    <vn-button-bar>
-        <vn-submit
-            disabled="!watcher.dataChanged()"
-            vn-acl="deliveryAssistant"
-            label="Save">
-        </vn-submit>
-        <vn-button
-            class="cancel"
-            label="Undo changes"
-            disabled="!watcher.dataChanged()"
-            ng-click="watcher.loadOriginalData()">
-        </vn-button>
-    </vn-button-bar>
-</form>
diff --git a/modules/zone/front/basic-data/index.js b/modules/zone/front/basic-data/index.js
deleted file mode 100644
index 402b471fc..000000000
--- a/modules/zone/front/basic-data/index.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import ngModule from '../module';
-import Section from 'salix/components/section';
-
-class Controller extends Section {
-    onSubmit() {
-        this.$.watcher.submit().then(() =>
-            this.card.reload()
-        );
-    }
-}
-
-ngModule.vnComponent('vnZoneBasicData', {
-    template: require('./index.html'),
-    controller: Controller,
-    bindings: {
-        zone: '<'
-    },
-    require: {
-        card: '^vnZoneCard'
-    }
-});
diff --git a/modules/zone/front/calendar/index.html b/modules/zone/front/calendar/index.html
deleted file mode 100644
index cfcebf359..000000000
--- a/modules/zone/front/calendar/index.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<vn-card>
-    <div class="header">
-        <vn-button
-            icon="navigate_before"
-            ng-click="$ctrl.step(-1)"
-            class="flat">
-        </vn-button>
-        <div>
-            <span translate>{{$ctrl.firstDay | date:'MMMM'}}</span>
-            <span>{{$ctrl.firstDay | date:'yyyy'}} -</span>
-            <span translate>{{$ctrl.lastDay | date:'MMMM'}}</span>
-            <span>{{$ctrl.lastDay | date:'yyyy'}}</span>
-        </div>
-        <vn-button
-            icon="navigate_next"
-            ng-click="$ctrl.step(1)"
-            class="flat">
-        </vn-button>
-    </div>
-    <div class="calendars vn-pa-md">
-        <vn-calendar
-            ng-repeat="date in $ctrl.months track by date.getTime()"
-            default-date="date"
-            display-controls="false"
-            hide-contiguous="true"
-            has-events="$ctrl.hasEvents($day)"
-            get-class="$ctrl.getClass($day)"
-            on-selection="$ctrl.onSelection($event, $days, $type, $weekday)"
-            class="vn-pa-md"
-            style="min-width: 250px; flex: 1;">
-        </vn-calendar>
-    </div>
-</vn-card>
\ No newline at end of file
diff --git a/modules/zone/front/calendar/index.js b/modules/zone/front/calendar/index.js
deleted file mode 100644
index 288a8f328..000000000
--- a/modules/zone/front/calendar/index.js
+++ /dev/null
@@ -1,191 +0,0 @@
-import ngModule from '../module';
-import Component from 'core/lib/component';
-import './style.scss';
-
-class Controller extends Component {
-    constructor($element, $, vnWeekDays) {
-        super($element, $);
-        this.vnWeekDays = vnWeekDays;
-        this.nMonths = 4;
-
-        let date = Date.vnNew();
-        date.setDate(1);
-        date.setHours(0, 0, 0, 0);
-        this.date = date;
-    }
-
-    get date() {
-        return this._date;
-    }
-
-    set date(value) {
-        this._date = value;
-        let stamp = value.getTime();
-
-        let firstDay = new Date(stamp);
-        firstDay.setDate(1);
-        this.firstDay = firstDay;
-
-        let lastDay = new Date(stamp);
-        lastDay.setMonth(lastDay.getMonth() + this.nMonths);
-        lastDay.setDate(0);
-        this.lastDay = lastDay;
-
-        this.months = [];
-        for (let i = 0; i < this.nMonths; i++) {
-            let monthDate = new Date(stamp);
-            monthDate.setMonth(value.getMonth() + i);
-            this.months.push(monthDate);
-        }
-
-        this.refreshEvents();
-    }
-
-    step(direction) {
-        let date = new Date(this.date.getTime());
-        date.setMonth(date.getMonth() + (this.nMonths * direction));
-        this.date = date;
-
-        this.emit('step');
-    }
-
-    get data() {
-        return this._data;
-    }
-
-    set data(value) {
-        this._data = value;
-
-        value = value || {};
-
-        this.events = value.events;
-
-        function toStamp(date) {
-            return date && new Date(date).setHours(0, 0, 0, 0);
-        }
-
-        this.exclusions = {};
-        let exclusions = value.exclusions;
-
-        if (exclusions) {
-            for (let exclusion of exclusions) {
-                let stamp = toStamp(exclusion.dated);
-                if (!this.exclusions[stamp]) this.exclusions[stamp] = [];
-                this.exclusions[stamp].push(exclusion);
-            }
-        }
-
-        this.geoExclusions = {};
-        let geoExclusions = value.geoExclusions;
-
-        if (geoExclusions) {
-            for (let geoExclusion of geoExclusions) {
-                let stamp = toStamp(geoExclusion.dated);
-                if (!this.geoExclusions[stamp]) this.geoExclusions[stamp] = [];
-                this.geoExclusions[stamp].push(geoExclusion);
-            }
-        }
-
-        let events = value.events;
-
-        if (events) {
-            for (let event of events) {
-                event.dated = toStamp(event.dated);
-                event.ended = toStamp(event.ended);
-                event.started = toStamp(event.started);
-                event.wdays = this.vnWeekDays.fromSet(event.weekDays);
-            }
-        }
-
-        this.refreshEvents();
-
-        let calendars = this.element.querySelectorAll('vn-calendar');
-        for (let calendar of calendars)
-            calendar.$ctrl.repaint();
-    }
-
-    refreshEvents() {
-        this.days = {};
-        if (!this.data) return;
-
-        let day = new Date(this.firstDay.getTime());
-
-        while (day <= this.lastDay) {
-            let stamp = day.getTime();
-            let wday = day.getDay();
-            let dayEvents = [];
-            let exclusions = this.exclusions[stamp] || [];
-
-            if (this.events) {
-                for (let event of this.events) {
-                    let match;
-
-                    switch (event.type) {
-                    case 'day':
-                        match = event.dated == stamp;
-                        break;
-                    default:
-                        match = event.wdays[wday]
-                            && (!event.started || stamp >= event.started)
-                            && (!event.ended || stamp <= event.ended);
-                        break;
-                    }
-
-                    if (match && !exclusions.find(e => e.zoneFk == event.zoneFk))
-                        dayEvents.push(event);
-                }
-            }
-
-            if (dayEvents.length)
-                this.days[stamp] = dayEvents;
-
-            day.setDate(day.getDate() + 1);
-        }
-    }
-
-    onSelection($event, $days, $type, $weekday) {
-        let $events = [];
-        let $exclusions = [];
-        let $geoExclusions = [];
-
-        for (let day of $days) {
-            let stamp = day.getTime();
-            $events = $events.concat(this.days[stamp] || []);
-            $exclusions = $exclusions.concat(this.exclusions[stamp] || []);
-            $geoExclusions = $geoExclusions.concat(this.geoExclusions[stamp] || []);
-        }
-
-        this.emit('selection', {
-            $event,
-            $days,
-            $type,
-            $weekday,
-            $events,
-            $exclusions,
-            $geoExclusions
-        });
-    }
-
-    hasEvents(day) {
-        let stamp = day.getTime();
-        return this.days[stamp] || this.exclusions[stamp] || this.geoExclusions[stamp];
-    }
-
-    getClass(day) {
-        let stamp = day.getTime();
-        if (this.geoExclusions[stamp])
-            return 'geoExcluded';
-        else if (this.exclusions[stamp])
-            return 'excluded';
-        else return '';
-    }
-}
-Controller.$inject = ['$element', '$scope', 'vnWeekDays'];
-
-ngModule.vnComponent('vnZoneCalendar', {
-    template: require('./index.html'),
-    controller: Controller,
-    bindings: {
-        data: '<?'
-    }
-});
diff --git a/modules/zone/front/calendar/index.spec.js b/modules/zone/front/calendar/index.spec.js
deleted file mode 100644
index 43280a9e8..000000000
--- a/modules/zone/front/calendar/index.spec.js
+++ /dev/null
@@ -1,172 +0,0 @@
-import './index';
-import crudModel from 'core/mocks/crud-model';
-
-describe('component vnZoneCalendar', () => {
-    let $scope;
-    let controller;
-
-    beforeEach(ngModule('zone'));
-
-    beforeEach(inject(($componentController, $rootScope) => {
-        $scope = $rootScope.$new();
-        const $element = angular.element(`<vn-zone-calendar></vn-zone-calendar>`);
-        controller = $componentController('vnZoneCalendar', {$element, $scope});
-        controller.$.model = crudModel;
-        controller.zone = {id: 1};
-        controller.days = [];
-        controller.exclusions = [];
-        controller.geoExclusions = [];
-    }));
-
-    describe('date() setter', () => {
-        it('should set the month property and then call the refreshEvents() method', () => {
-            jest.spyOn(controller, 'refreshEvents').mockReturnThis();
-
-            controller.date = Date.vnNew();
-
-            expect(controller.refreshEvents).toHaveBeenCalledWith();
-            expect(controller.months.length).toEqual(4);
-        });
-    });
-
-    describe('step()', () => {
-        it('should set the date month to 4 months backwards', () => {
-            const now = Date.vnNew();
-            now.setDate(15);
-            now.setMonth(now.getMonth() - 4);
-
-            controller.step(-1);
-
-            const expectedMonth = now.getMonth();
-            const currentMonth = controller.date.getMonth();
-
-            expect(currentMonth).toEqual(expectedMonth);
-        });
-
-        it('should set the date month to 4 months forwards', () => {
-            const now = Date.vnNew();
-            now.setDate(15);
-            now.setMonth(now.getMonth() + 4);
-
-            controller.step(1);
-
-            const expectedMonth = now.getMonth();
-            const currentMonth = controller.date.getMonth();
-
-            expect(currentMonth).toEqual(expectedMonth);
-        });
-    });
-
-    describe('data() setter', () => {
-        it('should set the events, exclusions and geoExclusions and then call the refreshEvents() method', () => {
-            jest.spyOn(controller, 'refreshEvents').mockReturnThis();
-
-            controller.data = {
-                exclusions: [{
-                    dated: Date.vnNew()
-                }],
-                events: [{
-                    dated: Date.vnNew()
-                }],
-                geoExclusions: [{
-                    dated: Date.vnNew()
-                }],
-            };
-
-            expect(controller.refreshEvents).toHaveBeenCalledWith();
-            expect(controller.events).toBeDefined();
-            expect(controller.events.length).toEqual(1);
-            expect(controller.exclusions).toBeDefined();
-            expect(controller.geoExclusions).toBeDefined();
-            expect(Object.keys(controller.exclusions).length).toEqual(1);
-        });
-    });
-
-    describe('refreshEvents()', () => {
-        it('should fill the days property with the events.', () => {
-            controller.data = [];
-            controller.firstDay = Date.vnNew();
-
-            const lastDay = Date.vnNew();
-            lastDay.setDate(lastDay.getDate() + 10);
-            controller.lastDay = lastDay;
-
-            const firstEventStamp = controller.firstDay.getTime();
-            const lastEventStamp = controller.lastDay.getTime();
-            controller.events = [{
-                type: 'day',
-                dated: firstEventStamp
-            },
-            {
-                type: 'day',
-                dated: lastEventStamp
-            }];
-
-            controller.refreshEvents();
-            const expectedDays = Object.keys(controller.days);
-
-            expect(expectedDays.length).toEqual(2);
-        });
-    });
-
-    describe('onSelection()', () => {
-        it('should call the emit() method', () => {
-            jest.spyOn(controller, 'emit');
-
-            const $event = {};
-            const $days = [Date.vnNew()];
-            const $type = 'day';
-            const $weekday = 1;
-
-            controller.onSelection($event, $days, $type, $weekday);
-
-            expect(controller.emit).toHaveBeenCalledWith('selection',
-                {
-                    $days: $days,
-                    $event: {},
-                    $events: [],
-                    $exclusions: [],
-                    $type: 'day',
-                    $weekday: 1,
-                    $geoExclusions: [],
-                }
-            );
-        });
-    });
-
-    describe('hasEvents()', () => {
-        it('should return true for an existing event on a date', () => {
-            const dated = Date.vnNew();
-
-            controller.days[dated.getTime()] = true;
-
-            const result = controller.hasEvents(dated);
-
-            expect(result).toBeTruthy();
-        });
-    });
-
-    describe('getClass()', () => {
-        it('should return the className "excluded" for an excluded date', () => {
-            const dated = Date.vnNew();
-
-            controller.exclusions = [];
-            controller.exclusions[dated.getTime()] = true;
-
-            const result = controller.getClass(dated);
-
-            expect(result).toEqual('excluded');
-        });
-
-        it('should return the className "geoExcluded" for a date with geo excluded', () => {
-            const dated = Date.vnNew();
-
-            controller.geoExclusions = [];
-            controller.geoExclusions[dated.getTime()] = true;
-
-            const result = controller.getClass(dated);
-
-            expect(result).toEqual('geoExcluded');
-        });
-    });
-});
diff --git a/modules/zone/front/calendar/style.scss b/modules/zone/front/calendar/style.scss
deleted file mode 100644
index 38491af58..000000000
--- a/modules/zone/front/calendar/style.scss
+++ /dev/null
@@ -1,43 +0,0 @@
-@import "variables";
-
-vn-zone-calendar {
-    display: block;
-
-    & > vn-card {
-        & > .header {
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            background-color: $color-main;
-            color: white;
-            font-weight: bold;
-            height: 45px;
-
-            & > .vn-button {
-                color: inherit;
-                height: 100%;
-            }
-        }
-        & > .calendars {
-            display: flex;
-            flex-wrap: wrap;
-            justify-content: space-evenly;
-
-            & > .vn-calendar {
-                max-width: 288px;
-                
-                #days-container .day {
-                    &.event .day-number {
-                        background-color: $color-success;
-                    }
-                    &.excluded .day-number {
-                        background-color: $color-alert;
-                    }
-                    &.geoExcluded .day-number {
-                        background-color: $color-main;
-                    }
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/modules/zone/front/card/index.html b/modules/zone/front/card/index.html
deleted file mode 100644
index ae6a7f10a..000000000
--- a/modules/zone/front/card/index.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<vn-portal slot="menu">
-    <vn-zone-descriptor zone="$ctrl.zone"></vn-zone-descriptor>
-    <vn-left-menu source="card"></vn-left-menu>
-</vn-portal>
-<ui-view></ui-view>
diff --git a/modules/zone/front/card/index.js b/modules/zone/front/card/index.js
deleted file mode 100644
index 4e8ac7e8c..000000000
--- a/modules/zone/front/card/index.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import ngModule from '../module';
-import ModuleCard from 'salix/components/module-card';
-
-class Controller extends ModuleCard {
-    reload() {
-        let filter = {
-            include: {
-                relation: 'agencyMode',
-                scope: {fields: ['name']}
-            }
-        };
-
-        this.$http.get(`Zones/${this.$params.id}`, {filter})
-            .then(res => this.zone = res.data);
-    }
-}
-
-ngModule.vnComponent('vnZoneCard', {
-    template: require('./index.html'),
-    controller: Controller
-});
diff --git a/modules/zone/front/card/index.spec.js b/modules/zone/front/card/index.spec.js
deleted file mode 100644
index 64127990f..000000000
--- a/modules/zone/front/card/index.spec.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import './index.js';
-
-describe('Zone Component vnZoneCard', () => {
-    let controller;
-    let $httpBackend;
-    let data = {id: 1, name: 'fooName'};
-
-    beforeEach(ngModule('zone'));
-
-    beforeEach(inject(($componentController, _$httpBackend_, $stateParams) => {
-        $httpBackend = _$httpBackend_;
-
-        let $element = angular.element('<div></div>');
-        controller = $componentController('vnZoneCard', {$element});
-
-        $stateParams.id = data.id;
-        $httpBackend.whenRoute('GET', 'Zones/:id').respond(data);
-    }));
-
-    it('should request data and set it on the controller', () => {
-        controller.reload();
-        $httpBackend.flush();
-
-        expect(controller.zone).toEqual(data);
-    });
-});
diff --git a/modules/zone/front/create/index.html b/modules/zone/front/create/index.html
deleted file mode 100644
index f8c7df391..000000000
--- a/modules/zone/front/create/index.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<vn-watcher
-    vn-id="watcher"
-    url="Zones"
-    data="$ctrl.zone"
-    insert-mode="true"
-    form="form">
-</vn-watcher>
-<vn-crud-model
-    auto-load="true"
-    url="Warehouses"
-    data="warehouses"
-    order="name">
-</vn-crud-model>
-<vn-crud-model
-    auto-load="true"
-    url="AgencyModes/isActive"
-    data="activeAgencyModes"
-    order="name">
-</vn-crud-model>
-<form
-    name="form"
-    vn-http-submit="$ctrl.onSubmit()"
-    class="vn-w-md">
-    <vn-card class="vn-pa-lg">
-        <vn-horizontal>
-            <vn-textfield
-                label="Name" 
-                ng-model="$ctrl.zone.name"
-                rule
-                vn-focus>
-            </vn-textfield>
-        </vn-horizontal>
-        <vn-horizontal>
-            <vn-autocomplete
-                label="Warehouse"
-                ng-model="$ctrl.zone.warehouseFk"
-                data="warehouses"
-                show-field="name"
-                value-field="id"
-                label="Warehouse"
-                rule>
-            </vn-autocomplete>
-            <vn-autocomplete
-                label="Agency"
-                ng-model="$ctrl.zone.agencyModeFk"
-                data="activeAgencyModes"
-                show-field="name"
-                value-field="id"
-                label="Agency"
-                rule>
-            </vn-autocomplete>
-        </vn-horizontal>
-        <vn-horizontal>
-            <vn-input-number
-                label="Traveling days"
-                ng-model="$ctrl.zone.travelingDays"
-                min="0"
-                step="1"
-                rule>
-            </vn-input-number>
-            <vn-input-time
-                label="Closing hour"
-                ng-model="$ctrl.zone.hour"
-                rule>
-            </vn-input-time>
-        </vn-horizontal>
-        <vn-horizontal>
-            <vn-input-number
-                label="Price"
-                ng-model="$ctrl.zone.price"
-                min="0"
-                step="0.01"
-                rule>
-            </vn-input-number>
-            <vn-input-number
-                label="Bonus"
-                ng-model="$ctrl.zone.bonus"
-                min="0"
-                step="0.01"
-                rule>
-            </vn-input-number> 
-        </vn-horizontal>
-        <vn-horizontal>
-            <vn-check ng-model="$ctrl.zone.isVolumetric" label="Volumetric"></vn-check>
-        </vn-horizontal>
-    </vn-card>
-    <vn-button-bar>
-        <vn-submit
-            disabled="!watcher.dataChanged()"
-            label="Create">
-        </vn-submit>
-        <vn-button
-            class="cancel"
-            label="Cancel"
-            ui-sref="zone.index">
-        </vn-button>
-    </vn-button-bar>
-</form>
diff --git a/modules/zone/front/create/index.js b/modules/zone/front/create/index.js
deleted file mode 100644
index db337a9a3..000000000
--- a/modules/zone/front/create/index.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import ngModule from '../module';
-import Section from 'salix/components/section';
-
-export default class Controller extends Section {
-    $onInit() {
-        this.zone = {
-            travelingDays: 0,
-            price: 0.20,
-            bonus: 0.20,
-            hour: Date.vnNew()
-        };
-    }
-
-    onSubmit() {
-        return this.$.watcher.submit().then(res =>
-            this.$state.go('zone.card.location', {id: res.data.id})
-        );
-    }
-}
-
-ngModule.vnComponent('vnZoneCreate', {
-    template: require('./index.html'),
-    controller: Controller
-});
diff --git a/modules/zone/front/create/index.spec.js b/modules/zone/front/create/index.spec.js
deleted file mode 100644
index fe0088225..000000000
--- a/modules/zone/front/create/index.spec.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import './index';
-import watcher from 'core/mocks/watcher';
-
-describe('Zone Component vnZoneCreate', () => {
-    let $scope;
-    let $state;
-    let controller;
-
-    beforeEach(ngModule('zone'));
-
-    beforeEach(inject(($componentController, $rootScope, _$state_) => {
-        $scope = $rootScope.$new();
-        $state = _$state_;
-        $scope.watcher = watcher;
-        $scope.watcher.submit = () => {
-            return {
-                then: callback => {
-                    callback({data: {id: 1234}});
-                }
-            };
-        };
-        const $element = angular.element('<vn-zone-create></vn-zone-create>');
-        controller = $componentController('vnZoneCreate', {$element, $scope});
-    }));
-
-    describe('onSubmit()', () => {
-        it(`should call submit() on the watcher then expect a callback`, () => {
-            jest.spyOn($state, 'go');
-
-            controller.zone = {
-                name: 'Zone One'
-            };
-
-            controller.onSubmit();
-
-            expect(controller.$state.go).toHaveBeenCalledWith('zone.card.location', Object({id: 1234}));
-        });
-    });
-});
-
diff --git a/modules/zone/front/create/locale/es.yml b/modules/zone/front/create/locale/es.yml
deleted file mode 100644
index 4827ced37..000000000
--- a/modules/zone/front/create/locale/es.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-Traveling days: Días de viaje
-Closing hour: Hora de cierre
-Bonus: Bonificación
\ No newline at end of file
diff --git a/modules/zone/front/delivery-days/index.html b/modules/zone/front/delivery-days/index.html
deleted file mode 100644
index c47d89982..000000000
--- a/modules/zone/front/delivery-days/index.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<div class="vn-w-md">
-    <vn-zone-calendar
-        data="data"
-        on-selection="$ctrl.onSelection($event, $events, $days)">
-    </vn-zone-calendar>
-</div>
-<vn-side-menu side="right">
-    <form ng-submit="$ctrl.fetchData()" class="vn-pa-md">
-        <vn-radio
-            label="Pick up"
-            val="pickUp"
-            ng-model="$ctrl.deliveryMethodFk"
-            on-change="$ctrl.agencyModeFk = null"
-            tabindex="-1">
-        </vn-radio>
-        <vn-radio
-            label="Delivery"
-            val="delivery"
-            ng-model="$ctrl.deliveryMethodFk"
-            on-change="$ctrl.agencyModeFk = null"
-            class="vn-mb-sm"
-            tabindex="-1">
-        </vn-radio>
-        <vn-autocomplete
-            vn-one
-            ng-if="$ctrl.deliveryMethodFk === 'delivery'"
-            vn-focus
-            label="Postcode"
-            ng-model="$ctrl.geoFk"
-            url="Postcodes/location"
-            fields="['code','townFk']"
-            order="code, townFk"
-            value-field="geoFk"
-            show-field="code">
-            <tpl-item>
-                <div>
-                    {{code}} {{town.name}}
-                </div>
-                <div class="text-caption text-secondary">
-                    {{town.province.name}}, {{town.province.country.name}}
-                </div>
-            </tpl-item>
-        </vn-autocomplete>
-        <vn-autocomplete
-            label="{{$ctrl.deliveryMethodFk == 'delivery' ? 'Agency' : 'Warehouse'}}"
-            ng-model="$ctrl.agencyModeFk"
-            url="AgencyModes/isActive"
-            where="$ctrl.agencyFilter"
-            vn-id="agencymode">
-        </vn-autocomplete>
-        <vn-submit label="Query" class="vn-mt-sm"></vn-submit>
-    </form>
-</vn-side-menu>
-
-<!-- Zone Popover -->
-<vn-popover vn-id="zoneEvents">
-    <div class="zoneEvents">
-        <div class="header vn-pa-sm" translate>Zones</div>
-        <vn-data-viewer
-            data="::$ctrl.zoneClosing"
-            class="vn-w-md vn-mb-xl">
-            <vn-card>
-            <vn-table>
-                <vn-thead>
-                    <vn-tr>
-                        <vn-th field="id" number>Id</vn-th>
-                        <vn-th field="name" expand>Name</vn-th>
-                        <vn-th field="agencyModeFk">Agency</vn-th>
-                        <vn-th field="hour" shrink>Closing</vn-th>
-                        <vn-th field="price" number>Price</vn-th>
-                        <vn-th shrink></vn-th>
-                    </vn-tr>
-                </vn-thead>
-                <vn-tbody>
-                    <vn-tr
-                        ng-repeat="zone in $ctrl.zoneClosing"
-                        ui-sref="zone.card.summary({id: zone.id})"
-                        class="clickable search-result">
-                        <vn-td number>{{::zone.id}}</vn-td>
-                        <vn-td expand>{{::zone.name}}</vn-td>
-                        <vn-td>{{::zone.agencyModeName}}</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">
-                                <vn-icon-button
-                                    vn-click-stop="$ctrl.preview(zone)"
-                                    vn-tooltip="Preview"
-                                    icon="preview">
-                                </vn-icon-button>
-                            </vn-horizontal>
-                        </vn-td>
-                    </vn-tr>
-                </vn-tbody>
-            </vn-table>
-            </vn-card>
-        </vn-data-viewer>
-    </div>
-</vn-popover>
-<vn-popup vn-id="summary">
-    <vn-zone-summary zone="$ctrl.selectedZone"></vn-zone-summary>
-</vn-popup>
\ No newline at end of file
diff --git a/modules/zone/front/delivery-days/index.js b/modules/zone/front/delivery-days/index.js
deleted file mode 100644
index 71e8c8ab7..000000000
--- a/modules/zone/front/delivery-days/index.js
+++ /dev/null
@@ -1,95 +0,0 @@
-import ngModule from '../module';
-import Section from 'salix/components/section';
-import './style.scss';
-
-class Controller extends Section {
-    $onInit() {
-        this.setParams();
-    }
-
-    $postLink() {
-        this.deliveryMethodFk = 'delivery';
-    }
-
-    setParams() {
-        const hasParams = this.$params.deliveryMethodFk || this.$params.geoFk || this.$params.agencyModeFk;
-        if (hasParams) {
-            if (this.$params.deliveryMethodFk)
-                this.deliveryMethodFk = this.$params.deliveryMethodFk;
-
-            if (this.$params.geoFk)
-                this.geoFk = this.$params.geoFk;
-
-            if (this.$params.agencyModeFk)
-                this.agencyModeFk = this.$params.agencyModeFk;
-
-            this.fetchData();
-        }
-    }
-
-    fetchData() {
-        const params = {
-            deliveryMethodFk: this.deliveryMethodFk,
-            geoFk: this.geoFk,
-            agencyModeFk: this.agencyModeFk
-        };
-        this.$.data = null;
-        this.$http.get(`Zones/getEvents`, {params})
-            .then(res => {
-                let data = res.data;
-                this.$.data = data;
-                if (!data.events.length)
-                    this.vnApp.showMessage(this.$t('No service for the specified zone'));
-
-                this.$state.go(this.$state.current.name, params);
-            });
-    }
-
-    get deliveryMethodFk() {
-        return this._deliveryMethodFk;
-    }
-
-    set deliveryMethodFk(value) {
-        this._deliveryMethodFk = value;
-
-        let filter;
-
-        if (value === 'pickUp')
-            filter = {where: {code: 'PICKUP'}};
-        else
-            filter = {where: {code: {inq: ['DELIVERY', 'AGENCY']}}};
-
-        this.$http.get(`DeliveryMethods`, {filter}).then(res => {
-            const deliveryMethods = res.data.map(deliveryMethod => deliveryMethod.id);
-            this.agencyFilter = {deliveryMethodFk: {inq: deliveryMethods}};
-        });
-    }
-
-    onSelection($event, $events, $days) {
-        if (!$events.length) return;
-
-        const day = $days[0];
-        const zoneIds = [];
-        for (let event of $events)
-            zoneIds.push(event.zoneFk);
-
-        const params = {
-            zoneIds: zoneIds,
-            date: day
-        };
-
-        this.$http.post(`Zones/getZoneClosing`, params)
-            .then(res => this.zoneClosing = res.data)
-            .then(() => this.$.zoneEvents.show($event.target));
-    }
-
-    preview(zone) {
-        this.selectedZone = zone;
-        this.$.summary.show();
-    }
-}
-
-ngModule.vnComponent('vnZoneDeliveryDays', {
-    template: require('./index.html'),
-    controller: Controller
-});
diff --git a/modules/zone/front/delivery-days/index.spec.js b/modules/zone/front/delivery-days/index.spec.js
deleted file mode 100644
index 28705880c..000000000
--- a/modules/zone/front/delivery-days/index.spec.js
+++ /dev/null
@@ -1,126 +0,0 @@
-import './index.js';
-import popover from 'core/mocks/popover';
-import crudModel from 'core/mocks/crud-model';
-
-describe('Zone Component vnZoneDeliveryDays', () => {
-    let $httpBackend;
-    let controller;
-    let $element;
-
-    beforeEach(ngModule('zone'));
-
-    beforeEach(inject(($componentController, _$httpBackend_) => {
-        $httpBackend = _$httpBackend_;
-        $element = angular.element('<vn-zone-delivery-days></vn-zone-delivery-days');
-        controller = $componentController('vnZoneDeliveryDays', {$element});
-        controller.$.zoneEvents = popover;
-        controller.$.params = {};
-        controller.$.zoneModel = crudModel;
-    }));
-
-    describe('deliveryMethodFk() setter', () => {
-        it('should set the deliveryMethodFk property as pickup and then perform a query that sets the filter', () => {
-            $httpBackend.expect('GET', 'DeliveryMethods').respond([{id: 999}]);
-            controller.deliveryMethodFk = 'pickUp';
-            $httpBackend.flush();
-
-            expect(controller.agencyFilter).toEqual({deliveryMethodFk: {inq: [999]}});
-        });
-    });
-
-    describe('setParams()', () => {
-        it('should do nothing when no params are received', () => {
-            controller.setParams();
-
-            expect(controller.deliveryMethodFk).toBeUndefined();
-            expect(controller.geoFk).toBeUndefined();
-            expect(controller.agencyModeFk).toBeUndefined();
-        });
-
-        it('should set the controller properties when the params are provided', () => {
-            controller.$params = {
-                deliveryMethodFk: 3,
-                geoFk: 2,
-                agencyModeFk: 1
-            };
-            controller.setParams();
-
-            expect(controller.deliveryMethodFk).toEqual(controller.$params.deliveryMethodFk);
-            expect(controller.geoFk).toEqual(controller.$params.geoFk);
-            expect(controller.agencyModeFk).toEqual(controller.$params.agencyModeFk);
-        });
-    });
-
-    describe('fetchData()', () => {
-        it('should make an HTTP GET query and then call the showMessage() method', () => {
-            jest.spyOn(controller.vnApp, 'showMessage');
-            jest.spyOn(controller.$state, 'go');
-
-            controller.agencyModeFk = 1;
-            controller.deliveryMethodFk = 2;
-            controller.geoFk = 3;
-            controller.$state.current.name = 'myState';
-
-            const expectedData = {events: []};
-
-            const url = 'Zones/getEvents?agencyModeFk=1&deliveryMethodFk=2&geoFk=3';
-
-            $httpBackend.when('GET', 'DeliveryMethods').respond([]);
-            $httpBackend.expect('GET', url).respond({events: []});
-            controller.fetchData();
-            $httpBackend.flush();
-
-            expect(controller.$.data).toEqual(expectedData);
-            expect(controller.vnApp.showMessage).toHaveBeenCalledWith('No service for the specified zone');
-            expect(controller.$state.go).toHaveBeenCalledWith(
-                controller.$state.current.name,
-                {
-                    agencyModeFk: 1,
-                    deliveryMethodFk: 2,
-                    geoFk: 3
-                }
-            );
-        });
-    });
-
-    describe('onSelection()', () => {
-        it('should not call the show popover method if events array is empty', () => {
-            jest.spyOn(controller.$.zoneEvents, 'show');
-
-            const event = new Event('click');
-            const target = document.createElement('div');
-            target.dispatchEvent(event);
-            const events = [];
-            controller.onSelection(event, events);
-
-            expect(controller.$.zoneEvents.show).not.toHaveBeenCalled();
-        });
-
-        it('should call the show() method and call getZoneClosing() with the expected ids', () => {
-            jest.spyOn(controller.$.zoneEvents, 'show');
-
-            const event = new Event('click');
-            const target = document.createElement('div');
-            target.dispatchEvent(event);
-
-            const day = Date.vnNew();
-            const events = [
-                {zoneFk: 1},
-                {zoneFk: 2},
-                {zoneFk: 8}
-            ];
-            const params = {
-                zoneIds: [1, 2, 8],
-                date: [day][0]
-            };
-            const response = [{id: 1, hour: ''}];
-
-            $httpBackend.when('POST', 'Zones/getZoneClosing', params).respond({response});
-            controller.onSelection(event, events, [day]);
-            $httpBackend.flush();
-
-            expect(controller.$.zoneEvents.show).toHaveBeenCalledWith(target);
-            expect(controller.zoneClosing.id).toEqual(response.id);
-        });
-    });
-});
diff --git a/modules/zone/front/delivery-days/style.scss b/modules/zone/front/delivery-days/style.scss
deleted file mode 100644
index 3dd4abb7c..000000000
--- a/modules/zone/front/delivery-days/style.scss
+++ /dev/null
@@ -1,36 +0,0 @@
-@import "variables";
-
-vn-zone-delivery-days {
-    vn-zone-calendar {
-        display: flex;
-        justify-content: center;
-        flex-wrap: wrap;
-
-        & > vn-calendar {
-            min-width: 264px;
-        }
-    }
-    form {
-        display: flex;
-        flex-direction: column;
-    }
-}
-
-.zoneEvents {
-    width: 700px;
-    max-height: 450px;
-    
-    vn-data-viewer {
-        margin-bottom: 0;
-        vn-pagination {
-            padding: 0
-        }
-    }
-
-    & > .header {
-        background-color: $color-main;
-        color: white;
-        font-weight: bold;
-        text-align: center
-    }
-}
\ No newline at end of file
diff --git a/modules/zone/front/descriptor-popover/index.html b/modules/zone/front/descriptor-popover/index.html
deleted file mode 100644
index 7e4e8f5d8..000000000
--- a/modules/zone/front/descriptor-popover/index.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<slot-descriptor>
-    <vn-zone-descriptor>
-    </vn-zone-descriptor>
-</slot-descriptor>
\ No newline at end of file
diff --git a/modules/zone/front/descriptor-popover/index.js b/modules/zone/front/descriptor-popover/index.js
deleted file mode 100644
index a21232e41..000000000
--- a/modules/zone/front/descriptor-popover/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import ngModule from '../module';
-import DescriptorPopover from 'salix/components/descriptor-popover';
-
-class Controller extends DescriptorPopover {}
-
-ngModule.vnComponent('vnZoneDescriptorPopover', {
-    slotTemplate: require('./index.html'),
-    controller: Controller
-});
diff --git a/modules/zone/front/descriptor/index.html b/modules/zone/front/descriptor/index.html
deleted file mode 100644
index a3432a99d..000000000
--- a/modules/zone/front/descriptor/index.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<vn-descriptor-content
-    module="zone"
-    description="$ctrl.zone.name"
-    summary="$ctrl.$.summary">
-    <slot-menu>
-        <vn-item class="vn-item"
-            ng-click="$ctrl.onDelete()"
-            translate>
-            Delete
-        </vn-item>
-        <vn-item
-            ng-click="clone.show()"
-            name="cloneZone"
-            translate>
-            Clone
-        </vn-item>
-    </slot-menu>
-    <slot-body>
-        <div class="attributes">
-            <vn-label-value
-                label="Agency"
-                value="{{$ctrl.zone.agencyMode.name}}">
-            </vn-label-value>
-            <vn-label-value
-                label="Closing hour"
-                value="{{$ctrl.zone.hour | date: 'HH:mm'}}">
-            </vn-label-value>
-            <vn-label-value
-                label="Traveling days"
-                value="{{$ctrl.zone.travelingDays}}">
-            </vn-label-value>
-            <vn-label-value
-                label="Price"
-                value="{{$ctrl.zone.price | currency: 'EUR': 2}}">
-            </vn-label-value>
-            <vn-label-value
-                label="Bonus"
-                value="{{$ctrl.zone.bonus | currency: 'EUR': 2}}">
-            </vn-label-value>
-        </div>
-    </slot-body>
-</vn-descriptor-content>
-<vn-popup vn-id="summary">
-    <vn-zone-summary zone="$ctrl.zone"></vn-zone-summary>
-</vn-popup>
-
-<vn-confirm
-    vn-id="deleteZone"
-    on-accept="$ctrl.deleteZone()"
-    message="This zone will be removed">
-</vn-confirm>
-<vn-confirm
-    vn-id="clone"
-    on-accept="$ctrl.onCloneAccept()"
-    question="Do you want to clone this zone?"
-    message="All it's properties will be copied">
-</vn-confirm>
\ No newline at end of file
diff --git a/modules/zone/front/descriptor/index.js b/modules/zone/front/descriptor/index.js
deleted file mode 100644
index 3f4863a60..000000000
--- a/modules/zone/front/descriptor/index.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import ngModule from '../module';
-import Descriptor from 'salix/components/descriptor';
-
-class Controller extends Descriptor {
-    get zone() {
-        return this.entity;
-    }
-
-    set zone(value) {
-        this.entity = value;
-    }
-
-    loadData() {
-        const filter = {
-            include: [
-                {
-                    relation: 'agencyMode',
-                    scope: {
-                        fields: ['name'],
-                    }
-                }
-            ]
-        };
-
-        return this.getData(`Zones/${this.id}`, {filter})
-            .then(res => this.entity = res.data);
-    }
-
-    onDelete() {
-        const $t = this.$translate.instant;
-        const today = Date.vnNew();
-        today.setHours(0, 0, 0, 0);
-        const filter = {where: {zoneFk: this.id, shipped: {gte: today}}};
-        this.$http.get(`Tickets`, {filter}).then(res => {
-            const ticketsAmount = res.data.length;
-            if (ticketsAmount) {
-                const params = {ticketsAmount};
-                const question = $t('This zone contains tickets', params, null, null, 'sanitizeParameters');
-                this.$.deleteZone.question = question;
-                this.$.deleteZone.show();
-            } else
-                this.deleteZone();
-        });
-    }
-
-    deleteZone() {
-        return this.$http.post(`Zones/${this.id}/deleteZone`).then(() => {
-            this.$state.go('zone.index');
-            this.vnApp.showSuccess(this.$t('Zone deleted'));
-        });
-    }
-
-    onCloneAccept() {
-        return this.$http.post(`Zones/${this.id}/clone`).
-            then(res => this.$state.go('zone.card.basicData', {id: res.data.id}));
-    }
-}
-
-ngModule.vnComponent('vnZoneDescriptor', {
-    template: require('./index.html'),
-    controller: Controller,
-    bindings: {
-        zone: '<'
-    }
-});
diff --git a/modules/zone/front/descriptor/index.spec.js b/modules/zone/front/descriptor/index.spec.js
deleted file mode 100644
index 435a1d00f..000000000
--- a/modules/zone/front/descriptor/index.spec.js
+++ /dev/null
@@ -1,74 +0,0 @@
-import './index.js';
-
-describe('Zone descriptor', () => {
-    let $httpBackend;
-    let controller;
-    let $element;
-
-    beforeEach(ngModule('zone'));
-
-    beforeEach(inject(($componentController, _$httpBackend_) => {
-        $httpBackend = _$httpBackend_;
-        $element = angular.element('<vn-zone-descriptor></vn-zone-descriptor');
-        controller = $componentController('vnZoneDescriptor', {$element});
-        controller.zone = {id: 1};
-        controller.id = 1;
-        controller.$.deleteZone = {
-            hide: () => {},
-            show: () => {}
-        };
-    }));
-
-    describe('onDelete()', () => {
-        it('should make an HTTP POST query and then call the deleteZone show() method', () => {
-            jest.spyOn(controller.$.deleteZone, 'show');
-
-            const expectedData = [{id: 16}];
-            $httpBackend.when('GET', 'Tickets').respond(expectedData);
-            controller.onDelete();
-            $httpBackend.flush();
-
-            expect(controller.$.deleteZone.show).toHaveBeenCalledWith();
-        });
-
-        it('should make an HTTP POST query and then call the deleteZone() method', () => {
-            jest.spyOn(controller, 'deleteZone').mockReturnThis();
-
-            const expectedData = [];
-            $httpBackend.when('GET', 'Tickets').respond(expectedData);
-            controller.onDelete();
-            $httpBackend.flush();
-
-            expect(controller.deleteZone).toHaveBeenCalledWith();
-        });
-    });
-
-    describe('deleteZone()', () => {
-        it('should make an HTTP POST query and then call the showMessage() method', () => {
-            jest.spyOn(controller.$state, 'go').mockReturnThis();
-            jest.spyOn(controller.vnApp, 'showSuccess');
-
-            const stateName = 'zone.index';
-            $httpBackend.when('POST', 'Zones/1/deleteZone').respond(200);
-            controller.deleteZone();
-            $httpBackend.flush();
-
-            expect(controller.$state.go).toHaveBeenCalledWith(stateName);
-            expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Zone deleted');
-        });
-    });
-
-    describe('onCloneAccept()', () => {
-        it('should make an HTTP POST query and then call the state go() method', () => {
-            jest.spyOn(controller.$state, 'go').mockReturnThis();
-
-            const stateName = 'zone.card.basicData';
-            const expectedData = {id: 1};
-            $httpBackend.when('POST', 'Zones/1/clone').respond(expectedData);
-            controller.onCloneAccept();
-            $httpBackend.flush();
-
-            expect(controller.$state.go).toHaveBeenCalledWith(stateName, expectedData);
-        });
-    });
-});
diff --git a/modules/zone/front/descriptor/locale/es.yml b/modules/zone/front/descriptor/locale/es.yml
deleted file mode 100644
index 0581ee93a..000000000
--- a/modules/zone/front/descriptor/locale/es.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-This zone contains tickets: Esta zona contiene {{ticketsAmount}} tickets por servir. ¿Seguro que quieres eliminar esta zona?
-Do you want to clone this zone?: ¿Quieres clonar esta zona?
-All it's properties will be copied: Todas sus propiedades serán copiadas
-Zone deleted: Zona eliminada
\ No newline at end of file
diff --git a/modules/zone/front/events/index.html b/modules/zone/front/events/index.html
deleted file mode 100644
index 157b2a669..000000000
--- a/modules/zone/front/events/index.html
+++ /dev/null
@@ -1,277 +0,0 @@
-<vn-zone-calendar
-    id="calendar"
-    vn-id="calendar"
-    data="data"
-    on-selection="$ctrl.onSelection($days, $type, $weekday, $events, $exclusions, $geoExclusions)"
-    on-step="$ctrl.refresh()"
-    class="vn-w-md">
-</vn-zone-calendar>
-<vn-side-menu side="right">
-    <div class="vn-pa-md">
-        <h6
-            class="text-secondary"
-            style="font-weight: normal;"
-            translate>
-            Edit mode
-        </h6>
-        <vn-vertical>
-            <vn-radio
-                label="Include"
-                val="include"
-                ng-model="$ctrl.editMode">
-            </vn-radio>
-            <vn-radio
-                label="Exclude"
-                val="exclude"
-                ng-model="$ctrl.editMode">
-            </vn-radio>
-        </vn-vertical>
-    </div>
-    <h6
-        class="text-secondary vn-px-md"
-        style="font-weight: normal;"
-        translate>
-        Events
-    </h6>
-    <vn-data-viewer
-        data="data.events"
-        is-loading="!data.events">
-        <div class="vn-list separated">
-        <a
-            ng-repeat="row in data.events"
-            translate-attr="{title: 'Edit'}"
-            ng-click="$ctrl.onEditClick(row, $event)"
-            class="vn-item">
-            <vn-item-section>
-                <div
-                    ng-if="::row.type == 'day'"
-                    class="vn-mb-sm">
-                    {{::row.dated | date:'dd/MM/yy'}}
-                </div>
-                <div
-                    ng-if="::row.type != 'day'"
-                    class="vn-mb-sm ellipsize">
-                    <span ng-if="row.weekDays">
-                        {{::$ctrl.formatWdays(row.weekDays)}}
-                    </span>
-                    <span ng-if="row.type == 'range'">
-                        ({{::row.started | date:'dd/MM/yy'}} - {{::row.ended | date:'dd/MM/yy'}})
-                    </span>
-                </div>
-                <vn-label-value
-                    label="Closing"
-                    value="{{::row.hour | date:'HH:mm'}}">
-                </vn-label-value>
-                <vn-label-value
-                    label="Traveling days"
-                    value="{{::row.travelingDays}}">
-                </vn-label-value>
-                <vn-label-value
-                    label="Price"
-                    value="{{::row.price | currency:'EUR':2}}">
-                </vn-label-value>
-                <vn-label-value
-                    label="Bonus"
-                    value="{{::row.bonus | currency:'EUR':2}}">
-                </vn-label-value>
-                <vn-label-value
-                    label="Max m³"
-                    value="{{::row.m3Max}}">
-                </vn-label-value>
-            </vn-item-section>
-            <vn-item-section side>
-                <vn-icon-button
-                    icon="delete"
-                    translate-attr="{title: 'Delete'}"
-                    ng-click="$ctrl.onDeleteClick(row.id, $event)">
-                </vn-icon-button>
-            </vn-item-section>
-        </a>
-        </div>
-    </vn-data-viewer>
-</vn-side-menu>
-<vn-float-button
-    ng-click="$ctrl.createInclusion('weekday')"
-    icon="add"
-    vn-tooltip="Add event"
-    vn-bind="+"
-    fixed-bottom-right>
-</vn-float-button>
-<vn-dialog
-    vn-id="includeDialog"
-    on-response="$ctrl.onIncludeResponse($response)"
-    message="{{$ctrl.isNew ? 'Add event' : 'Edit event'}}">
-    <tpl-body>
-        <vn-vertical>
-            <vn-vertical class="vn-pb-md">
-                <vn-radio
-                    ng-model="$ctrl.selected.type"
-                    label="One day"
-                    val="day">
-                </vn-radio>
-                <vn-radio
-                    ng-model="$ctrl.selected.type"
-                    label="Indefinitely"
-                    val="indefinitely">
-                </vn-radio>
-                <vn-radio
-                    ng-model="$ctrl.selected.type"
-                    label="Range of dates"
-                    val="range">
-                </vn-radio>
-            </vn-vertical>
-            <vn-wday-picker
-                ng-if="$ctrl.selected.type != 'day'"
-                ng-model="$ctrl.selected.wdays"
-                class="vn-mt-sm vn-mb-md">
-            </vn-wday-picker>
-            <vn-date-picker
-                ng-if="$ctrl.selected.type == 'day'"
-                label="Day"
-                ng-model="$ctrl.selected.dated">
-            </vn-date-picker>
-            <vn-horizontal
-                ng-if="$ctrl.selected.type == 'range'">
-                <vn-date-picker
-                    label="From"
-                    ng-model="$ctrl.selected.started">
-                </vn-date-picker>
-                <vn-date-picker
-                    label="To"
-                    ng-model="$ctrl.selected.ended">
-                </vn-date-picker>
-            </vn-horizontal>
-            <vn-horizontal>
-                <vn-input-time
-                    label="Closing"
-                    ng-model="$ctrl.selected.hour">
-                </vn-input-time>
-                <vn-input-number
-                    label="Traveling days"
-                    ng-model="$ctrl.selected.travelingDays"
-                    min="0"
-                    step="1">
-                </vn-input-number>
-            </vn-horizontal>
-            <vn-horizontal>
-                <vn-input-number
-                    label="Price"
-                    ng-model="$ctrl.selected.price"
-                    min="0"
-                    step="0.01">
-                </vn-input-number>
-                <vn-input-number
-                    label="Bonus"
-                    ng-model="$ctrl.selected.bonus"
-                    min="0"
-                    step="0.01">
-                </vn-input-number>
-            </vn-horizontal>
-            <vn-input-number
-                label="Max m³"
-                ng-model="$ctrl.selected.m3Max"
-                min="0"
-                step="0.01">
-            </vn-input-number>
-        </vn-vertical>
-    </tpl-body>
-    <tpl-buttons>
-        <input
-            type="button"
-            response="cancel"
-            translate-attr="{value: 'Cancel'}">
-        </input>
-        <input
-            type="button"
-            ng-if="!$ctrl.isNew"
-            response="delete"
-            translate-attr="{value: 'Delete'}">
-        </input>
-        <button response="accept">
-            <span ng-if="$ctrl.isNew" translate>Add</span>
-            <span ng-if="!$ctrl.isNew" translate>Save</span>
-        </button>
-    </tpl-buttons>
-</vn-dialog>
-<vn-confirm
-    vn-id="confirm"
-    message="This item will be deleted"
-    question="Are you sure you want to continue?">
-</vn-confirm>
-<vn-dialog
-    vn-id="excludeDialog"
-    on-response="$ctrl.onExcludeResponse($response)"
-    message="{{$ctrl.isNew ? 'Add exclusion' : 'Edit exclusion'}}"
-    on-open="$ctrl.onSearch($params)"
-    on-close="$ctrl.resetExclusions()">
-    <tpl-body>
-        <vn-date-picker
-            label="Day"
-            ng-model="$ctrl.excludeSelected.dated">
-        </vn-date-picker>
-        <vn-vertical class="width">
-            <vn-vertical class="vn-pb-md">
-                <vn-radio
-                    ng-model="$ctrl.excludeSelected.type"
-                    label="All"
-                    on-change="$ctrl.test()"
-                    val="all">
-                </vn-radio>
-                <vn-radio
-                    ng-model="$ctrl.excludeSelected.type"
-                    label="Specific locations"
-                    on-change="$ctrl.onSearch($params)"
-                    val="specificLocations">
-                </vn-radio>
-            </vn-vertical>
-            <vn-crud-model
-                vn-id="model"
-                url="Zones/{{$ctrl.$params.id}}/getLeaves"
-                filter="$ctrl.filter">
-            </vn-crud-model>
-            <div ng-if="$ctrl.excludeSelected.type == 'specificLocations'">
-                <vn-textfield
-                    label="Search"
-                    ng-keydown="$ctrl.onKeyDown($event)"
-                    ng-model="$ctrl.excludeSearch">
-                    <prepend>
-                        <vn-icon icon="search"></vn-icon>
-                    </prepend>
-                </vn-textfield>
-                <div class="treeview">
-                    <vn-treeview
-                        vn-id="treeview"
-                        root-label="Locations where it is not distributed"
-                        fetch-func="$ctrl.onFetch($item)"
-                        sort-func="$ctrl.onSort($a, $b)">
-                        <vn-check
-                            ng-model="item.checked"
-                            ng-click="$event.preventDefault()"
-                            on-change="$ctrl.onItemCheck(item.id, value)"
-                            label="{{::item.name}}">
-                        </vn-check>
-                    </vn-treeview>
-                </div>
-            </div>
-        </vn-vertical>
-    </tpl-body>
-    <tpl-buttons>
-        <input
-            type="button"
-            response="cancel"
-            translate-attr="{value: 'Cancel'}"
-            tabindex="0">
-        </input>
-        <input
-            type="button"
-            ng-if="!$ctrl.isNew"
-            response="delete"
-            translate-attr="{value: 'Delete'}"
-            tabindex="0">
-        </input>
-        <button response="accept">
-            <span ng-if="$ctrl.isNew" translate>Add</span>
-            <span ng-if="!$ctrl.isNew" translate>Save</span>
-        </button>
-    </tpl-buttons>
-</vn-dialog>
diff --git a/modules/zone/front/events/index.js b/modules/zone/front/events/index.js
deleted file mode 100644
index b86330126..000000000
--- a/modules/zone/front/events/index.js
+++ /dev/null
@@ -1,316 +0,0 @@
-import ngModule from '../module';
-import Section from 'salix/components/section';
-import './style.scss';
-
-class Controller extends Section {
-    constructor($element, $, vnWeekDays) {
-        super($element, $);
-        this.vnWeekDays = vnWeekDays;
-        this.editMode = 'include';
-    }
-
-    $onInit() {
-        this.refresh();
-    }
-
-    get path() {
-        return `Zones/${this.$params.id}/events`;
-    }
-
-    get exclusionsPath() {
-        return `Zones/${this.$params.id}/exclusions`;
-    }
-
-    get checked() {
-        const geos = this.$.model.data || [];
-        const checkedLines = [];
-        for (let geo of geos) {
-            if (geo.checked)
-                checkedLines.push(geo);
-        }
-        return checkedLines;
-    }
-
-    refresh() {
-        this.$.data = null;
-        this.$.$applyAsync(() => {
-            const params = {
-                zoneFk: this.$params.id,
-                started: this.$.calendar.firstDay,
-                ended: this.$.calendar.lastDay
-            };
-
-            this.$http.get(`Zones/getEventsFiltered`, {params}).then(res => {
-                const data = res.data;
-                this.$.data = data;
-            });
-        });
-    }
-
-    formatWdays(weekDays) {
-        if (!weekDays) return;
-
-        let abrWdays = weekDays
-            .split(',')
-            .map(wday => this.vnWeekDays.map[wday].localeAbr);
-
-        return abrWdays.length < 7
-            ? abrWdays.join(', ')
-            : this.$t('Everyday');
-    }
-
-    onSelection(days, type, weekday, events, exclusions, exclusionGeos) {
-        if (this.editMode == 'include') {
-            if (events.length)
-                return this.editInclusion(events[0]);
-            return this.createInclusion(type, days, weekday);
-        } else if (this.editMode == 'exclude') {
-            if (exclusions.length || exclusionGeos.length)
-                return this.editExclusion(exclusions[0] || {}, exclusionGeos);
-            return this.createExclusion(days);
-        }
-    }
-
-    editExclusion(exclusion, exclusionGeos) {
-        this.isNew = false;
-        this.excludeSelected = angular.copy(exclusion);
-        this.excludeSelected.type = exclusionGeos.length ?
-            'specificLocations' : 'all';
-
-        this.exclusionGeos = new Set();
-        if (exclusionGeos.length) {
-            this.excludeSelected.id = exclusionGeos[0].zoneExclusionFk;
-            exclusionGeos.forEach(x => this.exclusionGeos.add(x.geoFk));
-        }
-
-        this.$.excludeDialog.show();
-    }
-
-    createExclusion(days) {
-        this.isNew = true;
-        this.excludeSelected = {
-            type: 'all',
-            dated: days[0]
-        };
-        this.exclusionGeos = new Set();
-        this.$.excludeDialog.show();
-    }
-
-    onEditClick(row, event) {
-        if (event.defaultPrevented) return;
-        this.editInclusion(row);
-    }
-
-    editInclusion(row) {
-        this.isNew = false;
-        this.selected = angular.copy(row);
-        this.selected.wdays = this.vnWeekDays.fromSet(row.weekDays);
-        this.$.includeDialog.show();
-    }
-
-    createInclusion(type, days, weekday) {
-        this.isNew = true;
-
-        if (type == 'weekday') {
-            let wdays = [];
-            if (weekday) wdays[weekday] = true;
-
-            this.selected = {
-                type: 'indefinitely',
-                wdays
-            };
-        } else {
-            this.selected = {
-                type: 'day',
-                dated: days[0]
-            };
-        }
-
-        this.$.includeDialog.show();
-    }
-
-    onIncludeResponse(response) {
-        switch (response) {
-        case 'accept': {
-            let selected = this.selected;
-            let type = selected.type;
-
-            selected.weekDays = this.vnWeekDays.toSet(selected.wdays);
-
-            if (type == 'day')
-                selected.weekDays = '';
-            else
-                selected.dated = null;
-
-            if (type != 'range') {
-                selected.started = null;
-                selected.ended = null;
-            }
-
-            let req;
-
-            if (this.isNew)
-                req = this.$http.post(this.path, selected);
-            else
-                req = this.$http.put(`${this.path}/${selected.id}`, selected);
-
-            return req.then(() => {
-                this.selected = null;
-                this.isNew = null;
-                this.refresh();
-            });
-        }
-        case 'delete':
-            return this.onDelete(this.selected.id)
-                .then(response => response == 'accept');
-        }
-    }
-
-    onExcludeResponse(response) {
-        const type = this.excludeSelected.type;
-        switch (response) {
-        case 'accept': {
-            if (type == 'all')
-                return this.exclusionCreate();
-            return this.exclusionGeoCreate();
-        }
-        case 'delete':
-            return this.exclusionDelete(this.excludeSelected);
-        }
-    }
-
-    onDeleteClick(id, event) {
-        if (event.defaultPrevented) return;
-        event.preventDefault();
-        this.onDelete(id);
-    }
-
-    onDelete(id) {
-        return this.$.confirm.show(
-            response => this.onDeleteResponse(response, id));
-    }
-
-    onDeleteResponse(response, id) {
-        if (response != 'accept' || !id) return;
-        return this.$http.delete(`${this.path}/${id}`)
-            .then(() => this.refresh());
-    }
-
-    exclusionCreate() {
-        const excludeSelected = this.excludeSelected;
-        const dated = excludeSelected.dated;
-        let req;
-
-        if (this.isNew)
-            req = this.$http.post(this.exclusionsPath, [{dated}]);
-        if (!this.isNew)
-            req = this.$http.put(`${this.exclusionsPath}/${excludeSelected.id}`, {dated});
-
-        return req.then(() => {
-            this.refresh();
-        });
-    }
-
-    exclusionGeoCreate() {
-        const excludeSelected = this.excludeSelected;
-        let req;
-        const geoIds = [];
-        this.exclusionGeos.forEach(id => geoIds.push(id));
-
-        if (this.isNew) {
-            const params = {
-                zoneFk: parseInt(this.$params.id),
-                date: excludeSelected.dated,
-                geoIds
-            };
-            req = this.$http.post(`Zones/exclusionGeo`, params);
-        } else {
-            const params = {
-                zoneExclusionFk: this.excludeSelected.id,
-                geoIds
-            };
-            req = this.$http.post(`Zones/updateExclusionGeo`, params);
-        }
-        return req.then(() => this.refresh());
-    }
-
-    exclusionDelete(exclusion) {
-        const path = `${this.exclusionsPath}/${exclusion.id}`;
-        return this.$http.delete(path)
-            .then(() => this.refresh());
-    }
-
-    set excludeSearch(value) {
-        this._excludeSearch = value;
-        if (!value) this.onSearch();
-    }
-
-    get excludeSearch() {
-        return this._excludeSearch;
-    }
-
-    onKeyDown(event) {
-        if (event.key == 'Enter') {
-            event.preventDefault();
-            this.onSearch();
-        }
-    }
-
-    onSearch() {
-        const params = {search: this._excludeSearch};
-        if (this.excludeSelected.type == 'specificLocations') {
-            this.$.model.applyFilter({}, params).then(() => {
-                const data = this.$.model.data;
-                this.getChecked(data);
-                this.$.treeview.data = data;
-            });
-        }
-    }
-
-    onFetch(item) {
-        const params = item ? {parentId: item.id} : null;
-        return this.$.model.applyFilter({}, params).then(() => {
-            const data = this.$.model.data;
-            this.getChecked(data);
-            return data;
-        });
-    }
-
-    onSort(a, b) {
-        if (b.selected !== a.selected) {
-            if (a.selected == null)
-                return 1;
-            if (b.selected == null)
-                return -1;
-            return b.selected - a.selected;
-        }
-
-        return a.name.localeCompare(b.name);
-    }
-
-    getChecked(data) {
-        for (let geo of data) {
-            geo.checked = this.exclusionGeos.has(geo.id);
-            if (geo.childs) this.getChecked(geo.childs);
-        }
-    }
-
-    onItemCheck(geoId, checked) {
-        if (checked)
-            this.exclusionGeos.add(geoId);
-        else
-            this.exclusionGeos.delete(geoId);
-    }
-}
-Controller.$inject = ['$element', '$scope', 'vnWeekDays'];
-
-ngModule.vnComponent('vnZoneEvents', {
-    template: require('./index.html'),
-    controller: Controller,
-    bindings: {
-        zone: '<'
-    },
-    require: {
-        card: '^vnZoneCard'
-    }
-});
diff --git a/modules/zone/front/events/index.spec.js b/modules/zone/front/events/index.spec.js
deleted file mode 100644
index 558d97b6f..000000000
--- a/modules/zone/front/events/index.spec.js
+++ /dev/null
@@ -1,340 +0,0 @@
-import './index';
-import crudModel from 'core/mocks/crud-model';
-
-describe('component vnZoneEvents', () => {
-    let $scope;
-    let controller;
-    let $httpBackend;
-
-    beforeEach(ngModule('zone'));
-
-    beforeEach(inject(($componentController, $rootScope, _$httpBackend_) => {
-        $httpBackend = _$httpBackend_;
-        $scope = $rootScope.$new();
-        const $element = angular.element(`<vn-zone-events></vn-zone-events>`);
-        controller = $componentController('vnZoneEvents', {$element, $scope});
-        controller.$params = {id: 1};
-    }));
-
-    describe('refresh()', () => {
-        it('should set the zone and then call both getSummary() and getWarehouses()', () => {
-            const date = '2021-10-01';
-
-            controller.$params.id = 999;
-            controller.$.calendar = {
-                firstDay: date,
-                lastDay: date
-            };
-
-            const params = {
-                zoneFk: controller.$params.id,
-                started: date,
-                ended: date
-            };
-
-            const query = `Zones/getEventsFiltered?ended=${date}&started=${date}&zoneFk=${params.zoneFk}`;
-            const response = {
-                events: 'myEvents',
-                exclusions: 'myExclusions',
-                geoExclusions: 'myGeoExclusions',
-            };
-            $httpBackend.whenGET(query).respond(response);
-            controller.refresh();
-            $httpBackend.flush();
-
-            const data = controller.$.data;
-
-            expect(data.events).toBeDefined();
-            expect(data.exclusions).toBeDefined();
-        });
-    });
-
-    describe('onSelection()', () => {
-        it('should call the editInclusion() method', () => {
-            jest.spyOn(controller, 'editInclusion').mockReturnThis();
-
-            const weekday = {};
-            const days = [];
-            const type = 'EventType';
-            const events = [{name: 'Event'}];
-            const exclusions = [];
-            const exclusionsGeo = [];
-            controller.editMode = 'include';
-            controller.onSelection(days, type, weekday, events, exclusions, exclusionsGeo);
-
-            expect(controller.editInclusion).toHaveBeenCalledWith({name: 'Event'});
-        });
-
-        it('should call the createInclusion() method', () => {
-            jest.spyOn(controller, 'createInclusion').mockReturnThis();
-
-            const weekday = {dated: Date.vnNew()};
-            const days = [weekday];
-            const type = 'EventType';
-            const events = [];
-            const exclusions = [];
-            const exclusionsGeo = [];
-            controller.editMode = 'include';
-            controller.onSelection(days, type, weekday, events, exclusions, exclusionsGeo);
-
-            expect(controller.createInclusion).toHaveBeenCalledWith(type, days, weekday);
-        });
-
-        it('should call the editExclusion() method with exclusions', () => {
-            jest.spyOn(controller, 'editExclusion').mockReturnThis();
-
-            const weekday = {};
-            const days = [];
-            const type = 'EventType';
-            const events = [];
-            const exclusions = [{name: 'Exclusion'}];
-            const exclusionsGeo = [];
-            controller.editMode = 'exclude';
-            controller.onSelection(days, type, weekday, events, exclusions, exclusionsGeo);
-
-            expect(controller.editExclusion).toHaveBeenCalled();
-        });
-
-        it('should call the editExclusion() method with exclusionsGeo', () => {
-            jest.spyOn(controller, 'editExclusion').mockReturnThis();
-
-            const weekday = {};
-            const days = [];
-            const type = 'EventType';
-            const events = [];
-            const exclusions = [];
-            const exclusionsGeo = [{name: 'GeoExclusion'}];
-            controller.editMode = 'exclude';
-            controller.onSelection(days, type, weekday, events, exclusions, exclusionsGeo);
-
-            expect(controller.editExclusion).toHaveBeenCalled();
-        });
-
-        it('should call the createExclusion() method', () => {
-            jest.spyOn(controller, 'createExclusion').mockReturnThis();
-
-            const weekday = {};
-            const days = [{dated: Date.vnNew()}];
-            const type = 'EventType';
-            const events = [];
-            const exclusions = [];
-            const exclusionsGeo = [];
-            controller.editMode = 'exclude';
-            controller.onSelection(days, type, weekday, events, exclusions, exclusionsGeo);
-
-            expect(controller.createExclusion).toHaveBeenCalledWith(days);
-        });
-    });
-
-    describe('editExclusion()', () => {
-        it('shoud set the excludeSelected.type = "specificLocations" and then call the excludeDialog show() method', () => {
-            controller.$.excludeDialog = {show: jest.fn()};
-
-            const exclusionGeos = [{id: 1}];
-            const exclusions = [];
-
-            controller.editExclusion(exclusions, exclusionGeos);
-
-            expect(controller.excludeSelected.type).toEqual('specificLocations');
-            expect(controller.$.excludeDialog.show).toHaveBeenCalledWith();
-        });
-
-        it('shoud set the excludeSelected.type = "all" and then call the excludeDialog show() method', () => {
-            controller.$.excludeDialog = {show: jest.fn()};
-
-            const exclusionGeos = [];
-            const exclusions = [{id: 1}];
-
-            controller.editExclusion(exclusions, exclusionGeos);
-
-            expect(controller.excludeSelected.type).toEqual('all');
-            expect(controller.$.excludeDialog.show).toHaveBeenCalledWith();
-        });
-    });
-
-    describe('createExclusion()', () => {
-        it('shoud set the excludeSelected property and then call the excludeDialog show() method', () => {
-            controller.$.excludeDialog = {show: jest.fn()};
-
-            const days = [Date.vnNew()];
-            controller.createExclusion(days);
-
-            expect(controller.excludeSelected).toBeDefined();
-            expect(controller.isNew).toBeTruthy();
-            expect(controller.$.excludeDialog.show).toHaveBeenCalledWith();
-        });
-    });
-
-    describe('createInclusion()', () => {
-        it('shoud set the selected property and then call the includeDialog show() method', () => {
-            controller.$.includeDialog = {show: jest.fn()};
-
-            const type = 'weekday';
-            const days = [Date.vnNew()];
-            const weekday = 1;
-            controller.createInclusion(type, days, weekday);
-
-            const selection = controller.selected;
-            const firstWeekday = selection.wdays[weekday];
-
-            expect(selection.type).toEqual('indefinitely');
-            expect(firstWeekday).toBeTruthy();
-            expect(controller.isNew).toBeTruthy();
-            expect(controller.$.includeDialog.show).toHaveBeenCalledWith();
-        });
-
-        it('shoud set the selected property with the first day and then call the includeDialog show() method', () => {
-            controller.$.includeDialog = {show: jest.fn()};
-
-            const type = 'nonListedType';
-            const days = [Date.vnNew()];
-            const weekday = 1;
-            controller.createInclusion(type, days, weekday);
-
-            const selection = controller.selected;
-
-            expect(selection.type).toEqual('day');
-            expect(selection.dated).toEqual(days[0]);
-            expect(controller.isNew).toBeTruthy();
-            expect(controller.$.includeDialog.show).toHaveBeenCalledWith();
-        });
-    });
-
-    describe('onIncludeResponse()', () => {
-        it('shoud call the onDelete() method', () => {
-            jest.spyOn(controller, 'onDelete').mockReturnValue(
-                new Promise(accept => accept())
-            );
-
-            controller.selected = {id: 1};
-            controller.onIncludeResponse('delete');
-
-            expect(controller.onDelete).toHaveBeenCalledWith(1);
-        });
-
-        it('shoud make an HTTP POST query to create a new one and then call the refresh() method', () => {
-            jest.spyOn(controller, 'refresh').mockReturnThis();
-
-            controller.selected = {id: 1};
-            controller.isNew = true;
-
-            $httpBackend.when('POST', `Zones/1/events`).respond(200);
-            controller.onIncludeResponse('accept');
-            $httpBackend.flush();
-
-            expect(controller.refresh).toHaveBeenCalledWith();
-        });
-
-        it('shoud make an HTTP PUT query and then call the refresh() method', () => {
-            jest.spyOn(controller, 'refresh').mockReturnThis();
-
-            controller.selected = {id: 1};
-            controller.isNew = false;
-
-            const eventId = 1;
-            $httpBackend.when('PUT', `Zones/1/events/${eventId}`).respond(200);
-            controller.onIncludeResponse('accept');
-            $httpBackend.flush();
-
-            expect(controller.refresh).toHaveBeenCalledWith();
-        });
-    });
-
-    describe('onExcludeResponse()', () => {
-        it('should call the exclusionCreate() method', () => {
-            jest.spyOn(controller, 'exclusionCreate').mockReturnThis();
-
-            controller.excludeSelected = {type: 'all'};
-            controller.onExcludeResponse('accept');
-
-            expect(controller.exclusionCreate).toHaveBeenCalledWith();
-        });
-
-        it('should call the exclusionGeoCreate() method', () => {
-            jest.spyOn(controller, 'exclusionGeoCreate').mockReturnThis();
-
-            controller.excludeSelected = {type: 'specificLocations'};
-            controller.onExcludeResponse('accept');
-
-            expect(controller.exclusionGeoCreate).toHaveBeenCalledWith();
-        });
-
-        it('should call the exclusionDelete() method', () => {
-            jest.spyOn(controller, 'exclusionDelete').mockReturnThis();
-
-            controller.excludeSelected = {id: 1, type: 'all'};
-            controller.onExcludeResponse('delete');
-
-            expect(controller.exclusionDelete).toHaveBeenCalledWith(controller.excludeSelected);
-        });
-    });
-
-    describe('onDeleteResponse()', () => {
-        it('shoud make an HTTP DELETE query and then call the refresh() method', () => {
-            jest.spyOn(controller, 'refresh').mockReturnThis();
-
-            const eventId = 1;
-            $httpBackend.expect('DELETE', `Zones/1/events/1`).respond({id: 1});
-            controller.onDeleteResponse('accept', eventId);
-            $httpBackend.flush();
-
-            expect(controller.refresh).toHaveBeenCalledWith();
-        });
-    });
-
-    describe('exclusionCreate()', () => {
-        it('shoud make an HTTP POST query and then call the refresh() method', () => {
-            jest.spyOn(controller, 'refresh').mockReturnThis();
-
-            controller.excludeSelected = {};
-            controller.isNew = true;
-            $httpBackend.expect('POST', `Zones/1/exclusions`).respond({id: 1});
-            controller.exclusionCreate();
-            $httpBackend.flush();
-
-            expect(controller.refresh).toHaveBeenCalledWith();
-        });
-    });
-
-    describe('exclusionDelete()', () => {
-        it('shoud make an HTTP DELETE query once and then call the refresh() method', () => {
-            jest.spyOn(controller, 'refresh').mockReturnThis();
-
-            const exclusions = {id: 1};
-            const firstExclusionId = 1;
-            $httpBackend.expectDELETE(`Zones/1/exclusions/${firstExclusionId}`).respond(200);
-            controller.exclusionDelete(exclusions);
-            $httpBackend.flush();
-
-            expect(controller.refresh).toHaveBeenCalledWith();
-        });
-    });
-
-    describe('onSearch()', () => {
-        it('should call the applyFilter() method and then set the data', () => {
-            jest.spyOn(controller, 'getChecked').mockReturnValue([1, 2, 3]);
-
-            controller.$.treeview = {};
-            controller.$.model = crudModel;
-            controller.excludeSelected = {type: 'specificLocations'};
-            controller._excludeSearch = 'es';
-
-            controller.onSearch();
-            const treeviewData = controller.$.treeview.data;
-
-            expect(treeviewData).toBeDefined();
-            expect(treeviewData.length).toEqual(3);
-        });
-    });
-
-    describe('onFetch()', () => {
-        it('should call the applyFilter() method and then return the model data', () => {
-            jest.spyOn(controller, 'getChecked').mockReturnValue([1, 2, 3]);
-
-            controller.$.model = crudModel;
-            const result = controller.onFetch();
-
-            expect(result.length).toEqual(3);
-        });
-    });
-});
diff --git a/modules/zone/front/events/locale/es.yml b/modules/zone/front/events/locale/es.yml
deleted file mode 100644
index d6eee9f67..000000000
--- a/modules/zone/front/events/locale/es.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-Edit mode: Modo de edición
-Include: Incluir
-Exclude: Excluir
-Events: Eventos
-Add event: Añadir evento
-Edit event: Editar evento
-All: Todo
-Specific locations: Localizaciones concretas
-Locations where it is not distributed: Localizaciones en las que no se reparte
-You must select a location: Debes seleccionar una localización
-Add exclusion: Añadir exclusión
-Edit exclusion: Editar exclusión
diff --git a/modules/zone/front/events/style.scss b/modules/zone/front/events/style.scss
deleted file mode 100644
index 49a6e87a6..000000000
--- a/modules/zone/front/events/style.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-@import "variables";
-
-    .width{
-        width: 600px
-    }
-
-    .treeview{
-        max-height: 300px; 
-        overflow: auto;
-    }
-
diff --git a/modules/zone/front/index.js b/modules/zone/front/index.js
index dc20eea47..a7209a0bd 100644
--- a/modules/zone/front/index.js
+++ b/modules/zone/front/index.js
@@ -1,19 +1,3 @@
 export * from './module';
 
 import './main';
-import './index/';
-import './delivery-days';
-import './summary';
-import './card';
-import './descriptor';
-import './descriptor-popover';
-import './search-panel';
-import './create';
-import './basic-data';
-import './warehouses';
-import './events';
-import './calendar';
-import './location';
-import './calendar';
-import './upcoming-deliveries';
-import './log';
diff --git a/modules/zone/front/index/index.html b/modules/zone/front/index/index.html
deleted file mode 100644
index 78e3f2cd8..000000000
--- a/modules/zone/front/index/index.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<vn-auto-search
-    model="model">
-</vn-auto-search>
-<vn-data-viewer
-    model="model"
-    class="vn-w-md vn-mb-xl">
-    <vn-card>
-    <vn-table model="model">
-        <vn-thead>
-            <vn-tr>
-                <vn-th field="id" number>Id</vn-th>
-                <vn-th field="name" expand>Name</vn-th>
-                <vn-th field="agencyModeFk">Agency</vn-th>
-                <vn-th field="hour" shrink>Closing</vn-th>
-                <vn-th field="price" number>Price</vn-th>
-                <vn-th shrink></vn-th>
-            </vn-tr>
-        </vn-thead>
-        <vn-tbody>
-            <a
-                ng-repeat="zone in model.data"
-                ui-sref="zone.card.summary({id: zone.id})"
-                class="clickable vn-tr search-result">
-                <vn-td number>{{::zone.id}}</vn-td>
-                <vn-td expand>{{::zone.name}}</vn-td>
-                <vn-td expand>{{::zone.agencyMode.name}}</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">
-                        <vn-icon-button
-                            vn-click-stop="clone.show(zone)"
-                            vn-tooltip="Clone"
-                            icon="icon-clone"
-                            vn-acl="deliveryAssistant"
-                            vn-acl-action="remove">
-                        </vn-icon-button>
-                        <vn-icon-button
-                            vn-click-stop="$ctrl.preview(zone)"
-                            vn-tooltip="Preview"
-                            icon="preview">
-                        </vn-icon-button>
-                    </vn-horizontal>
-                </vn-td>
-            </a>
-        </vn-tbody>
-    </vn-table>
-    </vn-card>
-</vn-data-viewer>
-<vn-popup vn-id="summary">
-    <vn-zone-summary zone="$ctrl.selectedZone"></vn-zone-summary>
-</vn-popup>
-<vn-confirm
-    vn-id="clone"
-    on-accept="$ctrl.onCloneAccept($data)"
-    question="Do you want to clone this zone?"
-    message="All it's properties will be copied">
-</vn-confirm>
-<a ui-sref="zone.create"
-    vn-tooltip="New zone"
-    vn-bind="+"
-    fixed-bottom-right>
-    <vn-float-button
-        icon="add"
-        vn-acl="deliveryAssistant"
-        vn-acl-action="remove">
-    </vn-float-button>
-</a>
diff --git a/modules/zone/front/index/index.js b/modules/zone/front/index/index.js
deleted file mode 100644
index ad54f7df4..000000000
--- a/modules/zone/front/index/index.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import ngModule from '../module';
-import Section from 'salix/components/section';
-
-export default class Controller extends Section {
-    preview(zone) {
-        this.selectedZone = zone;
-        this.$.summary.show();
-    }
-
-    onCloneAccept(zone) {
-        return this.$http.post(`Zones/${zone.id}/clone`)
-            .then(res => {
-                this.$state.go('zone.card.basicData', {id: res.data.id});
-            });
-    }
-}
-
-ngModule.vnComponent('vnZoneIndex', {
-    template: require('./index.html'),
-    controller: Controller
-});
diff --git a/modules/zone/front/index/locale/es.yml b/modules/zone/front/index/locale/es.yml
deleted file mode 100644
index 14195e869..000000000
--- a/modules/zone/front/index/locale/es.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-Do you want to clone this zone?: ¿Seguro que quieres clonar esta zona?
-All it's properties will be copied: Todas sus propiedades serán copiadas
\ No newline at end of file
diff --git a/modules/zone/front/location/index.html b/modules/zone/front/location/index.html
deleted file mode 100644
index b86c618b7..000000000
--- a/modules/zone/front/location/index.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<vn-crud-model
-    vn-id="model"
-    url="Zones/{{$ctrl.$params.id}}/getLeaves"
-    filter="$ctrl.filter">
-</vn-crud-model>
-<vn-portal slot="topbar">
-    <vn-searchbar
-        on-search="$ctrl.onSearch($params)"
-        auto-state="false">
-    </vn-searchbar>
-</vn-portal>
-<div class="vn-w-md">
-    <vn-card class="vn-pa-lg">
-    <vn-treeview
-        vn-id="treeview"
-        root-label="Locations"
-        fetch-func="$ctrl.onFetch($item)"
-        sort-func="$ctrl.onSort($a, $b)">
-        <vn-check acl-role="deliveryAssistant"
-            ng-model="item.selected"
-            on-change="$ctrl.onSelection(value, item)"
-            triple-state="true"
-            ng-click="$event.preventDefault()"
-            label="{{::item.name}}">
-        </vn-check>
-    </vn-treeview>
-    </vn-card>
-</div>
diff --git a/modules/zone/front/location/index.js b/modules/zone/front/location/index.js
deleted file mode 100644
index 0f92f37de..000000000
--- a/modules/zone/front/location/index.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import ngModule from '../module';
-import Section from 'salix/components/section';
-import './style.scss';
-
-class Controller extends Section {
-    onSearch(params) {
-        this.$.model.applyFilter({}, params).then(() => {
-            const data = this.$.model.data;
-            this.$.treeview.data = data;
-        });
-    }
-
-    onFetch(item) {
-        const params = item ? {parentId: item.id} : null;
-        return this.$.model.applyFilter({}, params)
-            .then(() => this.$.model.data);
-    }
-
-    onSort(a, b) {
-        if (b.selected !== a.selected) {
-            if (a.selected == null)
-                return 1;
-            if (b.selected == null)
-                return -1;
-            return b.selected - a.selected;
-        }
-
-        return a.name.localeCompare(b.name);
-    }
-
-    exprBuilder(param, value) {
-        switch (param) {
-        case 'search':
-            return {name: {like: `%${value}%`}};
-        }
-    }
-
-    onSelection(value, item) {
-        if (value == null)
-            value = undefined;
-        const params = {geoId: item.id, isIncluded: value};
-        const path = `zones/${this.zone.id}/toggleIsIncluded`;
-        this.$http.post(path, params);
-    }
-}
-
-ngModule.vnComponent('vnZoneLocation', {
-    template: require('./index.html'),
-    controller: Controller,
-    bindings: {
-        zone: '<'
-    },
-    require: {
-        card: '^vnZoneCard'
-    }
-});
diff --git a/modules/zone/front/location/index.spec.js b/modules/zone/front/location/index.spec.js
deleted file mode 100644
index 30968209c..000000000
--- a/modules/zone/front/location/index.spec.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import './index';
-import crudModel from 'core/mocks/crud-model';
-
-describe('component vnZoneLocation', () => {
-    let $scope;
-    let controller;
-    let $httpBackend;
-
-    beforeEach(ngModule('zone'));
-
-    beforeEach(inject(($componentController, $rootScope, _$httpBackend_) => {
-        $httpBackend = _$httpBackend_;
-        $scope = $rootScope.$new();
-        const $element = angular.element(`<vn-zone-location></vn-zone-location>`);
-        controller = $componentController('vnZoneLocation', {$element, $scope});
-        controller.$.model = crudModel;
-        controller.zone = {id: 1};
-    }));
-
-    describe('onSearch()', () => {
-        it('should call the applyFilter() method and then set the data', () => {
-            controller.$.treeview = {};
-            controller.onSearch({});
-
-            const treeviewData = controller.$.treeview.data;
-
-            expect(treeviewData).toBeDefined();
-            expect(treeviewData.length).toEqual(3);
-        });
-    });
-
-    describe('onFetch()', () => {
-        it('should call the applyFilter() method and then return the model data', () => {
-            const result = controller.onFetch();
-
-            expect(result.length).toEqual(3);
-        });
-    });
-
-    describe('onSelection()', () => {
-        it('should make an HTTP POST query', () => {
-            const item = {id: 123};
-
-            const expectedParams = {geoId: 123, isIncluded: true};
-            $httpBackend.expect('POST', `zones/1/toggleIsIncluded`, expectedParams).respond(200);
-            controller.onSelection(true, item);
-            $httpBackend.flush();
-        });
-    });
-});
diff --git a/modules/zone/front/location/style.scss b/modules/zone/front/location/style.scss
deleted file mode 100644
index 24d685a51..000000000
--- a/modules/zone/front/location/style.scss
+++ /dev/null
@@ -1,21 +0,0 @@
-@import "variables";
-
-vn-zone-location {
-    vn-treeview-child {
-        .content > .vn-check:not(.indeterminate):not(.checked) {
-            color: $color-alert;
-
-            & > .btn {
-                border-color: $color-alert;
-            }
-        }
-        .content > .vn-check.checked {
-            color: $color-notice;
-
-            & > .btn {
-                background-color: $color-notice;
-                border-color: $color-notice
-            }
-        }
-    }
-}
diff --git a/modules/zone/front/log/index.html b/modules/zone/front/log/index.html
deleted file mode 100644
index 539afda82..000000000
--- a/modules/zone/front/log/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<vn-log url="ZoneLogs" origin-id="$ctrl.$params.id"></vn-log>
\ No newline at end of file
diff --git a/modules/zone/front/log/index.js b/modules/zone/front/log/index.js
deleted file mode 100644
index 8c3be2423..000000000
--- a/modules/zone/front/log/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import ngModule from '../module';
-import Section from 'salix/components/section';
-
-ngModule.vnComponent('vnZoneLog', {
-    template: require('./index.html'),
-    controller: Section,
-});
diff --git a/modules/zone/front/main/index.html b/modules/zone/front/main/index.html
index 8dd6cdf78..e69de29bb 100644
--- a/modules/zone/front/main/index.html
+++ b/modules/zone/front/main/index.html
@@ -1,19 +0,0 @@
-<vn-crud-model
-    vn-id="model"
-    url="Zones"
-    filter="::$ctrl.filter"
-    limit="20">
-</vn-crud-model>
-<vn-portal slot="topbar">
-    <vn-searchbar
-        vn-focus
-        info="Search zone by id or name"
-        panel="vn-zone-search-panel"
-        model="model"
-        expr-builder="$ctrl.exprBuilder(param, value)">
-    </vn-searchbar>
-</vn-portal>
-<vn-portal slot="menu">
-    <vn-left-menu></vn-left-menu>
-</vn-portal>
-<ui-view></ui-view>
\ No newline at end of file
diff --git a/modules/zone/front/main/index.js b/modules/zone/front/main/index.js
index 3be60c5a1..ad88d8581 100644
--- a/modules/zone/front/main/index.js
+++ b/modules/zone/front/main/index.js
@@ -1,28 +1,13 @@
 import ngModule from '../module';
 import ModuleMain from 'salix/components/module-main';
 
-export default class Zone extends ModuleMain {
+export default class InvoiceOut extends ModuleMain {
     constructor($element, $) {
         super($element, $);
-        this.filter = {
-            include: {
-                relation: 'agencyMode',
-                scope: {fields: ['name']}
-            }
-        };
     }
-
-    exprBuilder(param, value) {
-        switch (param) {
-        case 'search':
-            return /^\d+$/.test(value)
-                ? {id: value}
-                : {name: {like: `%${value}%`}};
-        case 'name':
-            return {[param]: {like: `%${value}%`}};
-        case 'agencyModeFk':
-            return {[param]: value};
-        }
+    async $onInit() {
+        this.$state.go('home');
+        window.location.href = await this.vnApp.getUrl(`zone/`);
     }
 }
 
diff --git a/modules/zone/front/routes.json b/modules/zone/front/routes.json
index 7f67260da..c2e778bcc 100644
--- a/modules/zone/front/routes.json
+++ b/modules/zone/front/routes.json
@@ -9,13 +9,6 @@
             {"state": "zone.index", "icon": "icon-zone"},
             {"state": "zone.deliveryDays", "icon": "today"},
             {"state": "zone.upcomingDeliveries", "icon": "today"}
-        ],
-        "card": [
-            {"state": "zone.card.basicData", "icon": "settings"},
-            {"state": "zone.card.location", "icon": "my_location"},
-            {"state": "zone.card.warehouses", "icon": "home"},
-            {"state": "zone.card.log", "icon": "history"},
-            {"state": "zone.card.events", "icon": "today"}
         ]
     },
     "keybindings": [
@@ -46,67 +39,6 @@
             "state": "zone.upcomingDeliveries",
             "component": "vn-upcoming-deliveries",
             "description": "Upcoming deliveries"
-        },
-        {
-            "url": "/create",
-            "state": "zone.create",
-            "component": "vn-zone-create",
-            "description": "New zone"
-        },
-        {
-            "url": "/:id",
-            "state": "zone.card",
-            "component": "vn-zone-card",
-            "abstract": true,
-            "description": "Detail"
-        },
-        {
-            "url": "/summary",
-            "state": "zone.card.summary",
-            "component": "vn-zone-summary",
-            "description": "Summary",
-            "params": {
-                "zone": "$ctrl.zone"
-            }
-        },
-        {
-            "url": "/basic-data",
-            "state": "zone.card.basicData",
-            "component": "vn-zone-basic-data",
-            "description": "Basic data",
-            "params": {
-                "zone": "$ctrl.zone"
-            }
-        },
-        {
-            "url": "/warehouses",
-            "state": "zone.card.warehouses",
-            "component": "vn-zone-warehouses",
-            "description": "Warehouses"
-        },
-        {
-            "url": "/events?q",
-            "state": "zone.card.events",
-            "component": "vn-zone-events",
-            "description": "Calendar",
-            "params": {
-                "zone": "$ctrl.zone"
-            }
-        },
-        {
-            "url": "/location?q",
-            "state": "zone.card.location",
-            "component": "vn-zone-location",
-            "description": "Locations",
-            "params": {
-                "zone": "$ctrl.zone"
-            }
-        },
-        {
-            "url" : "/log",
-            "state": "zone.card.log",
-            "component": "vn-zone-log",
-            "description": "Log"
         }
     ]
 }
\ No newline at end of file
diff --git a/modules/zone/front/search-panel/index.html b/modules/zone/front/search-panel/index.html
deleted file mode 100644
index bda8a946e..000000000
--- a/modules/zone/front/search-panel/index.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<div class="search-panel">
-    <form ng-submit="$ctrl.onSearch()">
-        <vn-horizontal>
-            <vn-textfield
-                vn-one
-                label="General search"
-                ng-model="filter.search"
-                info="Search zone by id or name"
-                vn-focus>
-            </vn-textfield>
-        </vn-horizontal>
-        <vn-horizontal>
-            <vn-textfield
-                vn-one
-                label="Name"
-                ng-model="filter.name">
-            </vn-textfield>
-        </vn-horizontal>
-        <vn-horizontal>
-            <vn-autocomplete
-                vn-one
-                label="Agency"
-                ng-model="filter.agencyModeFk"
-                url="AgencyModes/isActive"
-                where="{deliveryMethodFk: {neq: null}}"
-                value-field="id"
-                show-field="name">
-            </vn-autocomplete>
-        </vn-horizontal>
-        <vn-horizontal class="vn-mt-lg">
-            <vn-submit label="Search"></vn-submit>
-        </vn-horizontal>
-    </form>
-</div>
\ No newline at end of file
diff --git a/modules/zone/front/search-panel/index.js b/modules/zone/front/search-panel/index.js
deleted file mode 100644
index 598af02b2..000000000
--- a/modules/zone/front/search-panel/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import ngModule from '../module';
-import SearchPanel from 'core/components/searchbar/search-panel';
-
-ngModule.vnComponent('vnZoneSearchPanel', {
-    template: require('./index.html'),
-    controller: SearchPanel
-});
diff --git a/modules/zone/front/summary/index.html b/modules/zone/front/summary/index.html
deleted file mode 100644
index 2fe94388f..000000000
--- a/modules/zone/front/summary/index.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<vn-card class="summary">
-    <h5>
-        <a 
-            ng-if="::$ctrl.summary.id"
-            vn-tooltip="Go to the zone"
-            ui-sref="zone.card.summary({id: {{::$ctrl.summary.id}}})"
-            name="goToSummary">
-            <vn-icon-button icon="launch"></vn-icon-button>
-        </a>
-        <span>#{{$ctrl.summary.id}} - {{$ctrl.summary.name}}</span>
-    </h5>
-    <vn-horizontal class="vn-pa-md">
-        <vn-one>    
-            <vn-label-value label="Agency"
-                value="{{$ctrl.summary.agencyMode.name}}">
-            </vn-label-value>
-            <vn-label-value label="Price"
-                value="{{$ctrl.summary.price | currency: 'EUR': 2}}">
-            </vn-label-value>
-            <vn-label-value label="Bonus"
-                value="{{$ctrl.summary.bonus | currency: 'EUR': 2}}">
-            </vn-label-value>
-        </vn-one>
-        <vn-one>
-            <vn-label-value label="Closing hour"
-                value="{{$ctrl.summary.hour | date: 'HH:mm'}}">
-            </vn-label-value>
-            <vn-label-value label="Traveling days"
-                value="{{$ctrl.summary.travelingDays}}">
-            </vn-label-value>
-            <vn-vertical>
-                <vn-check label="Volumetric" disabled="true"
-                    ng-model="$ctrl.summary.isVolumetric">
-                </vn-check>
-            </vn-vertical>
-        </vn-one>
-    </vn-horizontal>
-    <vn-horizontal class="vn-pa-md">
-        <vn-auto>
-            <h4>
-                <a ui-sref="zone.card.warehouses({id:$ctrl.zone.id})">
-                    <span translate vn-tooltip="Go to">Warehouse</span>
-                </a>
-            </h4>
-            <vn-table model="model" auto-load="false">
-                <vn-thead>
-                    <vn-tr>
-                        <vn-th>Name</vn-th>
-                    </vn-tr>
-                </vn-thead>
-                <vn-tbody>
-                    <vn-tr ng-repeat="zoneWarehouse in $ctrl.zoneWarehouses">
-                        <vn-td>{{zoneWarehouse.warehouse.name}}</vn-td>
-                    </vn-tr>
-                </vn-tbody>
-            </vn-table>
-        </vn-auto>
-    </vn-horizontal>
-</vn-card>
\ No newline at end of file
diff --git a/modules/zone/front/summary/index.js b/modules/zone/front/summary/index.js
deleted file mode 100644
index ad33f28be..000000000
--- a/modules/zone/front/summary/index.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import ngModule from '../module';
-import Summary from 'salix/components/summary';
-
-class Controller extends Summary {
-    get zone() {
-        return this._zone;
-    }
-
-    set zone(value) {
-        this._zone = value;
-
-        if (!value) return;
-
-        this.getSummary();
-        this.getWarehouses();
-    }
-
-    getSummary() {
-        const params = {
-            filter: {
-                include: {
-                    relation: 'agencyMode',
-                    fields: ['name']
-                },
-                where: {
-                    id: this.zone.id
-                }
-            }
-        };
-        this.$http.get(`Zones/findOne`, {params}).then(res => {
-            this.summary = res.data;
-        });
-    }
-
-    getWarehouses() {
-        const params = {
-            filter: {
-                include: {
-                    relation: 'warehouse',
-                    fields: ['name']
-                }
-            }
-        };
-        this.$http.get(`Zones/${this.zone.id}/warehouses`, {params}).then(res => {
-            this.zoneWarehouses = res.data;
-        });
-    }
-}
-
-ngModule.vnComponent('vnZoneSummary', {
-    template: require('./index.html'),
-    controller: Controller,
-    bindings: {
-        zone: '<'
-    }
-});
diff --git a/modules/zone/front/summary/index.spec.js b/modules/zone/front/summary/index.spec.js
deleted file mode 100644
index 7541ee795..000000000
--- a/modules/zone/front/summary/index.spec.js
+++ /dev/null
@@ -1,76 +0,0 @@
-import './index';
-
-describe('component vnZoneSummary', () => {
-    let $scope;
-    let controller;
-    let $httpBackend;
-    let $httpParamSerializer;
-
-    beforeEach(ngModule('zone'));
-
-    beforeEach(inject(($componentController, $rootScope, _$httpBackend_, _$httpParamSerializer_) => {
-        $httpBackend = _$httpBackend_;
-        $httpParamSerializer = _$httpParamSerializer_;
-        $scope = $rootScope.$new();
-        const $element = angular.element(`<vn-zone-summary></vn-zone-summary>`);
-        controller = $componentController('vnZoneSummary', {$element, $scope});
-    }));
-
-    describe('zone setter', () => {
-        it('should set the zone and then call both getSummary() and getWarehouses()', () => {
-            jest.spyOn(controller, 'getSummary');
-            jest.spyOn(controller, 'getWarehouses');
-
-            controller.zone = {id: 1};
-
-            expect(controller.getSummary).toHaveBeenCalledWith();
-            expect(controller.getWarehouses).toHaveBeenCalledWith();
-        });
-    });
-
-    describe('getSummary()', () => {
-        it('should perform a get and then store data on the controller', () => {
-            controller._zone = {id: 1};
-            let params = {
-                filter: {
-                    include: {
-                        relation: 'agencyMode',
-                        fields: ['name']
-                    },
-                    where: {
-                        id: controller._zone.id
-                    }
-                }
-            };
-            const serializedParams = $httpParamSerializer(params);
-            const query = `Zones/findOne?${serializedParams}`;
-            $httpBackend.expectGET(query).respond({id: 1});
-            controller.getSummary();
-            $httpBackend.flush();
-
-            expect(controller.summary).toBeDefined();
-        });
-    });
-
-    describe('getWarehouses()', () => {
-        it('should make an HTTP get query and then store data on the controller', () => {
-            controller._zone = {id: 1};
-            const params = {
-                filter: {
-                    include: {
-                        relation: 'warehouse',
-                        fields: ['name']
-                    }
-                }
-            };
-
-            const serializedParams = $httpParamSerializer(params);
-            const query = `Zones/1/warehouses?${serializedParams}`;
-            $httpBackend.expect('GET', query).respond([{id: 1}]);
-            controller.getWarehouses();
-            $httpBackend.flush();
-
-            expect(controller.zoneWarehouses.length).toEqual(1);
-        });
-    });
-});
diff --git a/modules/zone/front/upcoming-deliveries/index.html b/modules/zone/front/upcoming-deliveries/index.html
deleted file mode 100644
index afcd0bbc6..000000000
--- a/modules/zone/front/upcoming-deliveries/index.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<vn-crud-model
-    vn-id="model"
-    url="Zones/getUpcomingDeliveries"
-    data="details"
-    auto-load="true">
-</vn-crud-model>
-<vn-data-viewer model="model">
-    <vn-card>
-        <section ng-repeat="detail in details" class="vn-pa-md">
-            <vn-horizontal class="header">
-                <h5>{{$ctrl.getWeekDay(detail.shipped)}} - {{detail.shipped  | date: 'dd/MM/yyyy'}}</h5>
-            </vn-horizontal>
-            <vn-table>
-                <vn-thead>
-                    <vn-tr>
-                        <vn-th class="waste-family">Province</vn-th>
-                        <vn-th number>Closing</vn-th>
-                        <vn-th number>Id</vn-th>
-                    </vn-tr>
-                </vn-thead>
-                <vn-tbody>
-                    <vn-tr ng-repeat="zone in detail.lines">
-                        <vn-td class="waste-family">{{::zone.name}}</vn-td>
-                        <vn-td number>{{::zone.hour}}</vn-td>
-                        <vn-td number>{{::zone.zoneFk}}</vn-td>
-                    </vn-tr>
-                </vn-tbody>
-            </vn-table>
-        </section>
-    </vn-card>
-</vn-data-viewer>
diff --git a/modules/zone/front/upcoming-deliveries/index.js b/modules/zone/front/upcoming-deliveries/index.js
deleted file mode 100644
index 371321711..000000000
--- a/modules/zone/front/upcoming-deliveries/index.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import ngModule from '../module';
-import Section from 'salix/components/section';
-import './style.scss';
-
-class Controller extends Section {
-    constructor($element, $, vnWeekDays) {
-        super($element, $);
-        this.days = vnWeekDays.days;
-    }
-
-    getWeekDay(jsonDate) {
-        const weekDay = new Date(jsonDate).getDay();
-
-        return this.days[weekDay].locale;
-    }
-}
-
-Controller.$inject = ['$element', '$scope', 'vnWeekDays'];
-
-ngModule.vnComponent('vnUpcomingDeliveries', {
-    template: require('./index.html'),
-    controller: Controller
-});
diff --git a/modules/zone/front/upcoming-deliveries/index.spec.js b/modules/zone/front/upcoming-deliveries/index.spec.js
deleted file mode 100644
index 95eb999f9..000000000
--- a/modules/zone/front/upcoming-deliveries/index.spec.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import './index';
-
-describe('component vnUpcomingDeliveries', () => {
-    let $scope;
-    let controller;
-
-    beforeEach(ngModule('zone'));
-
-    beforeEach(inject(($componentController, $rootScope) => {
-        $scope = $rootScope.$new();
-        const $element = angular.element(`<vn-upcoming-deliveries></vn-upcoming-deliveries>`);
-        controller = $componentController('vnUpcomingDeliveries', {$element, $scope});
-    }));
-
-    describe('getWeekDay()', () => {
-        it('should retrieve a weekday for a json passed', () => {
-            let jsonDate = '1970-01-01T22:00:00.000Z';
-
-            expect(controller.getWeekDay(jsonDate)).toEqual('Thursday');
-        });
-    });
-});
diff --git a/modules/zone/front/upcoming-deliveries/locale/es.yml b/modules/zone/front/upcoming-deliveries/locale/es.yml
deleted file mode 100644
index 9f08e3a72..000000000
--- a/modules/zone/front/upcoming-deliveries/locale/es.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-Family: Familia
-Percentage: Porcentaje
-Dwindle: Mermas
\ No newline at end of file
diff --git a/modules/zone/front/upcoming-deliveries/style.scss b/modules/zone/front/upcoming-deliveries/style.scss
deleted file mode 100644
index b52231a09..000000000
--- a/modules/zone/front/upcoming-deliveries/style.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-@import "variables";
-
-vn-upcoming-deliveries {
-    .header {
-        margin-bottom: 16px;
-        text-transform: uppercase;
-        font-size: 1.25rem;
-        line-height: 1;
-        padding: 7px;
-        padding-bottom: 7px;
-        padding-bottom: 4px;
-        font-weight: lighter;
-        background-color: $color-main-light;
-        border-bottom: 1px solid $color-primary;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        background-color: $color-bg;
-    }
-
-    vn-table vn-th.waste-family,
-    vn-table vn-td.waste-family {
-        max-width: 64px;
-        width: 64px
-    }
-}
\ No newline at end of file
diff --git a/modules/zone/front/warehouses/index.html b/modules/zone/front/warehouses/index.html
deleted file mode 100644
index acd85f182..000000000
--- a/modules/zone/front/warehouses/index.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<vn-data-viewer
-    data="data"
-    is-loading="!data"
-    class="vn-w-xs">
-    <vn-card>
-    <vn-table>
-        <vn-tbody>
-            <vn-tr ng-repeat="row in data | orderBy:'warehouse.name'">
-                <vn-td>{{::row.warehouse.name}}</vn-td>
-                <vn-td shrink>
-                    <vn-icon-button
-                        icon="delete"
-                        translate-attr="{title: 'Delete'}"
-                        ng-click="$ctrl.onDelete(row)">
-                    </vn-icon-button>
-                </vn-td>
-            </vn-tr>
-        </vn-tbody>
-    </vn-table>
-    </vn-card>
-</vn-data-viewer>
-<vn-float-button
-    icon="add"
-    translate-attr="{title: 'Add'}"
-    vn-bind="+"
-    ng-click="$ctrl.onCreate()"
-    fixed-bottom-right>
-</vn-float-button>
-<vn-crud-model
-    auto-load="true"
-    url="Warehouses"
-    data="warehouses"
-    order="name">
-</vn-crud-model>
-<vn-dialog 
-    vn-id="dialog"
-    on-accept="$ctrl.onSave()">
-    <tpl-body>
-        <vn-autocomplete
-            ng-model="$ctrl.selected.warehouseFk"
-            data="warehouses"
-            show-field="name"
-            value-field="id"
-            label="Warehouse">
-        </vn-autocomplete>
-    </tpl-body>
-    <tpl-buttons>
-        <input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/>
-        <button response="accept" translate>Save</button>
-    </tpl-buttons>
-</vn-dialog>
-<vn-confirm 
-    vn-id="confirm"
-    message="This item will be deleted"
-    question="Are you sure you want to continue?"
-    on-accept="$ctrl.delete()">
-</vn-confirm>
diff --git a/modules/zone/front/warehouses/index.js b/modules/zone/front/warehouses/index.js
deleted file mode 100644
index 85b398658..000000000
--- a/modules/zone/front/warehouses/index.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import ngModule from '../module';
-import Section from 'salix/components/section';
-
-class Controller extends Section {
-    $onInit() {
-        this.refresh();
-    }
-
-    get path() {
-        return `Zones/${this.$params.id}/warehouses`;
-    }
-
-    refresh() {
-        let filter = {include: 'warehouse'};
-        this.$http.get(this.path, {params: {filter}})
-            .then(res => this.$.data = res.data);
-    }
-
-    onCreate() {
-        this.selected = {};
-        this.$.dialog.show();
-    }
-
-    onSave() {
-        this.$http.post(this.path, this.selected)
-            .then(() => {
-                this.selected = null;
-                this.isNew = null;
-                this.$.dialog.hide();
-                this.refresh();
-            });
-
-        return false;
-    }
-
-    onDelete(row) {
-        this.$.confirm.show();
-        this.deleteRow = row;
-    }
-
-    delete() {
-        let row = this.deleteRow;
-        if (!row) return;
-        return this.$http.delete(`${this.path}/${row.id}`)
-            .then(() => {
-                let index = this.$.data.indexOf(row);
-                if (index !== -1) this.$.data.splice(index, 1);
-                this.deleteRow = null;
-            });
-    }
-}
-
-ngModule.vnComponent('vnZoneWarehouses', {
-    template: require('./index.html'),
-    controller: Controller
-});
diff --git a/modules/zone/front/warehouses/index.spec.js b/modules/zone/front/warehouses/index.spec.js
deleted file mode 100644
index 0e71d541c..000000000
--- a/modules/zone/front/warehouses/index.spec.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import './index.js';
-
-describe('Zone warehouses', () => {
-    let $httpBackend;
-    let $httpParamSerializer;
-    let controller;
-    let $element;
-
-    beforeEach(ngModule('zone'));
-
-    beforeEach(inject(($componentController, _$httpBackend_, _$httpParamSerializer_) => {
-        $httpBackend = _$httpBackend_;
-        $httpParamSerializer = _$httpParamSerializer_;
-        $element = angular.element('<vn-zone-warehouses></vn-zone-warehouses');
-        controller = $componentController('vnZoneWarehouses', {$element});
-        controller.zone = {id: 1};
-        controller.$params = {id: 1};
-        controller.$.dialog = {hide: jest.fn()};
-    }));
-
-    describe('refresh()', () => {
-        it('should make an HTTP GET query and then set the data', () => {
-            const params = {filter: {include: 'warehouse'}};
-            const serializedParams = $httpParamSerializer(params);
-            const path = `Zones/1/warehouses?${serializedParams}`;
-            $httpBackend.expect('GET', path).respond([{id: 1, name: 'Warehouse one'}]);
-            controller.refresh();
-            $httpBackend.flush();
-
-            expect(controller.$.data).toBeDefined();
-        });
-    });
-
-    describe('onSave()', () => {
-        it('should make an HTTP POST query and then call the refresh() method', () => {
-            jest.spyOn(controller, 'refresh').mockReturnThis();
-
-            $httpBackend.expect('POST', `Zones/1/warehouses`).respond(200);
-            controller.onSave();
-            $httpBackend.flush();
-
-            expect(controller.selected).toBeNull();
-            expect(controller.isNew).toBeNull();
-            expect(controller.$.dialog.hide).toHaveBeenCalledWith();
-            expect(controller.refresh).toHaveBeenCalledWith();
-        });
-    });
-
-    describe('delete()', () => {
-        it('should make an HTTP DELETE query and then set deleteRow property to null value', () => {
-            controller.deleteRow = {id: 1};
-            controller.$.data = [{id: 1}];
-            $httpBackend.expect('DELETE', `Zones/1/warehouses/1`).respond(200);
-            controller.delete();
-            $httpBackend.flush();
-
-            expect(controller.deleteRow).toBeNull();
-        });
-    });
-});

From 4c29ef862f691065f0745d836f2260ccdd8619b8 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 2 Sep 2024 13:05:46 +0200
Subject: [PATCH 02/28] refactor: refs #7354 deleted test

---
 modules/zone/front/main/index.spec.js | 30 ---------------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 modules/zone/front/main/index.spec.js

diff --git a/modules/zone/front/main/index.spec.js b/modules/zone/front/main/index.spec.js
deleted file mode 100644
index 1e50cee80..000000000
--- a/modules/zone/front/main/index.spec.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import './index.js';
-
-describe('Zone Component vnZone', () => {
-    let controller;
-
-    beforeEach(ngModule('zone'));
-
-    beforeEach(inject($componentController => {
-        const $element = angular.element('<vn-zone></vn-zone>');
-        controller = $componentController('vnZone', {$element});
-    }));
-
-    describe('exprBuilder()', () => {
-        it('should return a formated object with the id in case of search', () => {
-            let param = 'search';
-            let value = 1;
-            let result = controller.exprBuilder(param, value);
-
-            expect(result).toEqual({id: 1});
-        });
-
-        it('should return a formated object with the agencyModeFk in case of agencyModeFk', () => {
-            let param = 'agencyModeFk';
-            let value = 'My Delivery';
-            let result = controller.exprBuilder(param, value);
-
-            expect(result).toEqual({agencyModeFk: 'My Delivery'});
-        });
-    });
-});

From 0ca1db76331a45d59ffd4f8fdf4e0405a9b8e45e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Mon, 2 Sep 2024 17:57:39 +0200
Subject: [PATCH 03/28] feat: ref#7902 Triggers vn.ticketRefund to control
 deleted tickets

---
 .../vn/procedures/ticketRefund_upsert.sql     | 26 +++++++++++++++++++
 .../vn/triggers/ticketRefund_beforeInsert.sql |  2 ++
 .../vn/triggers/ticketRefund_beforeUpdate.sql |  2 ++
 3 files changed, 30 insertions(+)
 create mode 100644 db/routines/vn/procedures/ticketRefund_upsert.sql

diff --git a/db/routines/vn/procedures/ticketRefund_upsert.sql b/db/routines/vn/procedures/ticketRefund_upsert.sql
new file mode 100644
index 000000000..504ce950e
--- /dev/null
+++ b/db/routines/vn/procedures/ticketRefund_upsert.sql
@@ -0,0 +1,26 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticketRefund_upsert`(
+	vRefundTicketFk INT,
+	vOriginalTicketFk INT
+
+)
+	READS SQL DATA
+BEGIN
+/**
+ * Common code for ticketRefund triggers
+ *
+ * @param vRefundTicketFk
+ * @param vOriginalTicketFk
+ */
+	DECLARE vIsDeleted BOOL;
+	
+	SELECT SUM(ABS(isDeleted)) INTO vIsDeleted
+		FROM ticket 
+		WHERE id IN (vRefundTicketFk, vOriginalTicketFk);
+
+	IF vIsDeleted THEN 
+		CALL util.throw('The refund ticket can not be deleted tickets');
+	END IF;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/ticketRefund_beforeInsert.sql b/db/routines/vn/triggers/ticketRefund_beforeInsert.sql
index ff8ce634a..7f3facb55 100644
--- a/db/routines/vn/triggers/ticketRefund_beforeInsert.sql
+++ b/db/routines/vn/triggers/ticketRefund_beforeInsert.sql
@@ -3,6 +3,8 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketRefund_beforeIn
 	BEFORE INSERT ON `ticketRefund`
 	FOR EACH ROW
 BEGIN
+	CALL ticketRefund_upsert(NEW.refundTicketFk, NEW.originalTicketFk);
+	
 	SET NEW.editorFk = account.myUser_getId();
 END$$
 DELIMITER ;
diff --git a/db/routines/vn/triggers/ticketRefund_beforeUpdate.sql b/db/routines/vn/triggers/ticketRefund_beforeUpdate.sql
index d809b5d99..7ec093c36 100644
--- a/db/routines/vn/triggers/ticketRefund_beforeUpdate.sql
+++ b/db/routines/vn/triggers/ticketRefund_beforeUpdate.sql
@@ -3,6 +3,8 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketRefund_beforeUp
 	BEFORE UPDATE ON `ticketRefund`
 	FOR EACH ROW
 BEGIN
+	CALL ticketRefund_upsert(NEW.refundTicketFk, NEW.originalTicketFk);
+	
 	SET NEW.editorFk = account.myUser_getId();
 END$$
 DELIMITER ;

From 08c7bd2c423866ce1d081407b4a88d2c91e18915 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Mon, 2 Sep 2024 17:59:31 +0200
Subject: [PATCH 04/28] feat: ref#7902 Triggers vn.ticketRefund to control
 deleted tickets

---
 db/routines/vn/procedures/ticketRefund_upsert.sql | 2 --
 1 file changed, 2 deletions(-)

diff --git a/db/routines/vn/procedures/ticketRefund_upsert.sql b/db/routines/vn/procedures/ticketRefund_upsert.sql
index 504ce950e..2f07d9d25 100644
--- a/db/routines/vn/procedures/ticketRefund_upsert.sql
+++ b/db/routines/vn/procedures/ticketRefund_upsert.sql
@@ -2,7 +2,6 @@ DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticketRefund_upsert`(
 	vRefundTicketFk INT,
 	vOriginalTicketFk INT
-
 )
 	READS SQL DATA
 BEGIN
@@ -21,6 +20,5 @@ BEGIN
 	IF vIsDeleted THEN 
 		CALL util.throw('The refund ticket can not be deleted tickets');
 	END IF;
-
 END$$
 DELIMITER ;

From 757cd78cfc36861c2574e8d68f0cb3de6a7fc49c Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 11 Sep 2024 14:42:21 +0200
Subject: [PATCH 05/28] fix: refs #7354 fix files

---
 ..._smartTable_searchBar_integrations.spec.js | 68 -------------------
 modules/zone/front/locale/es.yml              |  4 +-
 modules/zone/front/main/index.js              |  2 +-
 modules/zone/front/routes.json                | 16 +----
 4 files changed, 4 insertions(+), 86 deletions(-)
 delete mode 100644 e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js

diff --git a/e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js b/e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js
deleted file mode 100644
index 9c37ce9ba..000000000
--- a/e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
-
-describe('SmartTable SearchBar integration', () => {
-    let browser;
-    let page;
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('salesPerson', 'item');
-        await page.waitToClick(selectors.globalItems.searchButton);
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it('should search by type in searchBar, reload page and have same results', async() => {
-        await page.waitToClick(selectors.itemsIndex.openAdvancedSearchButton);
-        await page.autocompleteSearch(selectors.itemsIndex.advancedSearchItemType, 'Anthurium');
-        await page.waitToClick(selectors.itemsIndex.advancedSearchButton);
-        await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 4);
-
-        await page.reload({
-            waitUntil: 'networkidle2'
-        });
-
-        await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 4);
-
-        await page.write(selectors.itemsIndex.advancedSmartTableGrouping, '1');
-        await page.keyboard.press('Enter');
-        await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 2);
-
-        await page.reload({
-            waitUntil: 'networkidle2'
-        });
-
-        await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 1);
-    });
-
-    it('should filter in section without smart-table and search in searchBar go to zone section', async() => {
-        await page.loginAndModule('salesPerson', 'zone');
-        await page.waitToClick(selectors.globalItems.searchButton);
-
-        await page.doSearch('A');
-        const firstCount = await page.countElement(selectors.zoneIndex.searchResult);
-
-        await page.doSearch('A');
-        const secondCount = await page.countElement(selectors.zoneIndex.searchResult);
-
-        expect(firstCount).toEqual(7);
-        expect(secondCount).toEqual(7);
-    });
-
-    it('should order orders by first id and order by last id, reload page and have same order', async() => {
-        await page.loginAndModule('developer', 'item');
-        await page.accessToSection('item.fixedPrice');
-        await page.keyboard.press('Enter');
-
-        await page.waitForTextInField(selectors.itemFixedPrice.firstItemID, '1');
-
-        await page.waitToClick(selectors.itemFixedPrice.orderColumnId);
-        await page.reload({
-            waitUntil: 'networkidle2'
-        });
-        await page.waitForTextInField(selectors.itemFixedPrice.firstItemID, '3');
-    });
-});
diff --git a/modules/zone/front/locale/es.yml b/modules/zone/front/locale/es.yml
index 7c9e783ab..4d528f37a 100644
--- a/modules/zone/front/locale/es.yml
+++ b/modules/zone/front/locale/es.yml
@@ -13,7 +13,7 @@ Indefinitely: Indefinido
 Inflation: Inflación
 Locations: Localizaciones
 Maximum m³: M³ máximo
-Max m³: Medida máxima 
+Max m³: Medida máxima
 New zone: Nueva zona
 One day: Un día
 Pick up: Recogida
@@ -32,4 +32,4 @@ Warehouses: Almacenes
 Week days: Días de la semana
 Zones: Zonas
 zone: zona
-Go to the zone: Ir a la zona
\ No newline at end of file
+Go to the zone: Ir a la zona
diff --git a/modules/zone/front/main/index.js b/modules/zone/front/main/index.js
index ad88d8581..38896d418 100644
--- a/modules/zone/front/main/index.js
+++ b/modules/zone/front/main/index.js
@@ -1,7 +1,7 @@
 import ngModule from '../module';
 import ModuleMain from 'salix/components/module-main';
 
-export default class InvoiceOut extends ModuleMain {
+export default class Zone extends ModuleMain {
     constructor($element, $) {
         super($element, $);
     }
diff --git a/modules/zone/front/routes.json b/modules/zone/front/routes.json
index c2e778bcc..a4993007d 100644
--- a/modules/zone/front/routes.json
+++ b/modules/zone/front/routes.json
@@ -7,8 +7,6 @@
     "menus": {
         "main": [
             {"state": "zone.index", "icon": "icon-zone"},
-            {"state": "zone.deliveryDays", "icon": "today"},
-            {"state": "zone.upcomingDeliveries", "icon": "today"}
         ]
     },
     "keybindings": [
@@ -27,18 +25,6 @@
             "state": "zone.index",
             "component": "vn-zone-index",
             "description": "Zones"
-        },
-        {
-            "url": "/delivery-days?q&deliveryMethodFk&geoFk&agencyModeFk",
-            "state": "zone.deliveryDays",
-            "component": "vn-zone-delivery-days",
-            "description": "Delivery days"
-        },
-        {
-            "url": "/upcoming-deliveries",
-            "state": "zone.upcomingDeliveries",
-            "component": "vn-upcoming-deliveries",
-            "description": "Upcoming deliveries"
         }
     ]
-}
\ No newline at end of file
+}

From 1d47690bb49515d8d3871a550b917bc6837d3e61 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 17 Sep 2024 08:31:58 +0200
Subject: [PATCH 06/28] feat: refs #7884 added new filter field

---
 modules/entry/back/methods/entry/filter.js    | 22 +++++++++++++---
 .../back/methods/entry/specs/filter.spec.js   | 25 +++++++++++++++++--
 2 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/modules/entry/back/methods/entry/filter.js b/modules/entry/back/methods/entry/filter.js
index 776544bc6..60b58864b 100644
--- a/modules/entry/back/methods/entry/filter.js
+++ b/modules/entry/back/methods/entry/filter.js
@@ -106,10 +106,15 @@ module.exports = Self => {
                 description: `The to shipped date filter`
             },
             {
-                arg: 'days',
+                arg: 'daysOnward',
                 type: 'number',
                 description: `N days interval`
             },
+            {
+                arg: 'daysAgo',
+                type: 'number',
+                description: `N days ago interval`
+            },
             {
                 arg: 'invoiceAmount',
                 type: 'number',
@@ -216,15 +221,26 @@ module.exports = Self => {
                     JOIN vn.currency cu ON cu.id = e.currencyFk`
         );
 
-        if (ctx.args.days) {
+        if (ctx.args.daysOnward) {
             stmt.merge({
                 sql: `
                     AND t.shipped <=  util.VN_CURDATE() + INTERVAL ? DAY
                     AND t.shipped >= util.VN_CURDATE()
                     `,
-                params: [ctx.args.days]
+                params: [ctx.args.daysOnward]
             });
         }
+
+        if (ctx.args.daysAgo) {
+            stmt.merge({
+                sql: `
+                    AND t.shipped >= util.VN_CURDATE() - INTERVAL ? DAY
+                    AND t.shipped < util.VN_CURDATE()
+                    `,
+                params: [ctx.args.daysAgo]
+            });
+        }
+
         stmt.merge(conn.makeSuffix(filter));
         const itemsIndex = stmts.push(stmt) - 1;
 
diff --git a/modules/entry/back/methods/entry/specs/filter.spec.js b/modules/entry/back/methods/entry/specs/filter.spec.js
index c7156062a..105838858 100644
--- a/modules/entry/back/methods/entry/specs/filter.spec.js
+++ b/modules/entry/back/methods/entry/specs/filter.spec.js
@@ -49,13 +49,13 @@ describe('Entry filter()', () => {
     });
 
     describe('should return the entry matching the supplier', () => {
-        it('when userId is supplier ', async() => {
+        it('when userId is supplier and searching days onward', async() => {
             const tx = await models.Entry.beginTransaction({});
             const options = {transaction: tx};
 
             try {
                 const ctx = {
-                    args: {days: 6},
+                    args: {daysOnward: 6},
                     req: {accessToken: {userId: 1102}}
                 };
 
@@ -70,6 +70,27 @@ describe('Entry filter()', () => {
             }
         });
 
+        it('when userId is supplier and searching days ago', async() => {
+            const tx = await models.Entry.beginTransaction({});
+            const options = {transaction: tx};
+
+            try {
+                const ctx = {
+                    args: {daysAgo: 31},
+                    req: {accessToken: {userId: 1102}}
+                };
+
+                const result = await models.Entry.filter(ctx, options);
+
+                expect(result.length).toEqual(6);
+
+                await tx.rollback();
+            } catch (e) {
+                await tx.rollback();
+                throw e;
+            }
+        });
+
         it('when userId is supplier fetching other supplier', async() => {
             const tx = await models.Entry.beginTransaction({});
             const options = {transaction: tx};

From 71362baa661af6d998c0d6d2d18c35a101c5190e Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 17 Sep 2024 12:42:47 +0200
Subject: [PATCH 07/28] feat: refs #7884 added filter when daysOnward and
 daysAgo have value and refactor ifs block

---
 modules/entry/back/methods/entry/filter.js | 39 +++++++++++++---------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/modules/entry/back/methods/entry/filter.js b/modules/entry/back/methods/entry/filter.js
index 60b58864b..35bf9677d 100644
--- a/modules/entry/back/methods/entry/filter.js
+++ b/modules/entry/back/methods/entry/filter.js
@@ -221,24 +221,33 @@ module.exports = Self => {
                     JOIN vn.currency cu ON cu.id = e.currencyFk`
         );
 
-        if (ctx.args.daysOnward) {
-            stmt.merge({
-                sql: `
-                    AND t.shipped <=  util.VN_CURDATE() + INTERVAL ? DAY
-                    AND t.shipped >= util.VN_CURDATE()
-                    `,
-                params: [ctx.args.daysOnward]
-            });
-        }
+        const {daysAgo, daysOnward} = ctx.args;
 
-        if (ctx.args.daysAgo) {
-            stmt.merge({
-                sql: `
+        if (daysAgo || daysOnward) {
+            let sql = '';
+            const params = [];
+
+            if (daysAgo && daysOnward) {
+                sql = `
+                    AND t.shipped >= util.VN_CURDATE() - INTERVAL ? DAY
+                    AND t.shipped <= util.VN_CURDATE() + INTERVAL ? DAY
+                    `;
+                params.push(daysAgo, daysOnward);
+            } else if (daysAgo) {
+                sql = `
                     AND t.shipped >= util.VN_CURDATE() - INTERVAL ? DAY
                     AND t.shipped < util.VN_CURDATE()
-                    `,
-                params: [ctx.args.daysAgo]
-            });
+                    `;
+                params.push(daysAgo);
+            } else if (daysOnward) {
+                sql = `
+                    AND t.shipped <= util.VN_CURDATE() + INTERVAL ? DAY
+                    AND t.shipped >= util.VN_CURDATE()
+                    `;
+                params.push(daysOnward);
+            }
+
+            stmt.merge({sql, params});
         }
 
         stmt.merge(conn.makeSuffix(filter));

From c8251918238c06f408f6882f971218e08c552d4c Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Thu, 26 Sep 2024 15:22:40 +0200
Subject: [PATCH 08/28] feat: refs #9722 fixtures

---
 db/dump/fixtures.before.sql                   | 50 ++++++++++---------
 .../travelThermograph_beforeInsert.sql        |  9 ++++
 .../travelThermograph_beforeUpdate.sql        |  9 ++++
 .../back/methods/travel/saveThermograph.js    |  3 +-
 4 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/db/dump/fixtures.before.sql b/db/dump/fixtures.before.sql
index ffbc6a864..56d7ad30e 100644
--- a/db/dump/fixtures.before.sql
+++ b/db/dump/fixtures.before.sql
@@ -2442,30 +2442,32 @@ INSERT INTO `vn`.`workerTimeControl`(`userFk`, `timed`, `manual`, `direction`, `
         (1107, CONCAT(util.VN_CURDATE(), ' 10:20'), TRUE, 'middle', 1),
         (1107, CONCAT(util.VN_CURDATE(), ' 14:50'), TRUE, 'out',    1);
 
-INSERT INTO `vn`.`dmsType`(`id`, `name`, `readRoleFk`, `writeRoleFk`, `code`)
+INSERT INTO `vn`.`dmsType`
+		(`id`, `name`, 					`readRoleFk`, 	`writeRoleFk`, `code`)
     VALUES
-        (1,  'Facturas Recibidas',  NULL,   NULL,   'invoiceIn'),
-        (2,  'Doc oficial',         NULL,   NULL,   'officialDoc'),
-        (3,  'Laboral',             37,     37,     'hhrrData'),
-        (4,  'Albaranes recibidos', NULL,   NULL,   'deliveryNote'),
-        (5,  'Otros',               1,      1,      'miscellaneous'),
-        (6,  'Pruebas',             NULL,   NULL,   'tests'),
-        (7,  'IAE Clientes',        1,      1,      'economicActivitiesTax'),
-        (8,  'Fiscal',              NULL,   NULL,   'fiscal'),
-        (9,  'Vehiculos',           NULL,   NULL,   'vehicles'),
-        (10, 'Plantillas',          NULL,   NULL,   'templates'),
-        (11, 'Contratos',           NULL,   NULL,   'contracts'),
-        (12, 'ley de pagos',        1,      1,      'paymentsLaw'),
-        (13, 'Basura',              1,      1,      'trash'),
-        (14, 'Ticket',              1,      1,      'ticket'),
-        (15, 'Presupuestos',        NULL,   NULL,   'budgets'),
-        (16, 'Logistica',           NULL,   NULL,   'logistics'),
-        (17, 'cmr',                 1,      1,      'cmr'),
-        (18, 'dua',                 NULL,   NULL,   'dua'),
-        (19, 'inmovilizado',        NULL,   NULL,   'fixedAssets'),
-        (20, 'Reclamación',         1,      1,      'claim'),
-        (21, 'Entrada',             1,      1,      'entry'),
-		(22, 'Proveedor',           1,      1,      'supplier');
+        (1,  	'Facturas Recibidas',  	NULL,   		NULL,   		'invoiceIn'),
+        (2,  	'Doc oficial',         	NULL,   		NULL,   		'officialDoc'),
+        (3,  	'Laboral',             	37,     		37,     		'hhrrData'),
+        (4,  	'Albaranes recibidos', 	NULL,   		NULL,   		'deliveryNote'),
+        (5,  	'Otros',               	1,      		1,      		'miscellaneous'),
+        (6,  	'Pruebas',             	NULL,   		NULL,   		'tests'),
+        (7,  	'IAE Clientes',        	1,      		1,      		'economicActivitiesTax'),
+        (8,  	'Fiscal',              	NULL,   		NULL,   		'fiscal'),
+        (9,  	'Vehiculos',           	NULL,   		NULL,   		'vehicles'),
+        (10, 	'Plantillas',          	NULL,   		NULL,   		'templates'),
+        (11, 	'Contratos',           	NULL,   		NULL,   		'contracts'),
+        (12, 	'ley de pagos',        	1,      		1,      		'paymentsLaw'),
+        (13, 	'Basura',              	1,      		1,      		'trash'),
+        (14, 	'Ticket',              	1,      		1,      		'ticket'),
+        (15, 	'Presupuestos',        	NULL,   		NULL,   		'budgets'),
+        (16, 	'Logistica',           	NULL,   		NULL,   		'logistics'),
+        (17, 	'cmr',                 	1,      		1,      		'cmr'),
+        (18, 	'dua',                 	NULL,   		NULL,   		'dua'),
+        (19, 	'inmovilizado',        	NULL,   		NULL,   		'fixedAssets'),
+        (20, 	'Reclamación',         	1,      		1,      		'claim'),
+        (21, 	'Entrada',             	1,      		1,      		'entry'),
+		(22, 	'Proveedor',           	1,      		1,      		'supplier'),
+		(23, 	'Termografos',			35,    			35,    			'thermograph');
 
 INSERT INTO `vn`.`dms`(`id`, `dmsTypeFk`, `file`, `contentType`, `workerFk`, `warehouseFk`, `companyFk`, `hardCopyNumber`, `hasFile`, `reference`, `description`, `created`)
     VALUES
@@ -2473,7 +2475,7 @@ INSERT INTO `vn`.`dms`(`id`, `dmsTypeFk`, `file`, `contentType`, `workerFk`, `wa
         (2, 5,  '2.txt', 'text/plain', 5, 1, 442, 1,    TRUE, 'Client:104',      'Client:104 dms for the client',               util.VN_CURDATE()),
         (3, 5,  '3.txt', 'text/plain', 5, 1, 442, NULL, TRUE, 'Client: 104',     'Client:104 readme',                           util.VN_CURDATE()),
         (4, 3,  '4.txt', 'text/plain', 5, 1, 442, NULL, TRUE, 'Worker: 106',     'Worker:106 readme',                           util.VN_CURDATE()),
-        (5, 5,  '5.txt', 'text/plain', 5, 1, 442, NULL, TRUE, 'travel: 1',       'dmsForThermograph',                           util.VN_CURDATE()),
+        (5, 23,  '5.txt', 'text/plain', 5, 1, 442, NULL, TRUE, 'travel: 1',       'dmsForThermograph',                           util.VN_CURDATE()),
         (6, 5,  '6.txt', 'text/plain', 5, 1, 442, NULL, TRUE, 'NotExists',       'DoesNotExists',                               util.VN_CURDATE()),
         (7, 20, '7.jpg', 'image/jpeg', 9, 1, 442, NULL, FALSE, '1',              'TICKET ID  DEL CLIENTE BRUCE WAYNE ID 1101',  util.VN_CURDATE()),
         (8, 20, '8.mp4', 'video/mp4',  9, 1, 442, NULL, FALSE, '1',              'TICKET ID  DEL CLIENTE BRUCE WAYNE ID 1101',  util.VN_CURDATE()),
diff --git a/db/routines/vn/triggers/travelThermograph_beforeInsert.sql b/db/routines/vn/triggers/travelThermograph_beforeInsert.sql
index f56109fba..256ee12a6 100644
--- a/db/routines/vn/triggers/travelThermograph_beforeInsert.sql
+++ b/db/routines/vn/triggers/travelThermograph_beforeInsert.sql
@@ -4,5 +4,14 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`travelThermograph_befor
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
+
+	IF NEW.travelFk IS NULL AND
+		(SELECT COUNT(*) FROM travelThermograph
+			WHERE thermographFk = NEW.thermographFk
+				AND travelFk IS NULL
+				AND id <> NEW.id) > 0
+	THEN
+		CALL util.throw('Duplicate thermographFk without travelFk not allowed.');
+	END IF;
 END$$
 DELIMITER ;
diff --git a/db/routines/vn/triggers/travelThermograph_beforeUpdate.sql b/db/routines/vn/triggers/travelThermograph_beforeUpdate.sql
index 49f52f181..ffe81b38d 100644
--- a/db/routines/vn/triggers/travelThermograph_beforeUpdate.sql
+++ b/db/routines/vn/triggers/travelThermograph_beforeUpdate.sql
@@ -4,5 +4,14 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`travelThermograph_befor
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
+
+	IF NEW.travelFk IS NULL AND
+		(SELECT COUNT(*) FROM travelThermograph
+			WHERE thermographFk = NEW.thermographFk
+				AND travelFk IS NULL
+				AND id <> NEW.id) > 0
+	THEN
+		CALL util.throw('Duplicate thermographFk without travelFk not allowed.');
+	END IF;
 END$$
 DELIMITER ;
diff --git a/modules/travel/back/methods/travel/saveThermograph.js b/modules/travel/back/methods/travel/saveThermograph.js
index d246d8149..6f7e1c8bf 100644
--- a/modules/travel/back/methods/travel/saveThermograph.js
+++ b/modules/travel/back/methods/travel/saveThermograph.js
@@ -117,7 +117,8 @@ module.exports = Self => {
                 result: state,
                 maxTemperature,
                 minTemperature,
-                temperatureFk
+                temperatureFk,
+                warehouseFk: warehouseId,
             }, myOptions);
 
             if (tx) await tx.commit();

From f68ed4808156cbcca7ac64567977aeb72041016f Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Thu, 26 Sep 2024 15:25:51 +0200
Subject: [PATCH 09/28] feat: refs #9722 testFixed

---
 .../travel/back/methods/travel/specs/saveThermograph.spec.js  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/travel/back/methods/travel/specs/saveThermograph.spec.js b/modules/travel/back/methods/travel/specs/saveThermograph.spec.js
index c7d848c08..c2da4234e 100644
--- a/modules/travel/back/methods/travel/specs/saveThermograph.spec.js
+++ b/modules/travel/back/methods/travel/specs/saveThermograph.spec.js
@@ -4,7 +4,7 @@ describe('Thermograph saveThermograph()', () => {
     const ctx = beforeAll.getCtx();
     const travelFk = 1;
     const thermographId = '138350-0';
-    const warehouseFk = '1';
+    const warehouseFk = 1;
     const state = 'COMPLETED';
     const maxTemperature = 30;
     const minTemperature = 10;
@@ -41,7 +41,7 @@ describe('Thermograph saveThermograph()', () => {
             maxTemperature,
             minTemperature,
             temperatureFk,
-            null,
+            warehouseFk,
             null,
             null,
             null,

From 1f5c0d3e94445e5483dcd1357523ba44fb1deb17 Mon Sep 17 00:00:00 2001
From: sergiodt <sergiodt@verdnatura.es>
Date: Mon, 30 Sep 2024 08:25:40 +0200
Subject: [PATCH 10/28] fix: refs #5320 withoutHaving

---
 .../vn/procedures/collectionPlacement_get.sql | 38 +++++++++----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/db/routines/vn/procedures/collectionPlacement_get.sql b/db/routines/vn/procedures/collectionPlacement_get.sql
index d81847375..7f7e23178 100644
--- a/db/routines/vn/procedures/collectionPlacement_get.sql
+++ b/db/routines/vn/procedures/collectionPlacement_get.sql
@@ -55,24 +55,20 @@ BEGIN
 		SELECT ts.saleFk,
 				ts.itemFk,
 				CAST(0 AS DECIMAL(10,0)) saleOrder,
-				IF(ish.visible > 0 OR iss.id, 1, 100000) *
-					IFNULL(p2.pickingOrder, p.pickingOrder) `order`,
-				TO_SECONDS(IF(iss.id,
-					iss.created - INTERVAL vCurrentYear YEAR,
-					ish.created - INTERVAL YEAR(ish.created) YEAR)) priority,
+				(IF(ish.visible > 0 OR iss.id, 1, 100000) *
+				COALESCE(p2.pickingOrder, p.pickingOrder)) `order`,
+				TO_SECONDS(COALESCE(iss.created, ish.created)) - TO_SECONDS(MAKEDATE(IFNULL(YEAR(iss.created), YEAR(ish.created)), 1)) priority,
 				CONCAT(
-					IF(iss.id,
-						CONCAT('< ', IFNULL(wk.`code`, '---'),' > '),
-						''),
-					p.`code`) COLLATE utf8_general_ci placement,
+				IF(iss.id, CONCAT('< ', COALESCE(wk.`code`, '---'),' > '), ''),
+				p.`code`
+				) COLLATE utf8_general_ci placement,
 				sh.priority shelvingPriority,
 				sh.code COLLATE utf8_general_ci shelving,
 				ish.created,
 				ish.visible,
-				IFNULL(
-					IF(st.code = 'previousByPacking', ish.packing, g.`grouping`),
-					1) `grouping`,
-				st.code = 'previousPrepared' isPreviousPrepared,
+				COALESCE(
+				IF(st.code = 'previousByPacking', ish.packing, g.`grouping`),1) `grouping`,
+				(st.code = 'previousPrepared') isPreviousPrepared,
 				iss.id itemShelvingSaleFk,
 				ts.ticketFk,
 				iss.id,
@@ -80,11 +76,11 @@ BEGIN
 				iss.userFk,
 				ts.quantity
 			FROM tSale ts
-				LEFT JOIN (SELECT DISTINCT saleFk
-								FROM saleTracking st
-									JOIN state s ON s.id = st.stateFk
-								WHERE st.isChecked
-									AND s.semaphore = 1) st ON st.saleFk = ts.saleFk
+				LEFT JOIN (SELECT st.saleFk
+							FROM saleTracking st
+								JOIN state s ON s.id = st.stateFk
+							WHERE st.isChecked
+								AND s.semaphore = 1) st ON st.saleFk = ts.saleFk
 				JOIN itemShelving ish ON ish.itemFk = ts.itemFk
 				JOIN shelving sh ON sh.code = ish.shelvingFk
 				JOIN parking p ON p.id = sh.parkingFk
@@ -93,14 +89,14 @@ BEGIN
 				JOIN warehouse w ON w.id = sc.warehouseFk
 				LEFT JOIN tGrouping g ON g.itemFk = ts.itemFk
 				LEFT JOIN itemShelvingSale iss ON iss.saleFk = ts.saleFk
-					AND iss.itemShelvingFk = ish.id
+				   AND iss.itemShelvingFk = ish.id
 				LEFT JOIN worker wk ON wk.id = iss.userFk
 				LEFT JOIN saleGroupDetail sgd ON sgd.saleFk = ts.saleFk
 				LEFT JOIN saleGroup sg ON sg.id = sgd.saleGroupFk
 				LEFT JOIN parking p2 ON p2.id = sg.parkingFk
 			WHERE w.id = vWarehouseFk
-				AND NOT sc.isHideForPickers
-			HAVING (iss.id AND st.saleFk) OR salePreviousPrepared IS NULL;
+					AND NOT sc.isHideForPickers
+					AND ((iss.id IS NOT NULL AND st.saleFk IS NOT NULL) OR st.saleFk IS NULL);
 
 	CREATE OR REPLACE TEMPORARY TABLE tSalePlacementList2
 		(INDEX(saleFk), INDEX(olderPriority))

From a9b083a044a15f85342f2c69d2e1f65047671650 Mon Sep 17 00:00:00 2001
From: sergiodt <sergiodt@verdnatura.es>
Date: Mon, 30 Sep 2024 09:39:35 +0200
Subject: [PATCH 11/28] fix: refs #5320 withoutHaving

---
 db/routines/vn/procedures/collectionPlacement_get.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/db/routines/vn/procedures/collectionPlacement_get.sql b/db/routines/vn/procedures/collectionPlacement_get.sql
index 7f7e23178..e302f8d3c 100644
--- a/db/routines/vn/procedures/collectionPlacement_get.sql
+++ b/db/routines/vn/procedures/collectionPlacement_get.sql
@@ -96,7 +96,8 @@ BEGIN
 				LEFT JOIN parking p2 ON p2.id = sg.parkingFk
 			WHERE w.id = vWarehouseFk
 					AND NOT sc.isHideForPickers
-					AND ((iss.id IS NOT NULL AND st.saleFk IS NOT NULL) OR st.saleFk IS NULL);
+					AND ((iss.id AND st.saleFk) OR st.saleFk IS NULL)
+			GROUP BY st.saleFk, created;
 
 	CREATE OR REPLACE TEMPORARY TABLE tSalePlacementList2
 		(INDEX(saleFk), INDEX(olderPriority))

From a0a8a22ab0e6c5550bf9b8c9758644336335c37a Mon Sep 17 00:00:00 2001
From: sergiodt <sergiodt@verdnatura.es>
Date: Mon, 30 Sep 2024 11:13:12 +0200
Subject: [PATCH 12/28] fix: refs #5320 withoutHaving

---
 db/routines/vn/procedures/collectionPlacement_get.sql | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/db/routines/vn/procedures/collectionPlacement_get.sql b/db/routines/vn/procedures/collectionPlacement_get.sql
index e302f8d3c..239dbd3a2 100644
--- a/db/routines/vn/procedures/collectionPlacement_get.sql
+++ b/db/routines/vn/procedures/collectionPlacement_get.sql
@@ -80,7 +80,8 @@ BEGIN
 							FROM saleTracking st
 								JOIN state s ON s.id = st.stateFk
 							WHERE st.isChecked
-								AND s.semaphore = 1) st ON st.saleFk = ts.saleFk
+								AND s.semaphore = 1
+							GROUP BY st.saleFk) st ON st.saleFk = ts.saleFk
 				JOIN itemShelving ish ON ish.itemFk = ts.itemFk
 				JOIN shelving sh ON sh.code = ish.shelvingFk
 				JOIN parking p ON p.id = sh.parkingFk
@@ -96,8 +97,7 @@ BEGIN
 				LEFT JOIN parking p2 ON p2.id = sg.parkingFk
 			WHERE w.id = vWarehouseFk
 					AND NOT sc.isHideForPickers
-					AND ((iss.id AND st.saleFk) OR st.saleFk IS NULL)
-			GROUP BY st.saleFk, created;
+					AND ((iss.id AND st.saleFk) OR st.saleFk IS NULL);
 
 	CREATE OR REPLACE TEMPORARY TABLE tSalePlacementList2
 		(INDEX(saleFk), INDEX(olderPriority))

From c680c4a05933bc8ca1e40f114f62ccd242bd4851 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 30 Sep 2024 12:07:55 +0200
Subject: [PATCH 13/28] refactor: refs #7884 modified sql

---
 modules/entry/back/methods/entry/filter.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/entry/back/methods/entry/filter.js b/modules/entry/back/methods/entry/filter.js
index 35bf9677d..a781659c8 100644
--- a/modules/entry/back/methods/entry/filter.js
+++ b/modules/entry/back/methods/entry/filter.js
@@ -229,19 +229,19 @@ module.exports = Self => {
 
             if (daysAgo && daysOnward) {
                 sql = `
-                    AND t.shipped >= util.VN_CURDATE() - INTERVAL ? DAY
+                    WHERE t.shipped >= util.VN_CURDATE() - INTERVAL ? DAY
                     AND t.shipped <= util.VN_CURDATE() + INTERVAL ? DAY
                     `;
                 params.push(daysAgo, daysOnward);
             } else if (daysAgo) {
                 sql = `
-                    AND t.shipped >= util.VN_CURDATE() - INTERVAL ? DAY
+                    WHERE t.shipped >= util.VN_CURDATE() - INTERVAL ? DAY
                     AND t.shipped < util.VN_CURDATE()
                     `;
                 params.push(daysAgo);
             } else if (daysOnward) {
                 sql = `
-                    AND t.shipped <= util.VN_CURDATE() + INTERVAL ? DAY
+                    WHERE t.shipped <= util.VN_CURDATE() + INTERVAL ? DAY
                     AND t.shipped >= util.VN_CURDATE()
                     `;
                 params.push(daysOnward);

From c4f26094d570186d79fef4e8b6aa21639374fbe5 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 30 Sep 2024 12:46:41 +0200
Subject: [PATCH 14/28] fix: refs #7884 fixed filter

---
 modules/entry/back/methods/entry/filter.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/entry/back/methods/entry/filter.js b/modules/entry/back/methods/entry/filter.js
index a781659c8..35bf9677d 100644
--- a/modules/entry/back/methods/entry/filter.js
+++ b/modules/entry/back/methods/entry/filter.js
@@ -229,19 +229,19 @@ module.exports = Self => {
 
             if (daysAgo && daysOnward) {
                 sql = `
-                    WHERE t.shipped >= util.VN_CURDATE() - INTERVAL ? DAY
+                    AND t.shipped >= util.VN_CURDATE() - INTERVAL ? DAY
                     AND t.shipped <= util.VN_CURDATE() + INTERVAL ? DAY
                     `;
                 params.push(daysAgo, daysOnward);
             } else if (daysAgo) {
                 sql = `
-                    WHERE t.shipped >= util.VN_CURDATE() - INTERVAL ? DAY
+                    AND t.shipped >= util.VN_CURDATE() - INTERVAL ? DAY
                     AND t.shipped < util.VN_CURDATE()
                     `;
                 params.push(daysAgo);
             } else if (daysOnward) {
                 sql = `
-                    WHERE t.shipped <= util.VN_CURDATE() + INTERVAL ? DAY
+                    AND t.shipped <= util.VN_CURDATE() + INTERVAL ? DAY
                     AND t.shipped >= util.VN_CURDATE()
                     `;
                 params.push(daysOnward);

From 41af80991744eb530330144b0966216051720342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Mon, 30 Sep 2024 14:33:58 +0200
Subject: [PATCH 15/28] feat: ref#7902 Triggers vn.ticketRefund to control
 deleted tickets

---
 db/routines/vn/procedures/ticketRefund_upsert.sql | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/db/routines/vn/procedures/ticketRefund_upsert.sql b/db/routines/vn/procedures/ticketRefund_upsert.sql
index 2f07d9d25..ec37d71f0 100644
--- a/db/routines/vn/procedures/ticketRefund_upsert.sql
+++ b/db/routines/vn/procedures/ticketRefund_upsert.sql
@@ -13,9 +13,10 @@ BEGIN
  */
 	DECLARE vIsDeleted BOOL;
 	
-	SELECT SUM(ABS(isDeleted)) INTO vIsDeleted
+	SELECT COUNT(*) INTO vIsDeleted
 		FROM ticket 
-		WHERE id IN (vRefundTicketFk, vOriginalTicketFk);
+		WHERE id IN (vRefundTicketFk, vOriginalTicketFk)
+			AND isDeleted;
 
 	IF vIsDeleted THEN 
 		CALL util.throw('The refund ticket can not be deleted tickets');

From 329920389d27259ccf1a7ac4c4a0a3550d18ff6c Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Mon, 30 Sep 2024 15:49:46 +0200
Subject: [PATCH 16/28] fix: option Error

---
 .../invoiceOut/back/methods/invoiceOut/invoiceClient.js   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/invoiceOut/back/methods/invoiceOut/invoiceClient.js b/modules/invoiceOut/back/methods/invoiceOut/invoiceClient.js
index bf7e7d3cb..2fad1afd8 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/invoiceClient.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/invoiceClient.js
@@ -64,7 +64,7 @@ module.exports = Self => {
         try {
             const client = await models.Client.findById(args.clientId, {
                 fields: ['id', 'hasToInvoiceByAddress']
-            }, options);
+            }, myOptions);
 
             if (client.hasToInvoiceByAddress) {
                 await Self.rawSql('CALL ticketToInvoiceByAddress(?, ?, ?, ?)', [
@@ -72,13 +72,13 @@ module.exports = Self => {
                     args.maxShipped,
                     args.addressId,
                     args.companyFk
-                ], options);
+                ], myOptions);
             } else {
                 await Self.rawSql('CALL invoiceFromClient(?, ?, ?)', [
                     args.maxShipped,
                     client.id,
                     args.companyFk
-                ], options);
+                ], myOptions);
             }
 
             const invoiceId = await models.Ticket.makeInvoice(
@@ -87,7 +87,7 @@ module.exports = Self => {
                 args.companyFk,
                 args.invoiceDate,
                 null,
-                options
+                myOptions
             );
 
             if (tx) await tx.commit();

From fbba2e3feacda3e822a6ea35a7148b054dc29736 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Mon, 30 Sep 2024 15:52:18 +0200
Subject: [PATCH 17/28] fix: option Error

---
 .../invoiceOut/back/methods/invoiceOut/invoiceClient.js   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/invoiceOut/back/methods/invoiceOut/invoiceClient.js b/modules/invoiceOut/back/methods/invoiceOut/invoiceClient.js
index bf7e7d3cb..2fad1afd8 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/invoiceClient.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/invoiceClient.js
@@ -64,7 +64,7 @@ module.exports = Self => {
         try {
             const client = await models.Client.findById(args.clientId, {
                 fields: ['id', 'hasToInvoiceByAddress']
-            }, options);
+            }, myOptions);
 
             if (client.hasToInvoiceByAddress) {
                 await Self.rawSql('CALL ticketToInvoiceByAddress(?, ?, ?, ?)', [
@@ -72,13 +72,13 @@ module.exports = Self => {
                     args.maxShipped,
                     args.addressId,
                     args.companyFk
-                ], options);
+                ], myOptions);
             } else {
                 await Self.rawSql('CALL invoiceFromClient(?, ?, ?)', [
                     args.maxShipped,
                     client.id,
                     args.companyFk
-                ], options);
+                ], myOptions);
             }
 
             const invoiceId = await models.Ticket.makeInvoice(
@@ -87,7 +87,7 @@ module.exports = Self => {
                 args.companyFk,
                 args.invoiceDate,
                 null,
-                options
+                myOptions
             );
 
             if (tx) await tx.commit();

From b4a2be660d0e199b139c31f5d4edb546ecb60e1d Mon Sep 17 00:00:00 2001
From: sergiodt <sergiodt@verdnatura.es>
Date: Tue, 1 Oct 2024 07:08:11 +0200
Subject: [PATCH 18/28] fix: refs #6868 handleUser addIsOnReservationMode

---
 db/routines/vn/procedures/collection_getTickets.sql | 2 +-
 modules/worker/back/methods/device/handle-user.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/routines/vn/procedures/collection_getTickets.sql b/db/routines/vn/procedures/collection_getTickets.sql
index 0f675041a..4566792fa 100644
--- a/db/routines/vn/procedures/collection_getTickets.sql
+++ b/db/routines/vn/procedures/collection_getTickets.sql
@@ -23,7 +23,7 @@ BEGIN
 				JOIN vn.ticketCollection tc ON tc.ticketFk = tob.ticketFk
 				LEFT JOIN vn.observationType ot ON ot.id = tob.observationTypeFk
 			WHERE ot.`code` = 'itemPicker' 
-				AND tc.collectionFk = vParamFk
+				AND tc.collectionFk = vParamFk OR tc.ticketFk = vParamFk
 	)
 	SELECT t.id ticketFk, 
 			IF(!(vItemPackingTypeFk <=> 'V'), cc.code, CONCAT(SUBSTRING('ABCDEFGH', tc.wagon, 1), '-', tc.`level`)) `level`,
diff --git a/modules/worker/back/methods/device/handle-user.js b/modules/worker/back/methods/device/handle-user.js
index ac4ff2704..55302c1cb 100644
--- a/modules/worker/back/methods/device/handle-user.js
+++ b/modules/worker/back/methods/device/handle-user.js
@@ -82,7 +82,7 @@ module.exports = Self => {
         const getDataOperator = await models.Operator.findOne({
             where: {workerFk: user.id},
             fields: ['numberOfWagons', 'warehouseFk', 'itemPackingTypeFk', 'sectorFk', 'sector',
-                'trainFk', 'train', 'labelerFk', 'printer'],
+                'trainFk', 'train', 'labelerFk', 'printer', 'isOnReservationMode'],
             include: [
                 {
                     relation: 'sector',

From 452324191ccf89fe021464c22593bd35e04c4e41 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Tue, 1 Oct 2024 08:51:03 +0200
Subject: [PATCH 19/28] fix: refs #7759 Changed definer

---
 db/routines/vn/events/travel_setDelivered.sql                 | 2 +-
 db/routines/vn/procedures/buy_getUltimate.sql                 | 2 +-
 db/routines/vn/procedures/buy_getUltimateFromInterval.sql     | 2 +-
 db/routines/vn/procedures/collection_mergeSales.sql           | 2 +-
 db/routines/vn/procedures/itemMinimumQuantity_check.sql       | 2 +-
 db/routines/vn/procedures/itemShelvingSale_addBySaleGroup.sql | 2 +-
 db/routines/vn/procedures/supplier_statementWithEntries.sql   | 2 +-
 db/routines/vn/procedures/ticket_mergeSales.sql               | 2 +-
 db/routines/vn/procedures/ticket_setProblemRiskByClient.sql   | 2 +-
 db/routines/vn/procedures/ticket_setVolume.sql                | 2 +-
 db/routines/vn/procedures/ticket_setVolumeItemCost.sql        | 2 +-
 db/routines/vn/triggers/host_beforeInsert.sql                 | 2 +-
 db/routines/vn/triggers/roadmap_beforeInsert.sql              | 2 +-
 db/routines/vn/triggers/roadmap_beforeUpdate.sql              | 2 +-
 db/routines/vn/triggers/saleGroupDetail._beforeInsert.sql     | 2 +-
 db/routines/vn/triggers/saleGroupDetail_afterDelete.sql       | 2 +-
 db/routines/vn/triggers/saleGroupDetail_beforeUpdate.sql      | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/db/routines/vn/events/travel_setDelivered.sql b/db/routines/vn/events/travel_setDelivered.sql
index 769ee9d24..396f3e144 100644
--- a/db/routines/vn/events/travel_setDelivered.sql
+++ b/db/routines/vn/events/travel_setDelivered.sql
@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `vn`.`travel_setDelivered`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` EVENT `vn`.`travel_setDelivered`
 	ON SCHEDULE EVERY 1 DAY
 		STARTS '2024-07-12 00:10:00.000'
 	ON COMPLETION PRESERVE
diff --git a/db/routines/vn/procedures/buy_getUltimate.sql b/db/routines/vn/procedures/buy_getUltimate.sql
index 023e81774..1532222ad 100644
--- a/db/routines/vn/procedures/buy_getUltimate.sql
+++ b/db/routines/vn/procedures/buy_getUltimate.sql
@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`buy_getUltimate`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`buy_getUltimate`(
 	vItemFk INT,
 	vWarehouseFk SMALLINT, 
 	vDated DATE
diff --git a/db/routines/vn/procedures/buy_getUltimateFromInterval.sql b/db/routines/vn/procedures/buy_getUltimateFromInterval.sql
index 2115beb95..24a843eb0 100644
--- a/db/routines/vn/procedures/buy_getUltimateFromInterval.sql
+++ b/db/routines/vn/procedures/buy_getUltimateFromInterval.sql
@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`buy_getUltimateFromInterval`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`buy_getUltimateFromInterval`(
 	vItemFk INT,
 	vWarehouseFk SMALLINT, 
 	vStarted DATE, 
diff --git a/db/routines/vn/procedures/collection_mergeSales.sql b/db/routines/vn/procedures/collection_mergeSales.sql
index 26444d6f9..297bdb97e 100644
--- a/db/routines/vn/procedures/collection_mergeSales.sql
+++ b/db/routines/vn/procedures/collection_mergeSales.sql
@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`collection_mergeSales`(vCollectionFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`collection_mergeSales`(vCollectionFk INT)
 BEGIN
 	DECLARE vDone BOOL;
 	DECLARE vTicketFk INT;
diff --git a/db/routines/vn/procedures/itemMinimumQuantity_check.sql b/db/routines/vn/procedures/itemMinimumQuantity_check.sql
index fef7cdbdb..a4b15b90a 100644
--- a/db/routines/vn/procedures/itemMinimumQuantity_check.sql
+++ b/db/routines/vn/procedures/itemMinimumQuantity_check.sql
@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemMinimumQuantity_check`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemMinimumQuantity_check`(
 	vSelf INT,
 	vItemFk INT,
 	vStarted DATE,
diff --git a/db/routines/vn/procedures/itemShelvingSale_addBySaleGroup.sql b/db/routines/vn/procedures/itemShelvingSale_addBySaleGroup.sql
index 285b9f93f..08d09c63e 100644
--- a/db/routines/vn/procedures/itemShelvingSale_addBySaleGroup.sql
+++ b/db/routines/vn/procedures/itemShelvingSale_addBySaleGroup.sql
@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelvingSale_addBySaleGroup`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelvingSale_addBySaleGroup`(
 	vSaleGroupFk INT(11)
 )
 BEGIN
diff --git a/db/routines/vn/procedures/supplier_statementWithEntries.sql b/db/routines/vn/procedures/supplier_statementWithEntries.sql
index df3b918a7..2b47611c8 100644
--- a/db/routines/vn/procedures/supplier_statementWithEntries.sql
+++ b/db/routines/vn/procedures/supplier_statementWithEntries.sql
@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE vn.supplier_statementWithEntries(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE vn.supplier_statementWithEntries(
 	vSupplierFk INT,
 	vCurrencyFk INT,
 	vCompanyFk INT,
diff --git a/db/routines/vn/procedures/ticket_mergeSales.sql b/db/routines/vn/procedures/ticket_mergeSales.sql
index 28b2dc1c0..0bde200b0 100644
--- a/db/routines/vn/procedures/ticket_mergeSales.sql
+++ b/db/routines/vn/procedures/ticket_mergeSales.sql
@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_mergeSales`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_mergeSales`(
 	vSelf INT
 )
 BEGIN
diff --git a/db/routines/vn/procedures/ticket_setProblemRiskByClient.sql b/db/routines/vn/procedures/ticket_setProblemRiskByClient.sql
index 8479550de..1652fd29e 100644
--- a/db/routines/vn/procedures/ticket_setProblemRiskByClient.sql
+++ b/db/routines/vn/procedures/ticket_setProblemRiskByClient.sql
@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setProblemRiskByClient`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_setProblemRiskByClient`(
 	vClientFk INT
 )
 BEGIN
diff --git a/db/routines/vn/procedures/ticket_setVolume.sql b/db/routines/vn/procedures/ticket_setVolume.sql
index d0fe9740c..c3cf0d057 100644
--- a/db/routines/vn/procedures/ticket_setVolume.sql
+++ b/db/routines/vn/procedures/ticket_setVolume.sql
@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setVolume`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_setVolume`(
 	vSelf INT
 )
 BEGIN
diff --git a/db/routines/vn/procedures/ticket_setVolumeItemCost.sql b/db/routines/vn/procedures/ticket_setVolumeItemCost.sql
index d7fb4473d..3c23b7c34 100644
--- a/db/routines/vn/procedures/ticket_setVolumeItemCost.sql
+++ b/db/routines/vn/procedures/ticket_setVolumeItemCost.sql
@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setVolumeItemCost`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_setVolumeItemCost`(
 	vItemFk INT
 )
 BEGIN
diff --git a/db/routines/vn/triggers/host_beforeInsert.sql b/db/routines/vn/triggers/host_beforeInsert.sql
index c2cb82334..96b78bfb7 100644
--- a/db/routines/vn/triggers/host_beforeInsert.sql
+++ b/db/routines/vn/triggers/host_beforeInsert.sql
@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`host_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`host_beforeInsert`
 	BEFORE INSERT ON `host`
 	FOR EACH ROW
 BEGIN
diff --git a/db/routines/vn/triggers/roadmap_beforeInsert.sql b/db/routines/vn/triggers/roadmap_beforeInsert.sql
index df07d5540..2f9481140 100644
--- a/db/routines/vn/triggers/roadmap_beforeInsert.sql
+++ b/db/routines/vn/triggers/roadmap_beforeInsert.sql
@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`roadmap_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmap_beforeInsert`
 	BEFORE INSERT ON `roadmap`
 	FOR EACH ROW
 BEGIN
diff --git a/db/routines/vn/triggers/roadmap_beforeUpdate.sql b/db/routines/vn/triggers/roadmap_beforeUpdate.sql
index 4905a0442..a2a02e96a 100644
--- a/db/routines/vn/triggers/roadmap_beforeUpdate.sql
+++ b/db/routines/vn/triggers/roadmap_beforeUpdate.sql
@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`roadmap_beforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmap_beforeUpdate`
 	BEFORE UPDATE ON `roadmap`
 	FOR EACH ROW
 BEGIN
diff --git a/db/routines/vn/triggers/saleGroupDetail._beforeInsert.sql b/db/routines/vn/triggers/saleGroupDetail._beforeInsert.sql
index 9513be46a..da975933c 100644
--- a/db/routines/vn/triggers/saleGroupDetail._beforeInsert.sql
+++ b/db/routines/vn/triggers/saleGroupDetail._beforeInsert.sql
@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`saleGroupDetail_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`saleGroupDetail_beforeInsert`
 	BEFORE INSERT ON `saleGroupDetail`
 	FOR EACH ROW
 BEGIN
diff --git a/db/routines/vn/triggers/saleGroupDetail_afterDelete.sql b/db/routines/vn/triggers/saleGroupDetail_afterDelete.sql
index 1698ad8ce..37c3e9a2b 100644
--- a/db/routines/vn/triggers/saleGroupDetail_afterDelete.sql
+++ b/db/routines/vn/triggers/saleGroupDetail_afterDelete.sql
@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`saleGroupDetail_afterDelete`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`saleGroupDetail_afterDelete`
 	AFTER DELETE ON `saleGroupDetail`
 	FOR EACH ROW
 BEGIN
diff --git a/db/routines/vn/triggers/saleGroupDetail_beforeUpdate.sql b/db/routines/vn/triggers/saleGroupDetail_beforeUpdate.sql
index 0da18fd98..1f4238cdc 100644
--- a/db/routines/vn/triggers/saleGroupDetail_beforeUpdate.sql
+++ b/db/routines/vn/triggers/saleGroupDetail_beforeUpdate.sql
@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`saleGroupDetail_beforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`saleGroupDetail_beforeUpdate`
 	BEFORE UPDATE ON `saleGroupDetail`
 	FOR EACH ROW
 BEGIN

From f916509b86ec9b31fb31ee8b9d5800bb6bbb7398 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 1 Oct 2024 11:30:34 +0200
Subject: [PATCH 20/28] fix(StockBought): revert bad merge master to test

---
 .../vn/procedures/stockBought_calculate.sql   | 62 ++++++++++++++++
 .../11115-turquoiseRose/00-firstScript.sql    | 30 ++++++++
 .../methods/stock-bought/getStockBought.js    | 58 +++++++++++++++
 .../stock-bought/getStockBoughtDetail.js      | 74 +++++++++++++++++++
 modules/entry/back/model-config.json          |  5 +-
 modules/entry/back/models/stock-bought.js     | 10 +++
 modules/entry/back/models/stock-bought.json   | 34 +++++++++
 7 files changed, 272 insertions(+), 1 deletion(-)
 create mode 100644 db/routines/vn/procedures/stockBought_calculate.sql
 create mode 100644 db/versions/11115-turquoiseRose/00-firstScript.sql
 create mode 100644 modules/entry/back/methods/stock-bought/getStockBought.js
 create mode 100644 modules/entry/back/methods/stock-bought/getStockBoughtDetail.js
 create mode 100644 modules/entry/back/models/stock-bought.js
 create mode 100644 modules/entry/back/models/stock-bought.json

diff --git a/db/routines/vn/procedures/stockBought_calculate.sql b/db/routines/vn/procedures/stockBought_calculate.sql
new file mode 100644
index 000000000..8b2a32e5d
--- /dev/null
+++ b/db/routines/vn/procedures/stockBought_calculate.sql
@@ -0,0 +1,62 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`stockBought_calculate`(
+	vDated DATE
+)
+proc: BEGIN
+/**
+ * Calculate the stock of the auction warehouse from the inventory date to vDated
+ * without taking into account the outputs of the same day vDated
+ *
+ * @param vDated Date to calculate the stock.
+ */
+	IF vDated < util.VN_CURDATE() THEN
+		LEAVE proc;
+	END IF;
+
+	CREATE OR REPLACE TEMPORARY TABLE tStockBought
+		SELECT workerFk, reserve
+			FROM stockBought
+			WHERE dated = vDated
+				AND reserve;
+
+	DELETE FROM stockBought WHERE dated = vDated;
+
+	CALL item_calculateStock(vDated);
+
+	INSERT INTO stockBought(workerFk, bought, dated)
+		SELECT it.workerFk,
+				ROUND(SUM(
+						(ti.quantity / b.packing) *
+						buy_getVolume(b.id)
+					) / vc.palletM3 / 1000000, 1) bought,
+				vDated
+			FROM itemType it
+				JOIN item i ON i.typeFk = it.id
+				LEFT JOIN tmp.item ti ON ti.itemFk = i.id
+				JOIN itemCategory ic ON ic.id = it.categoryFk
+				JOIN warehouse wh ON wh.code = 'VNH'
+				JOIN tmp.buyUltimate bu ON bu.itemFk = i.id
+					AND bu.warehouseFk = wh.id
+				JOIN buy b ON b.id = bu.buyFk
+				JOIN volumeConfig vc
+			WHERE ic.display
+			GROUP BY it.workerFk
+			HAVING bought;
+
+	UPDATE stockBought s
+			JOIN tStockBought ts ON ts.workerFk = s.workerFk
+				SET s.reserve = ts.reserve
+		WHERE s.dated = vDated;
+
+	INSERT INTO stockBought (workerFk, reserve, dated)
+		SELECT ts.workerFk, ts.reserve, vDated
+			FROM tStockBought ts
+			WHERE ts.workerFk NOT IN (
+				SELECT workerFk
+					FROM stockBought
+					WHERE dated = vDated
+			);
+
+	DROP TEMPORARY TABLE tStockBought, tmp.item, tmp.buyUltimate;
+END$$
+DELIMITER ;
diff --git a/db/versions/11115-turquoiseRose/00-firstScript.sql b/db/versions/11115-turquoiseRose/00-firstScript.sql
new file mode 100644
index 000000000..3982936fc
--- /dev/null
+++ b/db/versions/11115-turquoiseRose/00-firstScript.sql
@@ -0,0 +1,30 @@
+-- Place your SQL code here
+-- vn.stockBought definition
+
+CREATE TABLE IF NOT EXISTS vn.stockBought (
+	id INT UNSIGNED auto_increment NOT NULL,
+	workerFk int(10) unsigned NOT NULL,
+	bought decimal(10,2) NOT NULL COMMENT 'purchase volume in m3 for the day',
+	reserve decimal(10,2) NULL COMMENT 'reserved volume in m3 for the day',
+	dated DATE NOT NULL DEFAULT current_timestamp(),
+	CONSTRAINT stockBought_pk PRIMARY KEY (id),
+	CONSTRAINT stockBought_unique UNIQUE KEY (workerFk,dated),
+	CONSTRAINT stockBought_worker_FK FOREIGN KEY (workerFk) REFERENCES vn.worker(id)
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
+
+
+INSERT IGNORE vn.stockBought (workerFk, bought, reserve, dated)
+    SELECT userFk, SUM(buyed), SUM(IFNULL(reserved,0)), dated
+        FROM vn.stockBuyed
+        WHERE userFk IS NOT NULL
+            AND buyed IS NOT NULL
+        GROUP BY userFk, dated;
+
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('StockBought','*','READ','ALLOW','ROLE','buyer'),
+		('StockBought','*','WRITE','ALLOW','ROLE','buyer'),
+		('Buyer','*','READ','ALLOW','ROLE','buyer');
+
diff --git a/modules/entry/back/methods/stock-bought/getStockBought.js b/modules/entry/back/methods/stock-bought/getStockBought.js
new file mode 100644
index 000000000..c1f99c496
--- /dev/null
+++ b/modules/entry/back/methods/stock-bought/getStockBought.js
@@ -0,0 +1,58 @@
+module.exports = Self => {
+    Self.remoteMethod('getStockBought', {
+        description: 'Returns the stock bought for a given date',
+        accessType: 'READ',
+        accepts: [{
+            arg: 'workerFk',
+            type: 'number',
+            description: 'The id for a buyer',
+        },
+        {
+            arg: 'dated',
+            type: 'date',
+            description: 'The date to filter',
+        }
+        ],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/getStockBought`,
+            verb: 'GET'
+        }
+    });
+
+    Self.getStockBought = async(workerFk, dated = Date.vnNew()) => {
+        const models = Self.app.models;
+        const today = Date.vnNew();
+        dated.setHours(0, 0, 0, 0);
+        today.setHours(0, 0, 0, 0);
+
+        await models.StockBought.rawSql(`CALL vn.stockBought_calculate(?)`, [dated]);
+
+        const filter = {
+            where: {dated},
+            include: [
+                {
+                    fields: ['workerFk', 'reserve', 'bought'],
+                    relation: 'worker',
+                    scope: {
+                        include: [
+                            {
+                                relation: 'user',
+                                scope: {
+                                    fields: ['id', 'name']
+                                }
+                            }
+                        ]
+                    }
+                }
+            ]
+        };
+
+        if (workerFk) filter.where.workerFk = workerFk;
+
+        return models.StockBought.find(filter);
+    };
+};
diff --git a/modules/entry/back/methods/stock-bought/getStockBoughtDetail.js b/modules/entry/back/methods/stock-bought/getStockBoughtDetail.js
new file mode 100644
index 000000000..3e040d0d3
--- /dev/null
+++ b/modules/entry/back/methods/stock-bought/getStockBoughtDetail.js
@@ -0,0 +1,74 @@
+module.exports = Self => {
+    Self.remoteMethod('getStockBoughtDetail', {
+        description: 'Returns the detail of stock bought for a given date and a worker',
+        accessType: 'READ',
+        accepts: [{
+            arg: 'workerFk',
+            type: 'number',
+            description: 'The worker to filter',
+            required: true,
+        }, {
+            arg: 'dated',
+            type: 'string',
+            description: 'The date to filter',
+            required: true,
+        }
+        ],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/getStockBoughtDetail`,
+            verb: 'GET'
+        }
+    });
+
+    Self.getStockBoughtDetail = async(workerFk, dated) => {
+        const models = Self.app.models;
+        const myOptions = {};
+        let tx;
+        let result;
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+
+        try {
+            await models.StockBought.rawSql(`CALL vn.item_calculateStock(?)`, [dated], myOptions);
+            result = await Self.rawSql(
+                `SELECT b.entryFk entryFk,
+                        i.id itemFk,
+                        i.name itemName,
+                        ti.quantity,
+                        (ac.conversionCoefficient * (ti.quantity / b.packing) * buy_getVolume(b.id))
+                            / (vc.trolleyM3 * 1000000) volume,
+                        b.packagingFk packagingFk,
+                        b.packing
+                    FROM tmp.item ti
+                        JOIN item i ON i.id = ti.itemFk
+                        JOIN itemType it ON i.typeFk = it.id
+                        JOIN itemCategory ic ON ic.id = it.categoryFk
+                        JOIN worker w ON w.id = it.workerFk
+                        JOIN auctionConfig ac
+                        JOIN tmp.buyUltimate bu ON bu.itemFk = i.id
+                            AND bu.warehouseFk = ac.warehouseFk
+                        JOIN buy b ON b.id = bu.buyFk
+                        JOIN volumeConfig vc
+                    WHERE ic.display
+                        AND w.id = ?`,
+                [workerFk], myOptions
+            );
+            await Self.rawSql(`DROP TEMPORARY TABLE tmp.item, tmp.buyUltimate;`, [], myOptions);
+            if (tx) await tx.commit();
+            return result;
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    };
+};
diff --git a/modules/entry/back/model-config.json b/modules/entry/back/model-config.json
index dc7fd86be..5c45b6e07 100644
--- a/modules/entry/back/model-config.json
+++ b/modules/entry/back/model-config.json
@@ -25,5 +25,8 @@
     },
     "EntryType": {
         "dataSource": "vn"
+    },
+    "StockBought": {
+        "dataSource": "vn"
     }
-}
\ No newline at end of file
+}
diff --git a/modules/entry/back/models/stock-bought.js b/modules/entry/back/models/stock-bought.js
new file mode 100644
index 000000000..ae52e7654
--- /dev/null
+++ b/modules/entry/back/models/stock-bought.js
@@ -0,0 +1,10 @@
+const UserError = require('vn-loopback/util/user-error');
+module.exports = Self => {
+    require('../methods/stock-bought/getStockBought')(Self);
+    require('../methods/stock-bought/getStockBoughtDetail')(Self);
+    Self.rewriteDbError(function(err) {
+        if (err.code === 'ER_DUP_ENTRY')
+            return new UserError(`This buyer has already made a reservation for this date`);
+        return err;
+    });
+};
diff --git a/modules/entry/back/models/stock-bought.json b/modules/entry/back/models/stock-bought.json
new file mode 100644
index 000000000..18c9f0347
--- /dev/null
+++ b/modules/entry/back/models/stock-bought.json
@@ -0,0 +1,34 @@
+{
+    "name": "StockBought",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+        "table": "stockBought"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true
+        },
+        "workerFk": {
+            "type": "number"
+        },
+        "bought": {
+            "type": "number"
+        },
+        "reserve": {
+            "type": "number"
+        },
+        "dated": {
+            "type": "date"
+        }
+    },
+    "relations": {
+        "worker": {
+            "type": "belongsTo",
+            "model": "Worker",
+            "foreignKey": "workerFk"
+        }
+    }
+}

From 19dcedbce5fefe9bd10c5131300c4f548c725de8 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Tue, 1 Oct 2024 11:31:35 +0200
Subject: [PATCH 21/28] fix: refs #7935 Fix boolens

---
 db/versions/11274-redGerbera/00-firstScript copy 2.sql | 1 +
 db/versions/11274-redGerbera/00-firstScript copy 3.sql | 1 +
 db/versions/11274-redGerbera/00-firstScript copy 4.sql | 1 +
 db/versions/11274-redGerbera/00-firstScript copy 5.sql | 3 +++
 db/versions/11274-redGerbera/00-firstScript copy 6.sql | 1 +
 db/versions/11274-redGerbera/00-firstScript copy.sql   | 1 +
 db/versions/11274-redGerbera/00-firstScript.sql        | 1 +
 7 files changed, 9 insertions(+)
 create mode 100644 db/versions/11274-redGerbera/00-firstScript copy 2.sql
 create mode 100644 db/versions/11274-redGerbera/00-firstScript copy 3.sql
 create mode 100644 db/versions/11274-redGerbera/00-firstScript copy 4.sql
 create mode 100644 db/versions/11274-redGerbera/00-firstScript copy 5.sql
 create mode 100644 db/versions/11274-redGerbera/00-firstScript copy 6.sql
 create mode 100644 db/versions/11274-redGerbera/00-firstScript copy.sql
 create mode 100644 db/versions/11274-redGerbera/00-firstScript.sql

diff --git a/db/versions/11274-redGerbera/00-firstScript copy 2.sql b/db/versions/11274-redGerbera/00-firstScript copy 2.sql
new file mode 100644
index 000000000..452accf2e
--- /dev/null
+++ b/db/versions/11274-redGerbera/00-firstScript copy 2.sql	
@@ -0,0 +1 @@
+ALTER TABLE vn.address MODIFY COLUMN isEqualizated tinyint(1) DEFAULT FALSE NOT NULL;
diff --git a/db/versions/11274-redGerbera/00-firstScript copy 3.sql b/db/versions/11274-redGerbera/00-firstScript copy 3.sql
new file mode 100644
index 000000000..c1f574379
--- /dev/null
+++ b/db/versions/11274-redGerbera/00-firstScript copy 3.sql	
@@ -0,0 +1 @@
+ALTER TABLE vn.autonomy MODIFY COLUMN isUeeMember tinyint(1) DEFAULT FALSE NOT NULL;
\ No newline at end of file
diff --git a/db/versions/11274-redGerbera/00-firstScript copy 4.sql b/db/versions/11274-redGerbera/00-firstScript copy 4.sql
new file mode 100644
index 000000000..18a4d3314
--- /dev/null
+++ b/db/versions/11274-redGerbera/00-firstScript copy 4.sql	
@@ -0,0 +1 @@
+ALTER TABLE vn.chat MODIFY COLUMN checkUserStatus tinyint(1) DEFAULT FALSE NOT NULL;
diff --git a/db/versions/11274-redGerbera/00-firstScript copy 5.sql b/db/versions/11274-redGerbera/00-firstScript copy 5.sql
new file mode 100644
index 000000000..c75965735
--- /dev/null
+++ b/db/versions/11274-redGerbera/00-firstScript copy 5.sql	
@@ -0,0 +1,3 @@
+ALTER TABLE vn.warehouse
+    MODIFY COLUMN isOrigin tinyint(1) DEFAULT FALSE NOT NULL,
+    MODIFY COLUMN isDestiny tinyint(1) DEFAULT FALSE NOT NULL;
\ No newline at end of file
diff --git a/db/versions/11274-redGerbera/00-firstScript copy 6.sql b/db/versions/11274-redGerbera/00-firstScript copy 6.sql
new file mode 100644
index 000000000..63b942e9d
--- /dev/null
+++ b/db/versions/11274-redGerbera/00-firstScript copy 6.sql	
@@ -0,0 +1 @@
+ALTER TABLE vn.zoneIncluded MODIFY COLUMN isIncluded tinyint(1) DEFAULT FALSE NOT NULL;
diff --git a/db/versions/11274-redGerbera/00-firstScript copy.sql b/db/versions/11274-redGerbera/00-firstScript copy.sql
new file mode 100644
index 000000000..f14ff371d
--- /dev/null
+++ b/db/versions/11274-redGerbera/00-firstScript copy.sql	
@@ -0,0 +1 @@
+ALTER TABLE bs.defaulter MODIFY COLUMN hasChanged tinyint(1) DEFAULT FALSE NOT NULL;
diff --git a/db/versions/11274-redGerbera/00-firstScript.sql b/db/versions/11274-redGerbera/00-firstScript.sql
new file mode 100644
index 000000000..8bcf7e027
--- /dev/null
+++ b/db/versions/11274-redGerbera/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE account.user MODIFY COLUMN emailVerified tinyint(1) DEFAULT FALSE NOT NULL;

From 6685ade2992ecb79b6288e6c8f51528856cc2d99 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Tue, 1 Oct 2024 12:19:51 +0200
Subject: [PATCH 22/28] fix: getSimilar daysInforward

---
 db/routines/vn/procedures/item_getSimilar.sql | 62 +++++++++----------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/db/routines/vn/procedures/item_getSimilar.sql b/db/routines/vn/procedures/item_getSimilar.sql
index b524e30a7..56afd92e9 100644
--- a/db/routines/vn/procedures/item_getSimilar.sql
+++ b/db/routines/vn/procedures/item_getSimilar.sql
@@ -1,10 +1,10 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`item_getSimilar`(
-    vSelf INT,
-    vWarehouseFk INT,
-    vDated DATE,
-    vShowType BOOL,
-    vDaysInForward INT
+	vSelf INT,
+	vWarehouseFk INT,
+	vDated DATE,
+	vShowType BOOL,
+	vDaysInForward INT
 )
 BEGIN
 /**
@@ -17,48 +17,48 @@ BEGIN
 * @param vShowType Mostrar tipos
 * @param vDaysInForward Días de alcance para las ventas
 */
-    DECLARE vAvailableCalcFk INT;
-    DECLARE vPriority INT DEFAULT 1;
+	DECLARE vAvailableCalcFk INT;
+	DECLARE vPriority INT DEFAULT 1;
 
-    CALL cache.available_refresh(vAvailableCalcFk, FALSE, vWarehouseFk, vDated);
+	CALL cache.available_refresh(vAvailableCalcFk, FALSE, vWarehouseFk, vDated);
 
-    WITH itemTags AS (
-        SELECT i.id,
-               typeFk,
-               tag5,
-               value5,
-               tag6,
-               value6,
-               tag7,
-               value7,
-               tag8,
-               value8,
-               t.name,
-               it.value
+	WITH itemTags AS (
+		SELECT i.id,
+				typeFk,
+				tag5,
+				value5,
+				tag6,
+				value6,
+				tag7,
+				value7,
+				tag8,
+				value8,
+				t.name,
+				it.value
 			FROM vn.item i
 				LEFT JOIN vn.itemTag it ON it.itemFk = i.id
 					AND it.priority = vPriority
 				LEFT JOIN vn.tag t ON t.id = it.tagFk
 			WHERE i.id = vSelf
-    ),
-    stock AS (
-        SELECT itemFk, SUM(visible) stock
+	),
+	stock AS (
+		SELECT itemFk, SUM(visible) stock
 			FROM vn.itemShelvingStock
 			WHERE warehouseFk = vWarehouseFk
 			GROUP BY itemFk
-    ),
-    sold AS (
-        SELECT SUM(s.quantity) quantity, s.itemFk
+	),
+	sold AS (
+		SELECT SUM(s.quantity) quantity, s.itemFk
 			FROM vn.sale s
 				JOIN vn.ticket t ON t.id = s.ticketFk
 				LEFT JOIN vn.itemShelvingSale iss ON iss.saleFk = s.id
-			WHERE t.shipped BETWEEN CURDATE() AND CURDATE() + INTERVAL vDaysInForward DAY
+			WHERE t.shipped >= CURDATE() + INTERVAL vDaysInForward DAY
 				AND iss.saleFk IS NULL
 				AND t.warehouseFk = vWarehouseFk
 			GROUP BY s.itemFk
-    )
-    SELECT i.id itemFk,
-			CAST(sd.quantity AS INT) advanceable,
+	)
+	SELECT i.id itemFk,
+			LEAST(CAST(sd.quantity AS INT), sk.stock) advanceable,
 			i.longName,
 			i.subName,
 			i.tag5,

From f54a9a13480a055c060a78a88a25f1646c98f2ca Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 1 Oct 2024 12:27:16 +0200
Subject: [PATCH 23/28] fix(fixtures): revert bad merge master to test

---
 db/dump/fixtures.before.sql | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/db/dump/fixtures.before.sql b/db/dump/fixtures.before.sql
index 220b1a143..825f15615 100644
--- a/db/dump/fixtures.before.sql
+++ b/db/dump/fixtures.before.sql
@@ -1544,7 +1544,7 @@ INSERT INTO `bs`.`waste`(`buyerFk`, `year`, `week`, `itemFk`, `itemTypeFk`, `sal
         ('103',              YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),      6, 1, '186',      '0',      '51',      '53.12',   '56.20',   '56.20',   '56.20'),
         ('103',              YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),      7, 1, '277',      '0',      '53.12',   '56.20',   '56.20',   '56.20',   '56.20');
 
-INSERT INTO `vn`.`buy`(`id`,`entryFk`,`itemFk`,`buyingValue`,`quantity`,`packagingFk`,`stickers`,`freightValue`,`packageValue`,`comissionValue`,`packing`,`grouping`,`groupingMode`,`location`,`price1`,`price2`,`price3`, `printedStickers`,`isChecked`,`isIgnored`,`weight`, `created`)
+	INSERT INTO vn.buy(id,entryFk,itemFk,buyingValue,quantity,packagingFk,stickers,freightValue,packageValue,comissionValue,packing,grouping,groupingMode,location,price1,price2,price3,printedStickers,isChecked,isIgnored,weight,created)
     VALUES
         (1,  1, 1, 50,      5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 2 MONTH),
         (2,  2, 1, 50,      100,    4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 1 MONTH),
@@ -1560,7 +1560,8 @@ INSERT INTO `vn`.`buy`(`id`,`entryFk`,`itemFk`,`buyingValue`,`quantity`,`packagi
         (12, 6, 4, 1.25,    0,      3, 1, 2.500, 2.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
         (13, 7, 1, 50,      0,      3, 1, 2.000, 2.000, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 4,     util.VN_CURDATE()),
         (14, 7, 2, 5,       0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00, 7.30, 7.00,   0, 1, 0, 4,     util.VN_CURDATE()),
-        (15, 7, 4, 1.25,    0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE());
+		(15, 7, 4, 1.25,    0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
+        (16, 99,1,50.0000,  5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.60, 99.40,  0, 1, 0, 1.00, '2024-07-30 08:13:51.000');
 
 INSERT INTO `hedera`.`order`(`id`, `date_send`, `customer_id`, `delivery_method_id`, `agency_id`, `address_id`, `company_id`, `note`, `source_app`, `confirmed`,`total`, `date_make`, `first_row_stamp`, `confirm_date`)
     VALUES

From 435fec03da8395c15c48ced9afb25708ecd82714 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 1 Oct 2024 15:05:02 +0200
Subject: [PATCH 24/28] refactor: refs #7404 deprecated stockBuyed

---
 db/routines/vn/procedures/clean.sql           |  2 +-
 .../vn/procedures/stockBuyedByWorker.sql      | 74 -------------------
 db/routines/vn/procedures/stockBuyed_add.sql  | 70 ------------------
 .../11272-azureLilium/00-firstScript.sql      |  4 +
 4 files changed, 5 insertions(+), 145 deletions(-)
 delete mode 100644 db/routines/vn/procedures/stockBuyedByWorker.sql
 delete mode 100644 db/routines/vn/procedures/stockBuyed_add.sql
 create mode 100644 db/versions/11272-azureLilium/00-firstScript.sql

diff --git a/db/routines/vn/procedures/clean.sql b/db/routines/vn/procedures/clean.sql
index a8ca68e5f..4a1f526fc 100644
--- a/db/routines/vn/procedures/clean.sql
+++ b/db/routines/vn/procedures/clean.sql
@@ -59,7 +59,7 @@ BEGIN
 	DELETE b FROM buy b
 			JOIN entryConfig e ON e.defaultEntry = b.entryFk
 		WHERE b.created < v2Months;
-	DELETE FROM stockBuyed WHERE creationDate < v2Months;
+	DELETE FROM stockBought WHERE dated < v2Months;
 	DELETE FROM printQueue WHERE statusCode = 'printed' AND created < v2Months;
 	-- Equipos duplicados
 	DELETE w.*
diff --git a/db/routines/vn/procedures/stockBuyedByWorker.sql b/db/routines/vn/procedures/stockBuyedByWorker.sql
deleted file mode 100644
index 13bda0133..000000000
--- a/db/routines/vn/procedures/stockBuyedByWorker.sql
+++ /dev/null
@@ -1,74 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`stockBuyedByWorker`(
-	vDated DATE,
-	vWorker INT
-)
-BEGIN
-/**
- * Inserta el volumen de compra de un comprador
- * en stockBuyed de acuerdo con la fecha.
- *
- * @param vDated Fecha de compra
- * @param vWorker Id de trabajador
- */
-	CREATE OR REPLACE TEMPORARY TABLE tStockBuyed
-		(INDEX (userFk))
-		ENGINE = MEMORY
-		SELECT requested, reserved, userFk
-			FROM stockBuyed
-			WHERE dated = vDated
-				AND userFk = vWorker;
-
-	DELETE FROM stockBuyed
-		WHERE dated = vDated
-			AND userFk = vWorker;
-
-	CALL item_calculateStock(vDated);
-
-	INSERT INTO stockBuyed(userFk, buyed, `dated`, reserved, requested, description)
-		SELECT it.workerFk,
-				SUM((ti.quantity / b.packing) * buy_getVolume(b.id)) / vc.palletM3 / 1000000,
-				vDated,
-				sb.reserved,
-				sb.requested,
-				u.name
-			FROM itemType it
-				JOIN item i ON i.typeFk = it.id
-				LEFT JOIN tmp.item ti ON ti.itemFk = i.id
-				JOIN itemCategory ic ON ic.id = it.categoryFk
-				JOIN warehouse wh ON wh.code = 'VNH'
-				JOIN tmp.buyUltimate bu ON bu.itemFk = i.id
-					AND bu.warehouseFk = wh.id
-				JOIN buy b ON b.id = bu.buyFk
-				JOIN volumeConfig vc
-				JOIN account.`user` u ON u.id = it.workerFk
-				LEFT JOIN tStockBuyed sb ON sb.userFk = it.workerFk
-			WHERE ic.display
-				AND it.workerFk = vWorker;
-
-	SELECT b.entryFk Id_Entrada,
-			i.id Id_Article,
-			i.name Article,
-			ti.quantity Cantidad,
-			(ac.conversionCoefficient * (ti.quantity / b.packing) * buy_getVolume(b.id))
-				/ (vc.trolleyM3 * 1000000) buyed,
-			b.packagingFk id_cubo,
-			b.packing
-		FROM tmp.item ti
-			JOIN item i ON i.id = ti.itemFk
-			JOIN itemType it ON i.typeFk = it.id
-			JOIN itemCategory ic ON ic.id = it.categoryFk
-			JOIN worker w ON w.id = it.workerFk
-			JOIN auctionConfig ac
-			JOIN tmp.buyUltimate bu ON bu.itemFk = i.id
-				AND bu.warehouseFk = ac.warehouseFk
-			JOIN buy b ON b.id = bu.buyFk
-			JOIN volumeConfig vc
-		WHERE ic.display
-			AND w.id = vWorker;
-
-	DROP TEMPORARY TABLE tmp.buyUltimate,
-		tmp.item,
-		tStockBuyed;
-END$$
-DELIMITER ;
diff --git a/db/routines/vn/procedures/stockBuyed_add.sql b/db/routines/vn/procedures/stockBuyed_add.sql
deleted file mode 100644
index aab85e7fa..000000000
--- a/db/routines/vn/procedures/stockBuyed_add.sql
+++ /dev/null
@@ -1,70 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`stockBuyed_add`(
-	vDated DATE
-)
-BEGIN
-/**
- * Inserta el volumen de compra por comprador
- * en stockBuyed de acuerdo con la fecha.
- *
- * @param vDated Fecha de compra
- */
-	CREATE OR REPLACE TEMPORARY TABLE tStockBuyed
-		(INDEX (userFk))
-		ENGINE = MEMORY
-		SELECT requested, reserved, userFk
-			FROM stockBuyed
-			WHERE dated = vDated;
-
-	DELETE FROM stockBuyed WHERE dated = vDated;
-
-	CALL item_calculateStock(vDated);
-
-	INSERT INTO stockBuyed(userFk, buyed, `dated`, description)
-		SELECT it.workerFk,
-				SUM((ti.quantity / b.packing) * buy_getVolume(b.id)) / vc.palletM3 / 1000000,
-				vDated,
-				u.name
-			FROM itemType it
-				JOIN item i ON i.typeFk = it.id
-				LEFT JOIN tmp.item ti ON ti.itemFk = i.id
-				JOIN itemCategory ic ON ic.id = it.categoryFk
-				JOIN warehouse wh ON wh.code = 'VNH'
-				JOIN tmp.buyUltimate bu ON bu.itemFk = i.id AND bu.warehouseFk = wh.id
-				JOIN buy b ON b.id = bu.buyFk
-				JOIN volumeConfig vc
-				JOIN account.`user` u ON u.id = it.workerFk
-				JOIN workerDepartment wd ON wd.workerFk = u.id
-				JOIN department d ON d.id = wd.departmentFk
-			WHERE ic.display
-				AND d.code IN ('shopping', 'logistic', 'franceTeam')
-			GROUP BY it.workerFk;
-
-	INSERT INTO stockBuyed(buyed, dated, description)
-		SELECT SUM(ic.cm3 * ito.quantity / vc.palletM3 / 1000000),
-				vDated,
-				IF(c.code = 'ES', p.name, c.name) destiny
-			FROM itemTicketOut ito
-				JOIN ticket t ON t.id = ito.ticketFk
-				JOIN `address` a ON a.id = t.addressFk
-				JOIN province p ON p.id = a.provinceFk
-				JOIN country c ON c.id = p.countryFk
-				JOIN warehouse wh ON wh.id = t.warehouseFk
-				JOIN itemCost ic ON ic.itemFk = ito.itemFk
-					AND ic.warehouseFk = t.warehouseFk
-				JOIN volumeConfig vc
-			WHERE ito.shipped BETWEEN vDated AND util.dayend(vDated)
-				AND wh.code = 'VNH'
-			GROUP BY destiny;
-
-	UPDATE stockBuyed s
-			JOIN tStockBuyed ts ON ts.userFk = s.userFk
-		SET s.requested = ts.requested,
-			s.reserved = ts.reserved
-		WHERE s.dated = vDated;
-
-	DROP TEMPORARY TABLE tmp.buyUltimate,
-		tmp.item,
-		tStockBuyed;
-END$$
-DELIMITER ;
diff --git a/db/versions/11272-azureLilium/00-firstScript.sql b/db/versions/11272-azureLilium/00-firstScript.sql
new file mode 100644
index 000000000..0194ece18
--- /dev/null
+++ b/db/versions/11272-azureLilium/00-firstScript.sql
@@ -0,0 +1,4 @@
+-- Place your SQL code here
+RENAME TABLE vn.stockBuyed TO vn.stockBuyed__;
+ALTER TABLE vn.stockBuyed__ 
+COMMENT='@deprecated 2024-10-01 rename and refactor to stockBought';

From b7b5334a99faefda26d190b28449d4ed313b2413 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 1 Oct 2024 15:08:42 +0200
Subject: [PATCH 25/28] refactor: refs #7884 modified filter

---
 modules/entry/back/methods/entry/filter.js | 35 +++++++++-------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/modules/entry/back/methods/entry/filter.js b/modules/entry/back/methods/entry/filter.js
index 35bf9677d..f4703245c 100644
--- a/modules/entry/back/methods/entry/filter.js
+++ b/modules/entry/back/methods/entry/filter.js
@@ -221,36 +221,29 @@ module.exports = Self => {
                     JOIN vn.currency cu ON cu.id = e.currencyFk`
         );
 
+        stmt.merge(conn.makeWhere(filter.where));
+
         const {daysAgo, daysOnward} = ctx.args;
-
-        if (daysAgo || daysOnward) {
-            let sql = '';
+        if (daysOnward || daysAgo) {
             const params = [];
+            let today = 'util.VN_CURDATE()';
+            let from = today;
+            let to = today;
 
-            if (daysAgo && daysOnward) {
-                sql = `
-                    AND t.shipped >= util.VN_CURDATE() - INTERVAL ? DAY
-                    AND t.shipped <= util.VN_CURDATE() + INTERVAL ? DAY
-                    `;
-                params.push(daysAgo, daysOnward);
-            } else if (daysAgo) {
-                sql = `
-                    AND t.shipped >= util.VN_CURDATE() - INTERVAL ? DAY
-                    AND t.shipped < util.VN_CURDATE()
-                    `;
+            if (daysAgo) {
+                from += ' - INTERVAL ? DAY';
                 params.push(daysAgo);
-            } else if (daysOnward) {
-                sql = `
-                    AND t.shipped <= util.VN_CURDATE() + INTERVAL ? DAY
-                    AND t.shipped >= util.VN_CURDATE()
-                    `;
+            }
+            if (daysOnward) {
+                to += ' + INTERVAL ? DAY';
                 params.push(daysOnward);
             }
 
-            stmt.merge({sql, params});
+            const whereDays = (filter.where ? 'AND' : 'WHERE') + ` t.shipped BETWEEN ${from} AND ${to}`;
+            stmt.merge({sql: whereDays, params});
         }
 
-        stmt.merge(conn.makeSuffix(filter));
+        stmt.merge(conn.makePagination(filter));
         const itemsIndex = stmts.push(stmt) - 1;
 
         const sql = ParameterizedSQL.join(stmts, ';');

From 40512ca67ee97b37e1cd7ddf5f202eb26cb655be Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Tue, 1 Oct 2024 15:49:51 +0200
Subject: [PATCH 26/28] feat: existingRefund without ticketRefunds

---
 modules/ticket/back/methods/sale/clone.js | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/modules/ticket/back/methods/sale/clone.js b/modules/ticket/back/methods/sale/clone.js
index 24346f3ba..0b658a69e 100644
--- a/modules/ticket/back/methods/sale/clone.js
+++ b/modules/ticket/back/methods/sale/clone.js
@@ -142,12 +142,19 @@ module.exports = Self => {
             ctx.args.addressId = ticket.addressFk;
 
             const newTicket = await models.Ticket.new(ctx, myOptions);
-
-            await models.TicketRefund.create({
-                originalTicketFk: ticketId,
-                refundTicketFk: newTicket.id
-            }, myOptions);
-
+            const existingRefund = await models.TicketRefund.findOne({
+                where: {
+                    originalTicketFk: ticketId,
+                    refundTicketFk: newTicket.id
+                },
+                myOptions
+            });
+            if (!existingRefund) {
+                await models.TicketRefund.create({
+                    originalTicketFk: ticketId,
+                    refundTicketFk: newTicket.id
+                }, myOptions);
+            }
             return newTicket;
         }
     };

From 9ba017d352a8ea70f74ea22c0b6986c7bb1ded9d Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Wed, 2 Oct 2024 09:06:21 +0200
Subject: [PATCH 27/28] feat: refs #7902 Changed definer and throw msg

---
 db/routines/vn/procedures/ticketRefund_upsert.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/routines/vn/procedures/ticketRefund_upsert.sql b/db/routines/vn/procedures/ticketRefund_upsert.sql
index ec37d71f0..ef5993361 100644
--- a/db/routines/vn/procedures/ticketRefund_upsert.sql
+++ b/db/routines/vn/procedures/ticketRefund_upsert.sql
@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticketRefund_upsert`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticketRefund_upsert`(
 	vRefundTicketFk INT,
 	vOriginalTicketFk INT
 )
@@ -19,7 +19,7 @@ BEGIN
 			AND isDeleted;
 
 	IF vIsDeleted THEN 
-		CALL util.throw('The refund ticket can not be deleted tickets');
+		CALL util.throw('Refund tickets cannot be deleted');
 	END IF;
 END$$
 DELIMITER ;

From b556903d6d707746f65fb9ebb29f333e0b8a9a87 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Wed, 2 Oct 2024 09:09:04 +0200
Subject: [PATCH 28/28] feat: refs #7902 Changed definer and throw msg

---
 db/routines/vn/procedures/ticketRefund_upsert.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/routines/vn/procedures/ticketRefund_upsert.sql b/db/routines/vn/procedures/ticketRefund_upsert.sql
index ef5993361..fb22e6e8c 100644
--- a/db/routines/vn/procedures/ticketRefund_upsert.sql
+++ b/db/routines/vn/procedures/ticketRefund_upsert.sql
@@ -19,7 +19,7 @@ BEGIN
 			AND isDeleted;
 
 	IF vIsDeleted THEN 
-		CALL util.throw('Refund tickets cannot be deleted');
+		CALL util.throw('The refund ticket cannot be deleted tickets');
 	END IF;
 END$$
 DELIMITER ;