From 1d73d9f89da5dd74a38cbd12c2e71b4bb7beb0f2 Mon Sep 17 00:00:00 2001
From: Bernat Exposito Domenech <bernat.verdnatura@gmail.com>
Date: Tue, 11 Feb 2020 13:25:41 +0100
Subject: [PATCH 01/11] refactor campaing report

---
 modules/client/front/descriptor/index.html    | 33 ++++++++++++-
 modules/client/front/descriptor/index.js      | 20 ++++++--
 modules/client/front/descriptor/locale/es.yml |  3 +-
 .../campaign-metrics/campaign-metrics.html    | 46 ++++++++++++-------
 4 files changed, 80 insertions(+), 22 deletions(-)

diff --git a/modules/client/front/descriptor/index.html b/modules/client/front/descriptor/index.html
index 722802c66..30777bcda 100644
--- a/modules/client/front/descriptor/index.html
+++ b/modules/client/front/descriptor/index.html
@@ -70,4 +70,35 @@
 </div>
 <!-- SMS Dialog -->
 <vn-client-sms vn-id="sms" sms="$ctrl.newSMS"></vn-client-sms>
-<!-- SMS Dialog -->
\ No newline at end of file
+<!-- SMS Dialog -->
+<vn-dialog
+    vn-id="consumerReportDialog"
+    on-response="$ctrl.sendConsumerReport($response)">
+    <tpl-body>
+        <div>
+            <h5 style="text-align: center">
+                <span translate>From date</span>
+            </h5>
+            <vn-date-picker
+                vn-id="from"
+                vn-one
+                ng-model="$ctrl.from"
+                label="From hour"
+                vn-focus>
+            </vn-date-picker>
+            <h5 style="text-align: center">
+                <span translate>To date</span>
+            </h5>
+            <vn-date-picker
+                vn-id="to"
+                vn-one
+                ng-model="$ctrl.to"
+                label="To date">
+        </vn-date-picker>
+        </div>
+    </tpl-body>
+    <tpl-buttons>
+        <input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/>
+        <button response="accept" translate>Accept</button>
+    </tpl-buttons>
+</vn-dialog>
\ No newline at end of file
diff --git a/modules/client/front/descriptor/index.js b/modules/client/front/descriptor/index.js
index 332d87deb..3ef1e7616 100644
--- a/modules/client/front/descriptor/index.js
+++ b/modules/client/front/descriptor/index.js
@@ -2,12 +2,13 @@ import ngModule from '../module';
 import Component from 'core/lib/component';
 
 class Controller extends Component {
-    constructor($element, $) {
+    constructor($element, $, $httpParamSerializer) {
         super($element, $);
-
+        this.$httpParamSerializer = $httpParamSerializer;
         this.moreOptions = [
             {name: 'Simple ticket', callback: this.newTicket},
             {name: 'Send SMS', callback: this.showSMSDialog},
+            {name: 'Send consumer report', callback: this.showConsumerReportDialog}
         ];
     }
 
@@ -63,9 +64,22 @@ class Controller extends Component {
         };
         this.$.sms.open();
     }
+
+    showConsumerReportDialog() {
+        this.$.consumerReportDialog.show();
+    }
+
+    sendConsumerReport(response) {
+        if (response === 'accept') {
+            const data = {from: this.from, to: this.to, clientId: this.client.id};
+            const serializedParams = this.$httpParamSerializer(data);
+            const url = `api/report/campaign-metrics?${serializedParams}`;
+            window.open(url);
+        }
+    }
 }
 
-Controller.$inject = ['$element', '$scope'];
+Controller.$inject = ['$element', '$scope', '$httpParamSerializer'];
 
 ngModule.component('vnClientDescriptor', {
     template: require('./index.html'),
diff --git a/modules/client/front/descriptor/locale/es.yml b/modules/client/front/descriptor/locale/es.yml
index 5ae6935d0..23cd397e5 100644
--- a/modules/client/front/descriptor/locale/es.yml
+++ b/modules/client/front/descriptor/locale/es.yml
@@ -1 +1,2 @@
-Simple ticket: Ticket simple
\ No newline at end of file
+Simple ticket: Ticket simple
+Sendconsumer report: Enviar informe de consumo
\ No newline at end of file
diff --git a/print/templates/reports/campaign-metrics/campaign-metrics.html b/print/templates/reports/campaign-metrics/campaign-metrics.html
index 5e4bc7d08..7a0f30948 100644
--- a/print/templates/reports/campaign-metrics/campaign-metrics.html
+++ b/print/templates/reports/campaign-metrics/campaign-metrics.html
@@ -57,27 +57,39 @@
                                 <table class="column-oriented">
                                     <thead>
                                         <tr>
-                                            <th class="number">{{$t('Code')}}</th>
+                                            <th>{{$t('Code')}}</th>
                                             <th class="number">{{$t('Quantity')}}</th>
                                             <th>{{$t('Concept')}}</th>
                                         </tr>
                                     </thead>
-                                    <tbody class="row-oriented bottom-line">
-                                        <tr v-for="sale in sales">
-                                            <td class="number">{{sale.itemFk}}</td>
-                                            <td class="number">{{Math.trunc(sale.subtotal)}}</td>
-                                            <td>
-                                                {{sale.concept}} <span class="font gray">{{sale.subName | uppercase}}</span>
-                                                <section>
-                                                    <span class="font gray">{{sale.tag5}}</span>
-                                                    <span>{{sale.value5}}</span>
-                                                    <span class="font gray">{{sale.tag6}}</span>
-                                                    <span>{{sale.value6}}</span>
-                                                    <span class="font gray">{{sale.tag7}}</span>
-                                                    <span>{{sale.value7}}</span>
-                                                </section>
-                                            </td>
-                                        </tr>
+                                    <tbody>
+                                        <template v-for="sale in sales">
+                                            <tr class="font bold">
+                                                <td>{{sale.itemFk}}</td>
+                                                <td class="number">{{Math.trunc(sale.subtotal)}}</td>
+                                                <td>{{sale.concept}}</td>
+                                            </tr>
+                                            <tr class="description">
+                                                <td class="centered">
+                                                    <div v-if="sale.value5">
+                                                        <strong class="font gray">{{sale.tag5}}</strong> 
+                                                        <span>{{sale.value5}}</span>
+                                                    </div>
+                                                </td>
+                                                <td class="centered">
+                                                    <div v-if="sale.value6">
+                                                        <strong class="font gray">{{sale.tag6}}</strong> 
+                                                        <span>{{sale.value6}}</span>
+                                                    </div>
+                                                </td>
+                                                <td class="centered">
+                                                    <div v-if="sale.value7">
+                                                        <strong class="font gray">{{sale.tag7}}</strong> 
+                                                        <span>{{sale.value7}}</span>
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                        </template>
                                     </tbody>
                                 </table>
                             </div>

From 5375952778d19681089c9b8ba5648548a705c143 Mon Sep 17 00:00:00 2001
From: Bernat Exposito Domenech <bernat.verdnatura@gmail.com>
Date: Tue, 11 Feb 2020 13:52:05 +0100
Subject: [PATCH 02/11] translate

---
 modules/client/front/descriptor/locale/es.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/client/front/descriptor/locale/es.yml b/modules/client/front/descriptor/locale/es.yml
index 23cd397e5..293191ec5 100644
--- a/modules/client/front/descriptor/locale/es.yml
+++ b/modules/client/front/descriptor/locale/es.yml
@@ -1,2 +1,2 @@
 Simple ticket: Ticket simple
-Sendconsumer report: Enviar informe de consumo
\ No newline at end of file
+Send consumer report: Enviar informe de consumo
\ No newline at end of file

From 14cee74ae24bda98f7bdc93c23e3950e4e4eb207 Mon Sep 17 00:00:00 2001
From: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
Date: Wed, 12 Feb 2020 07:21:53 +0100
Subject: [PATCH 03/11] #2024 e2e travel.thermograph + refactors

---
 e2e/dms/ecc/3.jpeg                            | Bin 0 -> 13518 bytes
 e2e/helpers/extensions.js                     |  16 ++++--
 e2e/helpers/selectors.js                      |   7 +++
 .../01_create_client.spec.js                  |   2 -
 .../02_edit_basic_data.spec.js                |   6 +-
 .../03_edit_fiscal_data.spec.js               |   2 +-
 .../04_edit_billing_data.spec.js              |   0
 .../05_add_address.spec.js                    |   0
 .../06_add_address_notes.spec.js              |   0
 .../07_edit_web_access.spec.js                |   0
 .../08_add_notes.spec.js                      |   0
 .../09_add_credit.spec.js                     |   2 -
 .../10_add_greuge.spec.js                     |   0
 .../11_mandate.spec.js                        |   0
 .../12_lock_of_verified_data.spec.js          |   0
 .../13_log.spec.js                            |   0
 .../14_balance.spec.js                        |   2 -
 .../15_user_config.spec.js                    |   2 +-
 .../16_web_payment.spec.js                    |   0
 .../17_dms.spec.js                            |   0
 .../18_contacts.spec.js                       |   0
 .../01_basicData.spec.js                      |   0
 .../02_time_control.spec.js                   |   0
 .../03_pbx.spec.js                            |   0
 .../01_summary.spec.js                        |   0
 .../02_basic_data.spec.js                     |   1 -
 .../03_tax.spec.js                            |   0
 .../04_tags.spec.js                           |   0
 .../05_niche.spec.js                          |   0
 .../06_botanical.spec.js                      |   0
 .../07_barcode.spec.js                        |   0
 .../08_create_and_clone.spec.js               |   1 -
 .../09_regularize.spec.js                     |   1 -
 .../10_item_index.spec.js                     |   0
 .../11_item_log.spec.js                       |   0
 .../12_descriptor.spec.js                     |   0
 .../01-sale/01_list_sales.spec.js             |   0
 .../01-sale/02_edit_sale.spec.js              |   0
 .../01_observations.spec.js                   |   2 +-
 .../02_expeditions_and_log.spec.js            |   0
 .../04_packages.spec.js                       |   0
 .../05_tracking_state.spec.js                 |   0
 .../06_basic_data_steps.spec.js               |   0
 .../08_components.spec.js                     |   0
 .../09_weekly.spec.js                         |   3 -
 .../10_request.spec.js                        |   0
 .../11_diary.spec.js                          |   0
 .../12_descriptor.spec.js                     |   2 -
 .../13_services.spec.js                       |   3 +-
 .../14_create_ticket.spec.js                  |   0
 .../15_create_ticket_from_client.spec.js      |   1 -
 .../16_summary.spec.js                        |   0
 .../01_basic_data.spec.js                     |   0
 .../02_development.spec.js                    |   2 +-
 .../03_detail.spec.js                         |   0
 .../04_claim_action.spec.js                   |   0
 .../05_summary.spec.js                        |   0
 .../06_descriptor.spec.js                     |   1 -
 .../01_edit_basic_data.spec.js                |   4 +-
 .../02_catalog.spec.js                        |   2 -
 .../03_lines.spec.js                          |   0
 .../01_create.spec.js                         |   0
 .../02_basic_data.spec.js                     |   2 +-
 .../03_tickets.spec.js                        |   0
 .../01_summary.spec.js                        |   1 -
 .../02_descriptor.spec.js                     |   2 -
 e2e/paths/10-travel/01_thermograph.spec.js    |  52 ++++++++++++++++++
 gulpfile.js                                   |   3 +-
 68 files changed, 83 insertions(+), 39 deletions(-)
 create mode 100644 e2e/dms/ecc/3.jpeg
 rename e2e/paths/{02-client-module => 02-client}/01_create_client.spec.js (98%)
 rename e2e/paths/{02-client-module => 02-client}/02_edit_basic_data.spec.js (97%)
 rename e2e/paths/{02-client-module => 02-client}/03_edit_fiscal_data.spec.js (99%)
 rename e2e/paths/{02-client-module => 02-client}/04_edit_billing_data.spec.js (100%)
 rename e2e/paths/{02-client-module => 02-client}/05_add_address.spec.js (100%)
 rename e2e/paths/{02-client-module => 02-client}/06_add_address_notes.spec.js (100%)
 rename e2e/paths/{02-client-module => 02-client}/07_edit_web_access.spec.js (100%)
 rename e2e/paths/{02-client-module => 02-client}/08_add_notes.spec.js (100%)
 rename e2e/paths/{02-client-module => 02-client}/09_add_credit.spec.js (94%)
 rename e2e/paths/{02-client-module => 02-client}/10_add_greuge.spec.js (100%)
 rename e2e/paths/{02-client-module => 02-client}/11_mandate.spec.js (100%)
 rename e2e/paths/{02-client-module => 02-client}/12_lock_of_verified_data.spec.js (100%)
 rename e2e/paths/{02-client-module => 02-client}/13_log.spec.js (100%)
 rename e2e/paths/{02-client-module => 02-client}/14_balance.spec.js (98%)
 rename e2e/paths/{02-client-module => 02-client}/15_user_config.spec.js (99%)
 rename e2e/paths/{02-client-module => 02-client}/16_web_payment.spec.js (100%)
 rename e2e/paths/{02-client-module => 02-client}/17_dms.spec.js (100%)
 rename e2e/paths/{02-client-module => 02-client}/18_contacts.spec.js (100%)
 rename e2e/paths/{03-worker-module => 03-worker}/01_basicData.spec.js (100%)
 rename e2e/paths/{03-worker-module => 03-worker}/02_time_control.spec.js (100%)
 rename e2e/paths/{03-worker-module => 03-worker}/03_pbx.spec.js (100%)
 rename e2e/paths/{04-item-module => 04-item}/01_summary.spec.js (100%)
 rename e2e/paths/{04-item-module => 04-item}/02_basic_data.spec.js (98%)
 rename e2e/paths/{04-item-module => 04-item}/03_tax.spec.js (100%)
 rename e2e/paths/{04-item-module => 04-item}/04_tags.spec.js (100%)
 rename e2e/paths/{04-item-module => 04-item}/05_niche.spec.js (100%)
 rename e2e/paths/{04-item-module => 04-item}/06_botanical.spec.js (100%)
 rename e2e/paths/{04-item-module => 04-item}/07_barcode.spec.js (100%)
 rename e2e/paths/{04-item-module => 04-item}/08_create_and_clone.spec.js (99%)
 rename e2e/paths/{04-item-module => 04-item}/09_regularize.spec.js (99%)
 rename e2e/paths/{04-item-module => 04-item}/10_item_index.spec.js (100%)
 rename e2e/paths/{04-item-module => 04-item}/11_item_log.spec.js (100%)
 rename e2e/paths/{04-item-module => 04-item}/12_descriptor.spec.js (100%)
 rename e2e/paths/{05-ticket-module => 05-ticket}/01-sale/01_list_sales.spec.js (100%)
 rename e2e/paths/{05-ticket-module => 05-ticket}/01-sale/02_edit_sale.spec.js (100%)
 rename e2e/paths/{05-ticket-module => 05-ticket}/01_observations.spec.js (99%)
 rename e2e/paths/{05-ticket-module => 05-ticket}/02_expeditions_and_log.spec.js (100%)
 rename e2e/paths/{05-ticket-module => 05-ticket}/04_packages.spec.js (100%)
 rename e2e/paths/{05-ticket-module => 05-ticket}/05_tracking_state.spec.js (100%)
 rename e2e/paths/{05-ticket-module => 05-ticket}/06_basic_data_steps.spec.js (100%)
 rename e2e/paths/{05-ticket-module => 05-ticket}/08_components.spec.js (100%)
 rename e2e/paths/{05-ticket-module => 05-ticket}/09_weekly.spec.js (97%)
 rename e2e/paths/{05-ticket-module => 05-ticket}/10_request.spec.js (100%)
 rename e2e/paths/{05-ticket-module => 05-ticket}/11_diary.spec.js (100%)
 rename e2e/paths/{05-ticket-module => 05-ticket}/12_descriptor.spec.js (98%)
 rename e2e/paths/{05-ticket-module => 05-ticket}/13_services.spec.js (98%)
 rename e2e/paths/{05-ticket-module => 05-ticket}/14_create_ticket.spec.js (100%)
 rename e2e/paths/{05-ticket-module => 05-ticket}/15_create_ticket_from_client.spec.js (96%)
 rename e2e/paths/{05-ticket-module => 05-ticket}/16_summary.spec.js (100%)
 rename e2e/paths/{06-claim-module => 06-claim}/01_basic_data.spec.js (100%)
 rename e2e/paths/{06-claim-module => 06-claim}/02_development.spec.js (99%)
 rename e2e/paths/{06-claim-module => 06-claim}/03_detail.spec.js (100%)
 rename e2e/paths/{06-claim-module => 06-claim}/04_claim_action.spec.js (100%)
 rename e2e/paths/{06-claim-module => 06-claim}/05_summary.spec.js (100%)
 rename e2e/paths/{06-claim-module => 06-claim}/06_descriptor.spec.js (98%)
 rename e2e/paths/{07-order-module => 07-order}/01_edit_basic_data.spec.js (97%)
 rename e2e/paths/{07-order-module => 07-order}/02_catalog.spec.js (97%)
 rename e2e/paths/{07-order-module => 07-order}/03_lines.spec.js (100%)
 rename e2e/paths/{08-route-module => 08-route}/01_create.spec.js (100%)
 rename e2e/paths/{08-route-module => 08-route}/02_basic_data.spec.js (99%)
 rename e2e/paths/{08-route-module => 08-route}/03_tickets.spec.js (100%)
 rename e2e/paths/{09-invoice-out-module => 09-invoice-out}/01_summary.spec.js (97%)
 rename e2e/paths/{09-invoice-out-module => 09-invoice-out}/02_descriptor.spec.js (98%)
 create mode 100644 e2e/paths/10-travel/01_thermograph.spec.js

diff --git a/e2e/dms/ecc/3.jpeg b/e2e/dms/ecc/3.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..fb2483f69669a8f3ac8238a0ec0e135b074609c1
GIT binary patch
literal 13518
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

literal 0
HcmV?d00001

diff --git a/e2e/helpers/extensions.js b/e2e/helpers/extensions.js
index 452dd3a4d..ea8f50626 100644
--- a/e2e/helpers/extensions.js
+++ b/e2e/helpers/extensions.js
@@ -21,6 +21,7 @@ let actions = {
         } catch (error) {
             throw new Error(`failed to reach URL containing: ${expectedHash}`);
         }
+        await this.waitForContentLoaded();
         return true;
     },
 
@@ -167,7 +168,7 @@ let actions = {
 
     waitToGetProperty: async function(selector, property) {
         let builtSelector = selector;
-        if (property != 'innerText')
+        if (selector.includes('vn-input-file') || property != 'innerText')
             builtSelector = await this.selectorFormater(selector);
 
         try {
@@ -311,6 +312,9 @@ let actions = {
         if (selector.includes('vn-textfield'))
             return builtSelector = `${selector} input`;
 
+        if (selector.includes('vn-input-file'))
+            return builtSelector = `${selector} section`;
+
         return builtSelector;
     },
 
@@ -365,14 +369,15 @@ let actions = {
         await this.write('vn-searchbar', searchValue);
         await this.waitToClick('vn-searchbar vn-icon[icon="search"]');
         await this.waitForNumberOfElements('.search-result', 1);
-        await this.waitFor(1000);
+        await this.waitForContentLoaded();
         await this.evaluate(() => {
             return document.querySelector('.search-result').click();
         });
+        await this.waitForContentLoaded();
     },
 
     accessToSection: async function(sectionRoute) {
-        await this.waitForSelector(`vn-left-menu`, {visible: true});
+        await this.waitForSelector('vn-left-menu');
         let nested = await this.evaluate(sectionRoute => {
             return document.querySelector(`vn-left-menu li li > a[ui-sref="${sectionRoute}"]`) != null;
         }, sectionRoute);
@@ -394,6 +399,7 @@ let actions = {
     autocompleteSearch: async function(selector, searchValue) {
         let builtSelector = await this.selectorFormater(selector);
 
+        await this.waitForContentLoaded();
         await this.waitToClick(selector);
         await this.waitForSelector(selector => {
             document
@@ -424,10 +430,11 @@ let actions = {
         }, {}, builtSelector, searchValue);
 
         await this.waitForMutation(`.vn-drop-down`, 'childList');
+        await this.waitForContentLoaded();
     },
 
     reloadSection: async function(sectionRoute) {
-        await this.waitFor(1000);
+        await this.waitForContentLoaded();
         await Promise.all([
             this.waitForNavigation({waitUntil: 'networkidle0'}),
             this.click('vn-icon[icon="desktop_windows"]', {}),
@@ -437,6 +444,7 @@ let actions = {
             this.waitForNavigation({waitUntil: 'networkidle0'}),
             this.click(`vn-left-menu li > a[ui-sref="${sectionRoute}"]`, {}),
         ]);
+        await this.waitForContentLoaded();
     },
 
     forceReloadSection: async function(sectionRoute) {
diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index 99c78eea2..ed232ef3b 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -748,5 +748,12 @@ export default {
         taxTwo: 'vn-invoice-out-summary > vn-card > vn-horizontal > vn-two > vn-table > div > vn-tbody > vn-tr:nth-child(2)',
         ticketOne: 'vn-invoice-out-summary > vn-card > vn-horizontal > vn-auto > vn-table > div > vn-tbody > vn-tr:nth-child(1)',
         ticketTwo: 'vn-invoice-out-summary > vn-card > vn-horizontal > vn-auto > vn-table > div > vn-tbody > vn-tr:nth-child(2)'
+    },
+    travelThermograph: {
+        add: 'vn-travel-thermograph-index vn-float-button[icon="add"]',
+        thermographID: 'vn-travel-thermograph-create vn-autocomplete[ng-model="$ctrl.dms.thermographId"]',
+        uploadIcon: 'vn-travel-thermograph-create vn-icon[icon="cloud_upload"]',
+        createdThermograph: 'vn-travel-thermograph-index vn-tbody > vn-tr',
+        upload: 'vn-travel-thermograph-create button[type=submit]'
     }
 };
diff --git a/e2e/paths/02-client-module/01_create_client.spec.js b/e2e/paths/02-client/01_create_client.spec.js
similarity index 98%
rename from e2e/paths/02-client-module/01_create_client.spec.js
rename to e2e/paths/02-client/01_create_client.spec.js
index 29525df49..8f1a116ee 100644
--- a/e2e/paths/02-client-module/01_create_client.spec.js
+++ b/e2e/paths/02-client/01_create_client.spec.js
@@ -53,7 +53,6 @@ describe('Client create path', async() => {
         await page.write(selectors.createClientView.name, 'Carol Danvers');
         await page.write(selectors.createClientView.socialName, 'AVG tax');
         await page.write(selectors.createClientView.street, 'Many places');
-        await page.waitForContentLoaded();
         await page.autocompleteSearch(selectors.createClientView.country, 'España');
         await page.autocompleteSearch(selectors.createClientView.province, 'Province one');
         await page.write(selectors.createClientView.city, 'Valencia');
@@ -113,7 +112,6 @@ describe('Client create path', async() => {
     });
 
     it(`should search for the user Carol Danvers to confirm it exists`, async() => {
-        await page.waitForContentLoaded();
         await page.accessToSearchResult('Carol Danvers');
         let url = await page.expectURL('#!/client/114/summary');
 
diff --git a/e2e/paths/02-client-module/02_edit_basic_data.spec.js b/e2e/paths/02-client/02_edit_basic_data.spec.js
similarity index 97%
rename from e2e/paths/02-client-module/02_edit_basic_data.spec.js
rename to e2e/paths/02-client/02_edit_basic_data.spec.js
index 8b665bd96..9373dfe86 100644
--- a/e2e/paths/02-client-module/02_edit_basic_data.spec.js
+++ b/e2e/paths/02-client/02_edit_basic_data.spec.js
@@ -70,14 +70,14 @@ describe('Client Edit basicData path', () => {
     });
 
     describe('as salesAssistant', () => {
-        beforeAll(async() => {
+        it('should navigate to a client basic data', async() => {
             await page.loginAndModule('salesASsistant', 'client');
             await page.accessToSearchResult('Ptonomy Wallace');
             await page.accessToSection('client.card.basicData');
-        });
+        }, 30000);
 
         it('should be able to change the salesPerson', async() => {
-            await page.wait(selectors.clientBasicData.name);
+            await page.waitForSelector(selectors.clientBasicData.name);
             const result = await page.evaluate(selector => {
                 return document.querySelector(selector).disabled;
             }, `${selectors.clientBasicData.salesPerson} input`);
diff --git a/e2e/paths/02-client-module/03_edit_fiscal_data.spec.js b/e2e/paths/02-client/03_edit_fiscal_data.spec.js
similarity index 99%
rename from e2e/paths/02-client-module/03_edit_fiscal_data.spec.js
rename to e2e/paths/02-client/03_edit_fiscal_data.spec.js
index d39f196cb..ac08b100d 100644
--- a/e2e/paths/02-client-module/03_edit_fiscal_data.spec.js
+++ b/e2e/paths/02-client/03_edit_fiscal_data.spec.js
@@ -83,7 +83,7 @@ describe('Client Edit fiscalData path', () => {
             const result = await page.waitForLastSnackbar();
 
             expect(result).toEqual('Invalid Tax number');
-        }, 15000);
+        });
 
         it(`should edit the fiscal this time with a valid fiscal id`, async() => {
             await page.clearInput(selectors.clientFiscalData.fiscalId);
diff --git a/e2e/paths/02-client-module/04_edit_billing_data.spec.js b/e2e/paths/02-client/04_edit_billing_data.spec.js
similarity index 100%
rename from e2e/paths/02-client-module/04_edit_billing_data.spec.js
rename to e2e/paths/02-client/04_edit_billing_data.spec.js
diff --git a/e2e/paths/02-client-module/05_add_address.spec.js b/e2e/paths/02-client/05_add_address.spec.js
similarity index 100%
rename from e2e/paths/02-client-module/05_add_address.spec.js
rename to e2e/paths/02-client/05_add_address.spec.js
diff --git a/e2e/paths/02-client-module/06_add_address_notes.spec.js b/e2e/paths/02-client/06_add_address_notes.spec.js
similarity index 100%
rename from e2e/paths/02-client-module/06_add_address_notes.spec.js
rename to e2e/paths/02-client/06_add_address_notes.spec.js
diff --git a/e2e/paths/02-client-module/07_edit_web_access.spec.js b/e2e/paths/02-client/07_edit_web_access.spec.js
similarity index 100%
rename from e2e/paths/02-client-module/07_edit_web_access.spec.js
rename to e2e/paths/02-client/07_edit_web_access.spec.js
diff --git a/e2e/paths/02-client-module/08_add_notes.spec.js b/e2e/paths/02-client/08_add_notes.spec.js
similarity index 100%
rename from e2e/paths/02-client-module/08_add_notes.spec.js
rename to e2e/paths/02-client/08_add_notes.spec.js
diff --git a/e2e/paths/02-client-module/09_add_credit.spec.js b/e2e/paths/02-client/09_add_credit.spec.js
similarity index 94%
rename from e2e/paths/02-client-module/09_add_credit.spec.js
rename to e2e/paths/02-client/09_add_credit.spec.js
index 1cb06fb36..05c50e809 100644
--- a/e2e/paths/02-client-module/09_add_credit.spec.js
+++ b/e2e/paths/02-client/09_add_credit.spec.js
@@ -24,7 +24,6 @@ describe('Client Add credit path', () => {
     });
 
     it(`should edit the credit`, async() => {
-        await page.waitForContentLoaded();
         await page.clearInput(selectors.clientCredit.credit);
         await page.write(selectors.clientCredit.credit, '999');
         await page.waitToClick(selectors.clientCredit.saveButton);
@@ -34,7 +33,6 @@ describe('Client Add credit path', () => {
     });
 
     it('should confirm the credit was updated', async() => {
-        await page.waitForContentLoaded();
         const result = await page.waitToGetProperty(selectors.clientCredit.firstCreditText, 'innerText');
 
         expect(result).toContain(999);
diff --git a/e2e/paths/02-client-module/10_add_greuge.spec.js b/e2e/paths/02-client/10_add_greuge.spec.js
similarity index 100%
rename from e2e/paths/02-client-module/10_add_greuge.spec.js
rename to e2e/paths/02-client/10_add_greuge.spec.js
diff --git a/e2e/paths/02-client-module/11_mandate.spec.js b/e2e/paths/02-client/11_mandate.spec.js
similarity index 100%
rename from e2e/paths/02-client-module/11_mandate.spec.js
rename to e2e/paths/02-client/11_mandate.spec.js
diff --git a/e2e/paths/02-client-module/12_lock_of_verified_data.spec.js b/e2e/paths/02-client/12_lock_of_verified_data.spec.js
similarity index 100%
rename from e2e/paths/02-client-module/12_lock_of_verified_data.spec.js
rename to e2e/paths/02-client/12_lock_of_verified_data.spec.js
diff --git a/e2e/paths/02-client-module/13_log.spec.js b/e2e/paths/02-client/13_log.spec.js
similarity index 100%
rename from e2e/paths/02-client-module/13_log.spec.js
rename to e2e/paths/02-client/13_log.spec.js
diff --git a/e2e/paths/02-client-module/14_balance.spec.js b/e2e/paths/02-client/14_balance.spec.js
similarity index 98%
rename from e2e/paths/02-client-module/14_balance.spec.js
rename to e2e/paths/02-client/14_balance.spec.js
index 2e29dc04e..52d179383 100644
--- a/e2e/paths/02-client-module/14_balance.spec.js
+++ b/e2e/paths/02-client/14_balance.spec.js
@@ -17,7 +17,6 @@ describe('Client balance path', () => {
 
     it('should now edit the local user config data', async() => {
         await page.waitToClick(selectors.globalItems.userMenuButton);
-        await page.waitForContentLoaded();
         await page.autocompleteSearch(selectors.globalItems.userLocalCompany, 'CCs');
         let result = await page.waitForLastSnackbar();
 
@@ -118,7 +117,6 @@ describe('Client balance path', () => {
     });
 
     it('should now search for the user Petter Parker', async() => {
-        await page.waitForContentLoaded();
         await page.write(selectors.clientsIndex.topbarSearch, 'Petter Parker');
         await page.waitToClick(selectors.clientsIndex.searchButton);
         await page.waitForNumberOfElements(selectors.clientsIndex.searchResult, 1);
diff --git a/e2e/paths/02-client-module/15_user_config.spec.js b/e2e/paths/02-client/15_user_config.spec.js
similarity index 99%
rename from e2e/paths/02-client-module/15_user_config.spec.js
rename to e2e/paths/02-client/15_user_config.spec.js
index 6f76c73ca..193305177 100644
--- a/e2e/paths/02-client-module/15_user_config.spec.js
+++ b/e2e/paths/02-client/15_user_config.spec.js
@@ -21,7 +21,7 @@ describe('User config', () => {
 
         it('should now open the user config form to check the settings', async() => {
             await page.waitToClick(selectors.globalItems.userMenuButton);
-            await page.waitFor(1000);
+            await page.waitForContentLoaded();
 
             let expectedLocalWarehouse = await page
                 .expectPropertyValue(selectors.globalItems.userLocalWarehouse, 'value', '');
diff --git a/e2e/paths/02-client-module/16_web_payment.spec.js b/e2e/paths/02-client/16_web_payment.spec.js
similarity index 100%
rename from e2e/paths/02-client-module/16_web_payment.spec.js
rename to e2e/paths/02-client/16_web_payment.spec.js
diff --git a/e2e/paths/02-client-module/17_dms.spec.js b/e2e/paths/02-client/17_dms.spec.js
similarity index 100%
rename from e2e/paths/02-client-module/17_dms.spec.js
rename to e2e/paths/02-client/17_dms.spec.js
diff --git a/e2e/paths/02-client-module/18_contacts.spec.js b/e2e/paths/02-client/18_contacts.spec.js
similarity index 100%
rename from e2e/paths/02-client-module/18_contacts.spec.js
rename to e2e/paths/02-client/18_contacts.spec.js
diff --git a/e2e/paths/03-worker-module/01_basicData.spec.js b/e2e/paths/03-worker/01_basicData.spec.js
similarity index 100%
rename from e2e/paths/03-worker-module/01_basicData.spec.js
rename to e2e/paths/03-worker/01_basicData.spec.js
diff --git a/e2e/paths/03-worker-module/02_time_control.spec.js b/e2e/paths/03-worker/02_time_control.spec.js
similarity index 100%
rename from e2e/paths/03-worker-module/02_time_control.spec.js
rename to e2e/paths/03-worker/02_time_control.spec.js
diff --git a/e2e/paths/03-worker-module/03_pbx.spec.js b/e2e/paths/03-worker/03_pbx.spec.js
similarity index 100%
rename from e2e/paths/03-worker-module/03_pbx.spec.js
rename to e2e/paths/03-worker/03_pbx.spec.js
diff --git a/e2e/paths/04-item-module/01_summary.spec.js b/e2e/paths/04-item/01_summary.spec.js
similarity index 100%
rename from e2e/paths/04-item-module/01_summary.spec.js
rename to e2e/paths/04-item/01_summary.spec.js
diff --git a/e2e/paths/04-item-module/02_basic_data.spec.js b/e2e/paths/04-item/02_basic_data.spec.js
similarity index 98%
rename from e2e/paths/04-item-module/02_basic_data.spec.js
rename to e2e/paths/04-item/02_basic_data.spec.js
index 2b3ff9d51..2c8a8a7a1 100644
--- a/e2e/paths/04-item-module/02_basic_data.spec.js
+++ b/e2e/paths/04-item/02_basic_data.spec.js
@@ -41,7 +41,6 @@ describe('Item Edit basic data path', () => {
 
     it(`should confirm the item name was edited`, async() => {
         await page.reloadSection('item.card.basicData');
-        await page.waitForContentLoaded();
         const result = await page.waitToGetProperty(selectors.itemBasicData.name, 'value');
 
         expect(result).toEqual('Rose of Purity');
diff --git a/e2e/paths/04-item-module/03_tax.spec.js b/e2e/paths/04-item/03_tax.spec.js
similarity index 100%
rename from e2e/paths/04-item-module/03_tax.spec.js
rename to e2e/paths/04-item/03_tax.spec.js
diff --git a/e2e/paths/04-item-module/04_tags.spec.js b/e2e/paths/04-item/04_tags.spec.js
similarity index 100%
rename from e2e/paths/04-item-module/04_tags.spec.js
rename to e2e/paths/04-item/04_tags.spec.js
diff --git a/e2e/paths/04-item-module/05_niche.spec.js b/e2e/paths/04-item/05_niche.spec.js
similarity index 100%
rename from e2e/paths/04-item-module/05_niche.spec.js
rename to e2e/paths/04-item/05_niche.spec.js
diff --git a/e2e/paths/04-item-module/06_botanical.spec.js b/e2e/paths/04-item/06_botanical.spec.js
similarity index 100%
rename from e2e/paths/04-item-module/06_botanical.spec.js
rename to e2e/paths/04-item/06_botanical.spec.js
diff --git a/e2e/paths/04-item-module/07_barcode.spec.js b/e2e/paths/04-item/07_barcode.spec.js
similarity index 100%
rename from e2e/paths/04-item-module/07_barcode.spec.js
rename to e2e/paths/04-item/07_barcode.spec.js
diff --git a/e2e/paths/04-item-module/08_create_and_clone.spec.js b/e2e/paths/04-item/08_create_and_clone.spec.js
similarity index 99%
rename from e2e/paths/04-item-module/08_create_and_clone.spec.js
rename to e2e/paths/04-item/08_create_and_clone.spec.js
index 7d6a8e54d..32d0ff23b 100644
--- a/e2e/paths/04-item-module/08_create_and_clone.spec.js
+++ b/e2e/paths/04-item/08_create_and_clone.spec.js
@@ -40,7 +40,6 @@ describe('Item Create/Clone path', () => {
         });
 
         it('should now access to the create item view by clicking the create floating button', async() => {
-            await page.waitForContentLoaded();
             await page.waitToClick(selectors.itemsIndex.createItemButton);
             let url = await page.expectURL('#!/item/create');
 
diff --git a/e2e/paths/04-item-module/09_regularize.spec.js b/e2e/paths/04-item/09_regularize.spec.js
similarity index 99%
rename from e2e/paths/04-item-module/09_regularize.spec.js
rename to e2e/paths/04-item/09_regularize.spec.js
index 76e92f8a6..e43429aa0 100644
--- a/e2e/paths/04-item-module/09_regularize.spec.js
+++ b/e2e/paths/04-item/09_regularize.spec.js
@@ -81,7 +81,6 @@ describe('Item regularize path', () => {
     });
 
     it('should clear the user local settings now', async() => {
-        await page.waitForTransitionEnd('vn-searchbar');
         await page.waitToClick(selectors.globalItems.userMenuButton);
         await page.clearInput(selectors.globalItems.userConfigFirstAutocomplete);
         const result = await page.waitForLastSnackbar();
diff --git a/e2e/paths/04-item-module/10_item_index.spec.js b/e2e/paths/04-item/10_item_index.spec.js
similarity index 100%
rename from e2e/paths/04-item-module/10_item_index.spec.js
rename to e2e/paths/04-item/10_item_index.spec.js
diff --git a/e2e/paths/04-item-module/11_item_log.spec.js b/e2e/paths/04-item/11_item_log.spec.js
similarity index 100%
rename from e2e/paths/04-item-module/11_item_log.spec.js
rename to e2e/paths/04-item/11_item_log.spec.js
diff --git a/e2e/paths/04-item-module/12_descriptor.spec.js b/e2e/paths/04-item/12_descriptor.spec.js
similarity index 100%
rename from e2e/paths/04-item-module/12_descriptor.spec.js
rename to e2e/paths/04-item/12_descriptor.spec.js
diff --git a/e2e/paths/05-ticket-module/01-sale/01_list_sales.spec.js b/e2e/paths/05-ticket/01-sale/01_list_sales.spec.js
similarity index 100%
rename from e2e/paths/05-ticket-module/01-sale/01_list_sales.spec.js
rename to e2e/paths/05-ticket/01-sale/01_list_sales.spec.js
diff --git a/e2e/paths/05-ticket-module/01-sale/02_edit_sale.spec.js b/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js
similarity index 100%
rename from e2e/paths/05-ticket-module/01-sale/02_edit_sale.spec.js
rename to e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js
diff --git a/e2e/paths/05-ticket-module/01_observations.spec.js b/e2e/paths/05-ticket/01_observations.spec.js
similarity index 99%
rename from e2e/paths/05-ticket-module/01_observations.spec.js
rename to e2e/paths/05-ticket/01_observations.spec.js
index b343bcfeb..cccfa8b67 100644
--- a/e2e/paths/05-ticket-module/01_observations.spec.js
+++ b/e2e/paths/05-ticket/01_observations.spec.js
@@ -25,7 +25,7 @@ describe('Ticket Create notes path', () => {
         const result = await page.waitForLastSnackbar();
 
         expect(result).toEqual('Data saved!');
-    }, 15000);
+    });
 
     it('should confirm the note is the expected one', async() => {
         await page.reloadSection('ticket.card.observation');
diff --git a/e2e/paths/05-ticket-module/02_expeditions_and_log.spec.js b/e2e/paths/05-ticket/02_expeditions_and_log.spec.js
similarity index 100%
rename from e2e/paths/05-ticket-module/02_expeditions_and_log.spec.js
rename to e2e/paths/05-ticket/02_expeditions_and_log.spec.js
diff --git a/e2e/paths/05-ticket-module/04_packages.spec.js b/e2e/paths/05-ticket/04_packages.spec.js
similarity index 100%
rename from e2e/paths/05-ticket-module/04_packages.spec.js
rename to e2e/paths/05-ticket/04_packages.spec.js
diff --git a/e2e/paths/05-ticket-module/05_tracking_state.spec.js b/e2e/paths/05-ticket/05_tracking_state.spec.js
similarity index 100%
rename from e2e/paths/05-ticket-module/05_tracking_state.spec.js
rename to e2e/paths/05-ticket/05_tracking_state.spec.js
diff --git a/e2e/paths/05-ticket-module/06_basic_data_steps.spec.js b/e2e/paths/05-ticket/06_basic_data_steps.spec.js
similarity index 100%
rename from e2e/paths/05-ticket-module/06_basic_data_steps.spec.js
rename to e2e/paths/05-ticket/06_basic_data_steps.spec.js
diff --git a/e2e/paths/05-ticket-module/08_components.spec.js b/e2e/paths/05-ticket/08_components.spec.js
similarity index 100%
rename from e2e/paths/05-ticket-module/08_components.spec.js
rename to e2e/paths/05-ticket/08_components.spec.js
diff --git a/e2e/paths/05-ticket-module/09_weekly.spec.js b/e2e/paths/05-ticket/09_weekly.spec.js
similarity index 97%
rename from e2e/paths/05-ticket-module/09_weekly.spec.js
rename to e2e/paths/05-ticket/09_weekly.spec.js
index e88018ad5..c732a4b87 100644
--- a/e2e/paths/05-ticket-module/09_weekly.spec.js
+++ b/e2e/paths/05-ticket/09_weekly.spec.js
@@ -26,7 +26,6 @@ describe('Ticket descriptor path', () => {
     it('should go back to the ticket index then search and access a ticket summary', async() => {
         await page.accessToSection('ticket.index');
         await page.accessToSearchResult('11');
-        await page.waitForContentLoaded();
     });
 
     it('should add the ticket to thursday turn using the descriptor more menu', async() => {
@@ -64,7 +63,6 @@ describe('Ticket descriptor path', () => {
     });
 
     it('should now search for the ticket 11', async() => {
-        await page.waitForContentLoaded();
         await page.write(selectors.ticketsIndex.topbarSearch, '11');
         await page.waitToClick(selectors.ticketsIndex.searchButton);
         await page.waitForNumberOfElements(selectors.ticketsIndex.searchResult, 1);
@@ -81,7 +79,6 @@ describe('Ticket descriptor path', () => {
     });
 
     it('should add the ticket to saturday turn using the descriptor more menu', async() => {
-        await page.waitForContentLoaded();
         await page.waitToClick(selectors.ticketDescriptor.moreMenu);
         await page.waitToClick(selectors.ticketDescriptor.moreMenuAddToTurn);
         await page.waitToClick(selectors.ticketDescriptor.saturdayButton);
diff --git a/e2e/paths/05-ticket-module/10_request.spec.js b/e2e/paths/05-ticket/10_request.spec.js
similarity index 100%
rename from e2e/paths/05-ticket-module/10_request.spec.js
rename to e2e/paths/05-ticket/10_request.spec.js
diff --git a/e2e/paths/05-ticket-module/11_diary.spec.js b/e2e/paths/05-ticket/11_diary.spec.js
similarity index 100%
rename from e2e/paths/05-ticket-module/11_diary.spec.js
rename to e2e/paths/05-ticket/11_diary.spec.js
diff --git a/e2e/paths/05-ticket-module/12_descriptor.spec.js b/e2e/paths/05-ticket/12_descriptor.spec.js
similarity index 98%
rename from e2e/paths/05-ticket-module/12_descriptor.spec.js
rename to e2e/paths/05-ticket/12_descriptor.spec.js
index 6e3864b48..1aa0516de 100644
--- a/e2e/paths/05-ticket-module/12_descriptor.spec.js
+++ b/e2e/paths/05-ticket/12_descriptor.spec.js
@@ -34,7 +34,6 @@ describe('Ticket descriptor path', () => {
         });
 
         it(`should update the shipped hour using the descriptor menu`, async() => {
-            await page.waitForContentLoaded();
             await page.waitToClick(selectors.ticketDescriptor.moreMenu);
             await page.waitToClick(selectors.ticketDescriptor.moreMenuChangeShippedHour);
             await page.pickTime(selectors.ticketDescriptor.changeShippedHour, '08:15');
@@ -130,7 +129,6 @@ describe('Ticket descriptor path', () => {
         });
 
         it('should delete the stowaway', async() => {
-            await page.waitForContentLoaded();
             await page.waitToClick(selectors.ticketDescriptor.moreMenu);
             await page.waitToClick(selectors.ticketDescriptor.moreMenuDeleteStowawayButton);
             await page.waitToClick(selectors.ticketDescriptor.acceptDeleteStowawayButton);
diff --git a/e2e/paths/05-ticket-module/13_services.spec.js b/e2e/paths/05-ticket/13_services.spec.js
similarity index 98%
rename from e2e/paths/05-ticket-module/13_services.spec.js
rename to e2e/paths/05-ticket/13_services.spec.js
index cafc5f27c..0a09c7aa3 100644
--- a/e2e/paths/05-ticket-module/13_services.spec.js
+++ b/e2e/paths/05-ticket/13_services.spec.js
@@ -26,7 +26,7 @@ describe('Ticket services path', () => {
             const result = await page.isDisabled(selectors.ticketService.firstAddServiceTypeButton);
 
             expect(result).toBeTruthy();
-        }, 15000);
+        });
 
         it('should receive an error if you attempt to save a service without access rights', async() => {
             await page.clearInput(selectors.ticketService.firstPrice);
@@ -50,7 +50,6 @@ describe('Ticket services path', () => {
         });
 
         it('should click on the add button to prepare the form to create a new service', async() => {
-            await page.waitForContentLoaded();
             await page.waitToClick(selectors.ticketService.addServiceButton);
             const result = await page
                 .isVisible(selectors.ticketService.firstServiceType);
diff --git a/e2e/paths/05-ticket-module/14_create_ticket.spec.js b/e2e/paths/05-ticket/14_create_ticket.spec.js
similarity index 100%
rename from e2e/paths/05-ticket-module/14_create_ticket.spec.js
rename to e2e/paths/05-ticket/14_create_ticket.spec.js
diff --git a/e2e/paths/05-ticket-module/15_create_ticket_from_client.spec.js b/e2e/paths/05-ticket/15_create_ticket_from_client.spec.js
similarity index 96%
rename from e2e/paths/05-ticket-module/15_create_ticket_from_client.spec.js
rename to e2e/paths/05-ticket/15_create_ticket_from_client.spec.js
index 80bb217fb..28c11de3a 100644
--- a/e2e/paths/05-ticket-module/15_create_ticket_from_client.spec.js
+++ b/e2e/paths/05-ticket/15_create_ticket_from_client.spec.js
@@ -17,7 +17,6 @@ describe('Ticket create from client path', () => {
     });
 
     it('should click the create simple ticket on the descriptor menu', async() => {
-        await page.waitForContentLoaded();
         await page.waitToClick(selectors.clientDescriptor.moreMenu);
         await page.waitToClick(selectors.clientDescriptor.simpleTicketButton);
         let url = await page.expectURL('clientFk=102');
diff --git a/e2e/paths/05-ticket-module/16_summary.spec.js b/e2e/paths/05-ticket/16_summary.spec.js
similarity index 100%
rename from e2e/paths/05-ticket-module/16_summary.spec.js
rename to e2e/paths/05-ticket/16_summary.spec.js
diff --git a/e2e/paths/06-claim-module/01_basic_data.spec.js b/e2e/paths/06-claim/01_basic_data.spec.js
similarity index 100%
rename from e2e/paths/06-claim-module/01_basic_data.spec.js
rename to e2e/paths/06-claim/01_basic_data.spec.js
diff --git a/e2e/paths/06-claim-module/02_development.spec.js b/e2e/paths/06-claim/02_development.spec.js
similarity index 99%
rename from e2e/paths/06-claim-module/02_development.spec.js
rename to e2e/paths/06-claim/02_development.spec.js
index 351dee50f..346f88581 100644
--- a/e2e/paths/06-claim-module/02_development.spec.js
+++ b/e2e/paths/06-claim/02_development.spec.js
@@ -29,7 +29,7 @@ describe('Claim development', () => {
         const result = await page.waitForLastSnackbar();
 
         expect(result).toEqual('Data saved!');
-    }, 15000);
+    });
 
     it(`should redirect to the next section of claims as the role is salesAssistant`, async() => {
         let url = await page.expectURL('/action');
diff --git a/e2e/paths/06-claim-module/03_detail.spec.js b/e2e/paths/06-claim/03_detail.spec.js
similarity index 100%
rename from e2e/paths/06-claim-module/03_detail.spec.js
rename to e2e/paths/06-claim/03_detail.spec.js
diff --git a/e2e/paths/06-claim-module/04_claim_action.spec.js b/e2e/paths/06-claim/04_claim_action.spec.js
similarity index 100%
rename from e2e/paths/06-claim-module/04_claim_action.spec.js
rename to e2e/paths/06-claim/04_claim_action.spec.js
diff --git a/e2e/paths/06-claim-module/05_summary.spec.js b/e2e/paths/06-claim/05_summary.spec.js
similarity index 100%
rename from e2e/paths/06-claim-module/05_summary.spec.js
rename to e2e/paths/06-claim/05_summary.spec.js
diff --git a/e2e/paths/06-claim-module/06_descriptor.spec.js b/e2e/paths/06-claim/06_descriptor.spec.js
similarity index 98%
rename from e2e/paths/06-claim-module/06_descriptor.spec.js
rename to e2e/paths/06-claim/06_descriptor.spec.js
index 8e6b3fd05..104f63945 100644
--- a/e2e/paths/06-claim-module/06_descriptor.spec.js
+++ b/e2e/paths/06-claim/06_descriptor.spec.js
@@ -24,7 +24,6 @@ describe('claim Descriptor path', () => {
     });
 
     it(`should not be able to see the delete claim button of the descriptor more menu`, async() => {
-        await page.waitForContentLoaded();
         await page.waitToClick(selectors.claimDescriptor.moreMenu);
         await page.waitForSelector(selectors.claimDescriptor.moreMenuDeleteClaim, {hidden: true});
     });
diff --git a/e2e/paths/07-order-module/01_edit_basic_data.spec.js b/e2e/paths/07-order/01_edit_basic_data.spec.js
similarity index 97%
rename from e2e/paths/07-order-module/01_edit_basic_data.spec.js
rename to e2e/paths/07-order/01_edit_basic_data.spec.js
index 2cbee95f7..768985628 100644
--- a/e2e/paths/07-order-module/01_edit_basic_data.spec.js
+++ b/e2e/paths/07-order/01_edit_basic_data.spec.js
@@ -27,7 +27,7 @@ describe('Order edit basic data path', () => {
             const result = await page.waitForLastSnackbar();
 
             expect(result).toEqual(`You can't make changes on the basic data of an confirmed order or with rows`);
-        }, 15000);
+        });
     });
 
     describe('when order with rows', () => {
@@ -39,7 +39,6 @@ describe('Order edit basic data path', () => {
             await page.waitForContentLoaded();
             await page.accessToSearchResult(orderId);
             await page.accessToSection('order.card.basicData');
-            await page.waitForContentLoaded();
             await page.waitForSelector(selectors.orderBasicData.observation, {visible: true});
             let url = await page.expectURL(`#!/order/${orderId}/basic-data`);
 
@@ -47,7 +46,6 @@ describe('Order edit basic data path', () => {
         });
 
         it('should not be able to change anything', async() => {
-            await page.waitForContentLoaded();
             await page.write(selectors.orderBasicData.observation, 'observation');
             await page.waitToClick(selectors.orderBasicData.saveButton);
             const result = await page.waitForLastSnackbar();
diff --git a/e2e/paths/07-order-module/02_catalog.spec.js b/e2e/paths/07-order/02_catalog.spec.js
similarity index 97%
rename from e2e/paths/07-order-module/02_catalog.spec.js
rename to e2e/paths/07-order/02_catalog.spec.js
index d67dd3c92..ca6489779 100644
--- a/e2e/paths/07-order-module/02_catalog.spec.js
+++ b/e2e/paths/07-order/02_catalog.spec.js
@@ -35,9 +35,7 @@ describe('Order catalog', () => {
     });
 
     it('should add the realm and type filters and obtain results', async() => {
-        await page.waitForContentLoaded();
         await page.waitToClick(selectors.orderCatalog.plantRealmButton);
-        await page.waitForContentLoaded();
         await page.autocompleteSearch(selectors.orderCatalog.type, 'Anthurium');
         await page.waitForNumberOfElements('section.product', 4);
         const result = await page.countElement('section.product');
diff --git a/e2e/paths/07-order-module/03_lines.spec.js b/e2e/paths/07-order/03_lines.spec.js
similarity index 100%
rename from e2e/paths/07-order-module/03_lines.spec.js
rename to e2e/paths/07-order/03_lines.spec.js
diff --git a/e2e/paths/08-route-module/01_create.spec.js b/e2e/paths/08-route/01_create.spec.js
similarity index 100%
rename from e2e/paths/08-route-module/01_create.spec.js
rename to e2e/paths/08-route/01_create.spec.js
diff --git a/e2e/paths/08-route-module/02_basic_data.spec.js b/e2e/paths/08-route/02_basic_data.spec.js
similarity index 99%
rename from e2e/paths/08-route-module/02_basic_data.spec.js
rename to e2e/paths/08-route/02_basic_data.spec.js
index 7828b3827..91688b3ff 100644
--- a/e2e/paths/08-route-module/02_basic_data.spec.js
+++ b/e2e/paths/08-route/02_basic_data.spec.js
@@ -31,7 +31,7 @@ describe('Route basic Data path', () => {
         const result = await page.waitForLastSnackbar();
 
         expect(result).toEqual('Data saved!');
-    }, 15000);
+    });
 
     it('should confirm the worker was edited', async() => {
         await page.reloadSection('route.card.basicData');
diff --git a/e2e/paths/08-route-module/03_tickets.spec.js b/e2e/paths/08-route/03_tickets.spec.js
similarity index 100%
rename from e2e/paths/08-route-module/03_tickets.spec.js
rename to e2e/paths/08-route/03_tickets.spec.js
diff --git a/e2e/paths/09-invoice-out-module/01_summary.spec.js b/e2e/paths/09-invoice-out/01_summary.spec.js
similarity index 97%
rename from e2e/paths/09-invoice-out-module/01_summary.spec.js
rename to e2e/paths/09-invoice-out/01_summary.spec.js
index c67fc547e..126c745d3 100644
--- a/e2e/paths/09-invoice-out-module/01_summary.spec.js
+++ b/e2e/paths/09-invoice-out/01_summary.spec.js
@@ -23,7 +23,6 @@ describe('InvoiceOut summary path', () => {
     });
 
     it('should contain the company from which the invoice is emited', async() => {
-        await page.waitForContentLoaded();
         const result = await page.waitToGetProperty(selectors.invoiceOutSummary.company, 'innerText');
 
         expect(result).toEqual('Company VNL');
diff --git a/e2e/paths/09-invoice-out-module/02_descriptor.spec.js b/e2e/paths/09-invoice-out/02_descriptor.spec.js
similarity index 98%
rename from e2e/paths/09-invoice-out-module/02_descriptor.spec.js
rename to e2e/paths/09-invoice-out/02_descriptor.spec.js
index a51ae9d8f..e70c39ded 100644
--- a/e2e/paths/09-invoice-out-module/02_descriptor.spec.js
+++ b/e2e/paths/09-invoice-out/02_descriptor.spec.js
@@ -37,7 +37,6 @@ describe('InvoiceOut descriptor path', () => {
         });
 
         it('should search for the target invoiceOut', async() => {
-            await page.waitForContentLoaded();
             await page.write(selectors.invoiceOutIndex.topbarSearch, 'T2222222');
             await page.waitToClick(selectors.invoiceOutIndex.searchButton);
             await page.waitForNumberOfElements(selectors.invoiceOutIndex.searchResult, 1);
@@ -108,7 +107,6 @@ describe('InvoiceOut descriptor path', () => {
         });
 
         it(`should search and access to the invoiceOut summary`, async() => {
-            await page.waitForContentLoaded();
             await page.accessToSearchResult('T1111111');
             let url = await page.expectURL('/summary');
 
diff --git a/e2e/paths/10-travel/01_thermograph.spec.js b/e2e/paths/10-travel/01_thermograph.spec.js
new file mode 100644
index 000000000..efa2295a6
--- /dev/null
+++ b/e2e/paths/10-travel/01_thermograph.spec.js
@@ -0,0 +1,52 @@
+import selectors from '../../helpers/selectors.js';
+import getBrowser from '../../helpers/puppeteer';
+
+describe('Travel thermograph path', () => {
+    let browser;
+    let page;
+
+    beforeAll(async() => {
+        browser = await getBrowser();
+        page = browser.page;
+        await page.loginAndModule('buyer', 'travel');
+        await page.accessToSearchResult('3');
+        await page.accessToSection('travel.card.thermograph.index');
+    });
+
+    afterAll(async() => {
+        await browser.close();
+    });
+
+    it('should reach the thermograph section', async() => {
+        const result = await page.expectURL('/thermograph/index');
+
+        expect(result).toBe(true);
+    });
+
+    it('should click the add thermograph floating button', async() => {
+        await page.waitToClick(selectors.travelThermograph.add);
+        const result = await page.expectURL('/thermograph/create');
+
+        expect(result).toBe(true);
+    });
+
+    it('should select the thermograph and then the file to upload', async() => {
+        let currentDir = process.cwd();
+        let filePath = `${currentDir}/e2e/dms/ecc/3.jpeg`;
+        await page.autocompleteSearch(selectors.travelThermograph.thermographID, '138350-0');
+
+        const [fileChooser] = await Promise.all([
+            page.waitForFileChooser(),
+            page.waitToClick(selectors.travelThermograph.uploadIcon)
+        ]);
+        await fileChooser.accept([filePath]);
+
+        await page.waitToClick(selectors.travelThermograph.upload);
+    });
+
+    it('should reload the section and check everything was saved', async() => {
+        let createdThermograph = await page.waitToGetProperty(selectors.travelThermograph.createdThermograph, 'innerText');
+
+        expect(createdThermograph).toContain('138350-0');
+    });
+});
diff --git a/gulpfile.js b/gulpfile.js
index 853fcf2d4..eb421ba9b 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -174,12 +174,13 @@ function e2eSingleRun() {
         `${__dirname}/e2e/paths/07*/*[sS]pec.js`,
         `${__dirname}/e2e/paths/08*/*[sS]pec.js`,
         `${__dirname}/e2e/paths/09*/*[sS]pec.js`,
+        `${__dirname}/e2e/paths/10*/*[sS]pec.js`,
         `${__dirname}/e2e/paths/**/*[sS]pec.js`
     ];
 
     return gulp.src(specFiles).pipe(jasmine({
         errorOnFail: false,
-        timeout: 10000,
+        timeout: 30000,
         reporter: [
             new SpecReporter({
                 spec: {

From 752621fbf698718475ae9e76f0ee1194ac73249b Mon Sep 17 00:00:00 2001
From: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
Date: Wed, 12 Feb 2020 07:31:46 +0100
Subject: [PATCH 04/11] removed unused timout arg

---
 e2e/paths/02-client/02_edit_basic_data.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e/paths/02-client/02_edit_basic_data.spec.js b/e2e/paths/02-client/02_edit_basic_data.spec.js
index 9373dfe86..6ae512542 100644
--- a/e2e/paths/02-client/02_edit_basic_data.spec.js
+++ b/e2e/paths/02-client/02_edit_basic_data.spec.js
@@ -74,7 +74,7 @@ describe('Client Edit basicData path', () => {
             await page.loginAndModule('salesASsistant', 'client');
             await page.accessToSearchResult('Ptonomy Wallace');
             await page.accessToSection('client.card.basicData');
-        }, 30000);
+        });
 
         it('should be able to change the salesPerson', async() => {
             await page.waitForSelector(selectors.clientBasicData.name);

From e0f7b917d75d59eded4b2879cab7bf326d053f74 Mon Sep 17 00:00:00 2001
From: Bernat Exposito Domenech <bernat.verdnatura@gmail.com>
Date: Wed, 12 Feb 2020 10:39:46 +0100
Subject: [PATCH 05/11] db test ticket_recalcComponent

---
 db/dump/fixtures.sql                          | 22 +++----
 db/tests/vn/ticket_recalcComponents.spec.js   | 62 +++++++++++++++++++
 .../ticket/specs/priceDifference.spec.js      |  4 +-
 3 files changed, 75 insertions(+), 13 deletions(-)
 create mode 100644 db/tests/vn/ticket_recalcComponents.spec.js

diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index 7b7651a9d..0b9c21780 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -753,7 +753,7 @@ INSERT INTO `vn`.`sale`(`id`, `itemFk`, `ticketFk`, `concept`, `quantity`, `pric
         (7,  2, 11, 'Melee weapon combat fist 15cm',    15, 7.44,   0, 0, 0, CURDATE()),
         (8,  4, 11, 'Melee weapon heavy shield 1x0.5m', 10, 1.79,   0, 0, 0, CURDATE()),
         (9,  1, 16, 'Ranged weapon longbow 2m',         1,  103.49, 0, 0, 0, CURDATE()),
-        (10, 2, 16, 'Melee weapon combat fist 15cm',    10, 7.08,   0, 0, 0, CURDATE()),
+        (10, 2, 16, 'Melee weapon combat fist 15cm',    10, 7.09,   0, 0, 0, CURDATE()),
         (11, 1, 16, 'Ranged weapon longbow 2m',         1,  103.49, 0, 0, 0, CURDATE()),
         (12, 4, 16, 'Melee weapon heavy shield 1x0.5m', 20, 1.71,   0, 0, 0, CURDATE()),
         (13, 2, 8,  'Melee weapon combat fist 15cm',    10, 7.08,   0, 0, 0, CURDATE()),
@@ -814,25 +814,25 @@ INSERT INTO `vn`.`saleComponent`(`saleFk`, `componentFk`, `value`)
         (8,     28, 1.25),
         (8,     29, 0.42),
         (8,     39, 0.017),
+
         (9,     15, 3.0949),
         (9,     21, 0.001),
-        (9,     28, 50),
-        (9,     29, 49.4), 
+        (9,     28, 53),
+        (9,     29, 46.4), 
         (9,     39, 0.994), 
-        (10,    15, 0.0111),
-        (10,    21, -0.001),
-        (10,    28, 5),
-        (10,    29, 2),
+        (10,    15, 0.0199),
+        (10,    28, 7),
+        (10,    29, 0),
         (10,    39, 0.07),
         (11,    15, 3.0949),
         (11,    21, 0.001),
-        (11,    28, 50),
-        (11,    29, 49.4),
+        (11,    28, 53),
+        (11,    29, 46.4),
         (11,    39, 0.994),
         (12,    15, 0.0199),
         (12,    21, 0.003),
-        (12,    28, 1.25),
-        (12,    29, 0.42),
+        (12,    28, 2.25),
+        (12,    29, -0.58),
         (12,    39, 0.017),
         (13,    15, 0.114),
         (13,    28, 5),
diff --git a/db/tests/vn/ticket_recalcComponents.spec.js b/db/tests/vn/ticket_recalcComponents.spec.js
new file mode 100644
index 000000000..e140db34c
--- /dev/null
+++ b/db/tests/vn/ticket_recalcComponents.spec.js
@@ -0,0 +1,62 @@
+const app = require('vn-loopback/server/server');
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+
+describe('ticket_recalcComponents()', () => {
+    it('should recalculate the components in a ticket and check it', async() => {
+        let stmts = [];
+        let stmt;
+        const ticketId = 11;
+
+        stmts.push('START TRANSACTION');
+
+        let sales = await app.models.Sale.find({where: {ticketFk: ticketId}});
+
+        stmt = new ParameterizedSQL('UPDATE vn.sale SET price=100 WHERE id IN(?,?)', [
+            sales[0].id,
+            sales[1].id
+        ]);
+        stmts.push(stmt);
+
+        stmt = new ParameterizedSQL('SELECT * FROM vn.sale WHERE ticketFk = ?', [
+            ticketId
+        ]);
+        stmts.push(stmt);
+
+        let modifiedSales = stmts.push(stmt) - 1;
+
+        stmt = new ParameterizedSQL('CALL vn.ticket_recalcComponents(?)', [
+            ticketId,
+        ]);
+        stmts.push(stmt);
+
+        stmt = new ParameterizedSQL('SELECT * FROM vn.sale WHERE ticketFk = ?', [
+            ticketId
+        ]);
+        stmts.push(stmt);
+
+        let expectedSales = stmts.push(stmt) - 1;
+
+        stmts.push('ROLLBACK');
+
+        let sql = ParameterizedSQL.join(stmts, ';');
+        let result = await app.models.Ticket.rawStmt(sql);
+
+        // original data
+        const firstPrice = sales[0].price;
+        const secondPrice = sales[1].price;
+
+        // alteratons for test purposes
+        const modifiedFirstPrice = result[modifiedSales][0].price;
+        const modifiedSecondPrice = result[modifiedSales][1].price;
+
+        // expected data after recalc
+        const expectedSalesFirstPrice = result[expectedSales][0].price;
+        const expectedSalesSecondPrice = result[expectedSales][1].price;
+
+        expect(firstPrice).not.toEqual(modifiedFirstPrice);
+        expect(secondPrice).not.toEqual(modifiedSecondPrice);
+
+        expect(firstPrice).toEqual(expectedSalesFirstPrice);
+        expect(secondPrice).toEqual(expectedSalesSecondPrice);
+    });
+});
diff --git a/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js b/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js
index 61060c9a2..bf61524c7 100644
--- a/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js
@@ -17,8 +17,8 @@ describe('sale priceDifference()', () => {
         let result = await app.models.Ticket.priceDifference(httpCtx, ticketId, landed,
             addressId, agencyModeId, zoneId, warehouseId);
 
-        expect(result.totalUnitPrice).toEqual(215.77);
-        expect(result.totalNewPrice).toEqual(215.77);
+        expect(result.totalUnitPrice).toEqual(215.78);
+        expect(result.totalNewPrice).toEqual(215.78);
         expect(result.totalDifference).toEqual(0);
     });
 

From 2be5e04a39e7660a7e31bc12d3605a9a10d4fe36 Mon Sep 17 00:00:00 2001
From: Bernat Exposito Domenech <bernat.verdnatura@gmail.com>
Date: Wed, 12 Feb 2020 13:20:08 +0100
Subject: [PATCH 06/11] changed title in report driver-route

---
 print/templates/reports/driver-route/driver-route.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/print/templates/reports/driver-route/driver-route.html b/print/templates/reports/driver-route/driver-route.html
index bfeba3b8a..6d3b840df 100644
--- a/print/templates/reports/driver-route/driver-route.html
+++ b/print/templates/reports/driver-route/driver-route.html
@@ -14,7 +14,7 @@
                         <!-- Block -->
                         <div class="grid-row">
                             <div class="grid-block">
-                                <h1 class="title uppercase">{{$t('title')}}</h1>
+                                <h1 class="title uppercase">{{route.id}}</h1>
                                 <div class="panel">
                                     <div class="header">{{$t('information')}}</div>
                                     <div class="body">

From e8a178d5f407d53448f1e29c14d32a9e804c822d Mon Sep 17 00:00:00 2001
From: Carlos Jimenez Ruiz <jacarlosjimenezruiz@gmail.com>
Date: Wed, 12 Feb 2020 14:36:05 +0100
Subject: [PATCH 07/11] #2006 e2e route.summary plus refactors

---
 db/dump/fixtures.sql                          | 26 ++++----
 e2e/helpers/extensions.js                     | 23 +++----
 e2e/helpers/puppeteer.js                      | 12 ++++
 e2e/helpers/selectors.js                      |  8 ++-
 e2e/paths/02-client/14_balance.spec.js        |  2 +-
 e2e/paths/02-client/17_dms.spec.js            |  2 +-
 e2e/paths/04-item/01_summary.spec.js          |  7 +--
 e2e/paths/04-item/09_regularize.spec.js       |  3 +-
 e2e/paths/06-claim/05_summary.spec.js         |  6 +-
 e2e/paths/08-route/01_summary.spec.js         | 61 +++++++++++++++++++
 .../{01_create.spec.js => 03_create.spec.js}  |  1 -
 ...{03_tickets.spec.js => 04_tickets.spec.js} |  0
 front/core/module.js                          |  2 +-
 modules/route/front/summary/index.html        |  4 +-
 14 files changed, 111 insertions(+), 46 deletions(-)
 create mode 100644 e2e/paths/08-route/01_summary.spec.js
 rename e2e/paths/08-route/{01_create.spec.js => 03_create.spec.js} (98%)
 rename e2e/paths/08-route/{03_tickets.spec.js => 04_tickets.spec.js} (100%)

diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index 7b7651a9d..ef913eb21 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -35,7 +35,7 @@ INSERT INTO `vn`.`packagingConfig`(`upperGap`)
 UPDATE `account`.`role` SET id = 100 WHERE id = 0;
 
 INSERT INTO `account`.`user`(`id`,`name`, `nickname`, `password`,`role`,`active`,`email`, `lang`)
-    SELECT id, name, CONCAT(name, 'Nick'),MD5('nightmare'), id, 1, CONCAT(name, '@mydomain.com'), 'es'
+    SELECT id, name, CONCAT(name, 'Nick'),MD5('nightmare'), id, 1, CONCAT(name, '@mydomain.com'), 'EN'
         FROM `account`.`role` WHERE id <> 20
             ORDER BY id;
 
@@ -55,18 +55,18 @@ INSERT INTO `hedera`.`tpvConfig`(`id`, `currency`, `terminal`, `transactionType`
         
 INSERT INTO `account`.`user`(`id`,`name`,`nickname`, `password`,`role`,`active`,`email`,`lang`)
     VALUES 
-        (101, 'BruceWayne',         'Bruce Wayne',          'ac754a330530832ba1bf7687f577da91', 2, 1, 'BruceWayne@mydomain.com',         'es'),
-        (102, 'PetterParker',       'Petter Parker',        'ac754a330530832ba1bf7687f577da91', 2, 1, 'PetterParker@mydomain.com',       'en'),
-        (103, 'ClarkKent',          'Clark Kent',           'ac754a330530832ba1bf7687f577da91', 2, 1, 'ClarkKent@mydomain.com',          'fr'),
-        (104, 'TonyStark',          'Tony Stark',           'ac754a330530832ba1bf7687f577da91', 2, 1, 'TonyStark@mydomain.com',          'es'),
-        (105, 'MaxEisenhardt',      'Max Eisenhardt',       'ac754a330530832ba1bf7687f577da91', 2, 1, 'MaxEisenhardt@mydomain.com',      'pt'),
-        (106, 'DavidCharlesHaller', 'David Charles Haller', 'ac754a330530832ba1bf7687f577da91', 1, 1, 'DavidCharlesHaller@mydomain.com', 'es'),
-        (107, 'HankPym',            'Hank Pym',             'ac754a330530832ba1bf7687f577da91', 1, 1, 'HankPym@mydomain.com',            'es'),
-        (108, 'CharlesXavier',      'Charles Xavier',       'ac754a330530832ba1bf7687f577da91', 1, 1, 'CharlesXavier@mydomain.com',      'es'),
-        (109, 'BruceBanner',        'Bruce Banner',         'ac754a330530832ba1bf7687f577da91', 1, 1, 'BruceBanner@mydomain.com',        'es'),
-        (110, 'JessicaJones',       'Jessica Jones',        'ac754a330530832ba1bf7687f577da91', 1, 1, 'JessicaJones@mydomain.com',       'es'),
-        (111, 'Missing',            'Missing',              'ac754a330530832ba1bf7687f577da91', 2, 0, NULL,                              'es'),
-        (112, 'Trash',              'Trash',                'ac754a330530832ba1bf7687f577da91', 2, 0, NULL,                              'es');
+        (101, 'BruceWayne',         'Bruce Wayne',          'ac754a330530832ba1bf7687f577da91', 2, 1, 'BruceWayne@mydomain.com',         'ES'),
+        (102, 'PetterParker',       'Petter Parker',        'ac754a330530832ba1bf7687f577da91', 2, 1, 'PetterParker@mydomain.com',       'EN'),
+        (103, 'ClarkKent',          'Clark Kent',           'ac754a330530832ba1bf7687f577da91', 2, 1, 'ClarkKent@mydomain.com',          'FR'),
+        (104, 'TonyStark',          'Tony Stark',           'ac754a330530832ba1bf7687f577da91', 2, 1, 'TonyStark@mydomain.com',          'ES'),
+        (105, 'MaxEisenhardt',      'Max Eisenhardt',       'ac754a330530832ba1bf7687f577da91', 2, 1, 'MaxEisenhardt@mydomain.com',      'PT'),
+        (106, 'DavidCharlesHaller', 'David Charles Haller', 'ac754a330530832ba1bf7687f577da91', 1, 1, 'DavidCharlesHaller@mydomain.com', 'EN'),
+        (107, 'HankPym',            'Hank Pym',             'ac754a330530832ba1bf7687f577da91', 1, 1, 'HankPym@mydomain.com',            'EN'),
+        (108, 'CharlesXavier',      'Charles Xavier',       'ac754a330530832ba1bf7687f577da91', 1, 1, 'CharlesXavier@mydomain.com',      'EN'),
+        (109, 'BruceBanner',        'Bruce Banner',         'ac754a330530832ba1bf7687f577da91', 1, 1, 'BruceBanner@mydomain.com',        'EN'),
+        (110, 'JessicaJones',       'Jessica Jones',        'ac754a330530832ba1bf7687f577da91', 1, 1, 'JessicaJones@mydomain.com',       'EN'),
+        (111, 'Missing',            'Missing',              'ac754a330530832ba1bf7687f577da91', 2, 0, NULL,                              'EN'),
+        (112, 'Trash',              'Trash',                'ac754a330530832ba1bf7687f577da91', 2, 0, NULL,                              'EN');
 
 INSERT INTO `vn`.`worker`(`id`, `code`, `firstName`, `lastName`, `userFk`,`bossFk`, `phone`)
     VALUES
diff --git a/e2e/helpers/extensions.js b/e2e/helpers/extensions.js
index ea8f50626..816eea064 100644
--- a/e2e/helpers/extensions.js
+++ b/e2e/helpers/extensions.js
@@ -1,4 +1,3 @@
-/* eslint no-invalid-this: "off" */
 import {url as defaultURL} from './config';
 
 let actions = {
@@ -31,20 +30,6 @@ let actions = {
         }, selector);
     },
 
-    changeLanguageToEnglish: async function() {
-        let langSelector = '.user-popover vn-autocomplete[ng-model="$ctrl.lang"]';
-
-        await this.waitToClick('#user');
-        await this.waitForSelector(`${langSelector} input`, {});
-
-        let lang = await this.waitToGetProperty(langSelector, 'value');
-        if (lang !== 'English')
-            await this.autocompleteSearch(langSelector, 'English');
-
-        await this.keyboard.press('Escape');
-        await this.waitForSelector(langSelector, {hidden: true});
-    },
-
     doLogin: async function(userName, password = 'nightmare') {
         await this.waitForSelector(`vn-login vn-textfield[ng-model="$ctrl.user"]`, {visible: true});
         await this.clearInput(`vn-login vn-textfield[ng-model="$ctrl.user"]`);
@@ -70,7 +55,6 @@ let actions = {
         await this.waitForFunction(() => {
             return document.location.hash === '#!/';
         }, {});
-        await this.changeLanguageToEnglish();
     },
 
     selectModule: async function(moduleName) {
@@ -534,6 +518,13 @@ let actions = {
         }, selector);
     },
 
+    closePopup: async function(selector) {
+        await Promise.all([
+            this.keyboard.press('Escape'),
+            this.waitForSelector('.vn-popup', {hidden: true}),
+        ]);
+    },
+
     waitForContentLoaded: async function() {
         await this.waitFor(1000);
         // to be implemented in base of a directive loaded once al modules are done loading, further investigation required.
diff --git a/e2e/helpers/puppeteer.js b/e2e/helpers/puppeteer.js
index 351a26669..ed05909d0 100644
--- a/e2e/helpers/puppeteer.js
+++ b/e2e/helpers/puppeteer.js
@@ -15,6 +15,18 @@ export async function getBrowser() {
         slowMo: 0, // slow down by ms
     });
     let page = (await browser.pages())[0];
+    await page.evaluateOnNewDocument(() => {
+        Object.defineProperty(navigator, 'language', {
+            get: function() {
+                return 'en';
+            }
+        });
+        Object.defineProperty(navigator, 'languages', {
+            get: function() {
+                return ['en'];
+            }
+        });
+    });
     page = extendPage(page);
     page.setDefaultTimeout(5000);
     await page.goto(defaultURL, {waitUntil: 'networkidle0'});
diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index ed232ef3b..564745752 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -643,7 +643,13 @@ export default {
         volume: 'vn-route-descriptor vn-label-value[label="Volume"] > section > span'
     },
     routeSummary: {
-        routeId: 'vn-route-summary > vn-card > vn-horizontal > vn-one:nth-child(1) > vn-label-value:nth-child(1) > section > span'
+        header: 'vn-route-summary > vn-card > h5',
+        routeId: 'vn-route-summary > vn-card > vn-horizontal > vn-one:nth-child(1) > vn-label-value:nth-child(1) > section > span',
+        cost: 'vn-route-summary vn-label-value[label="Cost"]',
+        firstTicketID: 'vn-route-summary vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(2) > span',
+        firstTicketDescriptor: '.vn-popover.shown vn-ticket-descriptor',
+        firstAlias: 'vn-route-summary vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(3) > span',
+        firstClientDescriptor: '.vn-popover.shown vn-client-descriptor',
     },
     routeBasicData: {
         worker: 'vn-route-basic-data vn-autocomplete[ng-model="$ctrl.route.workerFk"]',
diff --git a/e2e/paths/02-client/14_balance.spec.js b/e2e/paths/02-client/14_balance.spec.js
index 52d179383..f45937deb 100644
--- a/e2e/paths/02-client/14_balance.spec.js
+++ b/e2e/paths/02-client/14_balance.spec.js
@@ -39,7 +39,7 @@ describe('Client balance path', () => {
     });
 
     it('should click the new payment button', async() => {
-        await page.keyboard.press('Escape');
+        await page.closePopup();
         await page.reloadSection('client.card.balance.index');
         let url = await page.expectURL('/balance');
 
diff --git a/e2e/paths/02-client/17_dms.spec.js b/e2e/paths/02-client/17_dms.spec.js
index 01a197c84..9891fd3f4 100644
--- a/e2e/paths/02-client/17_dms.spec.js
+++ b/e2e/paths/02-client/17_dms.spec.js
@@ -27,7 +27,7 @@ describe('Client DMS', () => {
 
         it(`should click on the first document line worker name making the descriptor visible`, async() => {
             await page.waitToClick(selectors.dms.firstDocWorker);
-            await page.wait(selectors.dms.firstDocWorkerDescriptor);
+            await page.waitForSelector(selectors.dms.firstDocWorkerDescriptor);
             const visible = await page.isVisible(selectors.dms.firstDocWorkerDescriptor);
 
             expect(visible).toBeTruthy();
diff --git a/e2e/paths/04-item/01_summary.spec.js b/e2e/paths/04-item/01_summary.spec.js
index 0196e0930..97fef9ca9 100644
--- a/e2e/paths/04-item/01_summary.spec.js
+++ b/e2e/paths/04-item/01_summary.spec.js
@@ -68,9 +68,8 @@ describe('Item summary path', () => {
     });
 
     it(`should close the summary popup`, async() => {
-        await page.keyboard.press('Escape');
-        await page.waitUntilNotPresent(selectors.itemSummary.basicData);
-        await page.waitFor(selectors.itemSummary.basicData, {hidden: true});
+        await page.closePopup();
+        await page.waitForSelector(selectors.itemSummary.basicData, {hidden: true});
     });
 
     it('should search for other item', async() => {
@@ -125,7 +124,7 @@ describe('Item summary path', () => {
     });
 
     it(`should now close the summary popup`, async() => {
-        await page.keyboard.press('Escape');
+        await page.closePopup();
         await page.waitForSelector(selectors.itemSummary.basicData, {hidden: true});
     });
 
diff --git a/e2e/paths/04-item/09_regularize.spec.js b/e2e/paths/04-item/09_regularize.spec.js
index e43429aa0..7f63694b9 100644
--- a/e2e/paths/04-item/09_regularize.spec.js
+++ b/e2e/paths/04-item/09_regularize.spec.js
@@ -27,8 +27,7 @@ describe('Item regularize path', () => {
         const userLocalWarehouse = await page
             .waitToGetProperty(selectors.globalItems.userLocalWarehouse, 'value');
 
-        await page.keyboard.press('Escape');
-        await page.waitForSelector('.user-popover.vn-popover', {hidden: true});
+        await page.closePopup();
 
         expect(userLocalWarehouse).toContain('Warehouse Four');
     });
diff --git a/e2e/paths/06-claim/05_summary.spec.js b/e2e/paths/06-claim/05_summary.spec.js
index a9d97533c..9dab65954 100644
--- a/e2e/paths/06-claim/05_summary.spec.js
+++ b/e2e/paths/06-claim/05_summary.spec.js
@@ -60,8 +60,7 @@ describe('claim Summary path', () => {
     it(`should check the url for the item diary link of the descriptor is for the right item id`, async() => {
         await page.waitForSelector(selectors.claimSummary.itemDescriptorPopoverItemDiaryButton, {visible: true});
 
-        await page.keyboard.press('Escape');
-        await page.waitFor(1000);
+        await page.closePopup();
     });
 
     it('should display the claim development details', async() => {
@@ -81,8 +80,7 @@ describe('claim Summary path', () => {
     it(`should check the url for the go to clientlink of the descriptor is for the right client id`, async() => {
         await page.waitForSelector(selectors.claimSummary.firstDevelopmentWorkerGoToClientButton, {visible: true});
 
-        await page.keyboard.press('Escape');
-        await page.waitFor(1000);
+        await page.closePopup();
     });
 
     it(`should click on the first action ticket ID making the ticket descriptor visible`, async() => {
diff --git a/e2e/paths/08-route/01_summary.spec.js b/e2e/paths/08-route/01_summary.spec.js
new file mode 100644
index 000000000..c062b9b08
--- /dev/null
+++ b/e2e/paths/08-route/01_summary.spec.js
@@ -0,0 +1,61 @@
+import selectors from '../../helpers/selectors.js';
+import getBrowser from '../../helpers/puppeteer';
+
+describe('Route summary path', () => {
+    let browser;
+    let page;
+
+    beforeAll(async() => {
+        browser = await getBrowser();
+        page = browser.page;
+        await page.loginAndModule('employee', 'route');
+        await page.waitToClick('vn-route-index vn-tbody > a:nth-child(1)');
+    });
+
+    afterAll(async() => {
+        await browser.close();
+    });
+
+    it('should reach the first route summary section', async() => {
+        let url = await page.expectURL('#!/route/1/summary');
+
+        expect(url).toBe(true);
+    });
+
+    it(`should display details from the route on the header`, async() => {
+        await page.waitForTextInElement(selectors.routeSummary.header, 'first route');
+        const result = await page.waitToGetProperty(selectors.routeSummary.header, 'innerText');
+
+        expect(result).toContain('first route');
+    });
+
+    it('should display some route details like the cost', async() => {
+        const result = await page.waitToGetProperty(selectors.routeSummary.cost, 'innerText');
+
+        expect(result).toContain('€10.00');
+    });
+
+    it('should click on the first ticket ID making the descriptor popover visible', async() => {
+        await page.waitToClick(selectors.routeSummary.firstTicketID);
+        await page.waitForSelector(selectors.routeSummary.firstTicketDescriptor);
+        const visible = await page.isVisible(selectors.routeSummary.firstTicketDescriptor);
+
+        expect(visible).toBe(true);
+    });
+
+    it('should close the ticket descriptor', async() => {
+        await page.closePopup();
+    });
+
+    it('should click on the first alias making the client descriptor popover visible', async() => {
+        await page.waitToClick(selectors.routeSummary.firstAlias);
+        await page.waitForSelector(selectors.routeSummary.firstClientDescriptor);
+        const visible = await page.isVisible(selectors.routeSummary.firstClientDescriptor);
+
+        expect(visible).toBe(true);
+    });
+
+    it('should close the client descriptor', async() => {
+        await page.closePopup();
+    });
+});
diff --git a/e2e/paths/08-route/01_create.spec.js b/e2e/paths/08-route/03_create.spec.js
similarity index 98%
rename from e2e/paths/08-route/01_create.spec.js
rename to e2e/paths/08-route/03_create.spec.js
index 14d5273b3..11ffd500b 100644
--- a/e2e/paths/08-route/01_create.spec.js
+++ b/e2e/paths/08-route/03_create.spec.js
@@ -37,7 +37,6 @@ describe('Route create path', () => {
         beforeAll(async() => {
             await page.login('delivery');
             await page.selectModule('route');
-            await page.changeLanguageToEnglish();
         });
 
         it('should again click on the add new route button and open the creation form', async() => {
diff --git a/e2e/paths/08-route/03_tickets.spec.js b/e2e/paths/08-route/04_tickets.spec.js
similarity index 100%
rename from e2e/paths/08-route/03_tickets.spec.js
rename to e2e/paths/08-route/04_tickets.spec.js
diff --git a/front/core/module.js b/front/core/module.js
index 0c52fd565..82a954892 100644
--- a/front/core/module.js
+++ b/front/core/module.js
@@ -80,7 +80,7 @@ export function config($translateProvider, $translatePartialLoaderProvider, $ani
     let langs = ['en', 'es'];
     let langAliases = {
         en_US: 'en',
-        en_UK: 'en',
+        en_GB: 'en',
         es_ES: 'es',
         es_AR: 'es'
     };
diff --git a/modules/route/front/summary/index.html b/modules/route/front/summary/index.html
index 0ec6c47fe..527f7fe96 100644
--- a/modules/route/front/summary/index.html
+++ b/modules/route/front/summary/index.html
@@ -84,8 +84,8 @@
                         <vn-td number shrink>{{ticket.packages}}</vn-td>
                         <vn-td shrink>{{ticket.volume}}</vn-td>
                         <vn-td shrink>{{ticket.warehouse.name}}</vn-td>
-                        <vn-td shrink>{{ticket.client.postcode}}</vn-td>
-                        <vn-td expand title="{{ticket.client.street}}">{{ticket.client.street}}</vn-td>
+                        <vn-td shrink>{{ticket.address.postalCode}}</vn-td>
+                        <vn-td expand title="{{ticket.address.street}}">{{ticket.address.street}}</vn-td>
                         <vn-td shrink> 
                             <vn-icon
                                 ng-if="ticket.notes.length"

From 4abf87552dd7dc9a8db05e716740c8a118beb595 Mon Sep 17 00:00:00 2001
From: Bernat Exposito Domenech <bernat.verdnatura@gmail.com>
Date: Wed, 12 Feb 2020 14:38:51 +0100
Subject: [PATCH 08/11] db production exported

---
 .../10121-zoneClosure/00-zoneClosure.sql      |    5 -
 .../00-zoneClosure_recalc.sql                 |   50 -
 .../10121-zoneClosure/00-zoneConfig.sql       |   11 -
 .../00-catalog_componentCalculate.sql         |  254 --
 db/changes/10130-christmas/00-chatConfig.sql  |    5 -
 .../10130-christmas/00-greugeConfig.sql       |    6 -
 .../00-manaSpellersRequery.sql                |   70 -
 .../00-timeControl_calculate.sql              |   44 -
 db/changes/10140-kings/00-ACL.sql             |    3 -
 db/changes/10140-kings/00-buy_afterUpsert.sql |   81 -
 .../10140-kings/00-clientRisk_update.sql      |   18 -
 db/changes/10140-kings/00-componentType.sql   |    3 -
 .../10140-kings/00-customer_risk_update.sql   |   12 -
 db/changes/10140-kings/00-department.sql      |    2 -
 .../00-ticketComponentUpdateSale.sql          |  155 --
 .../10140-kings/00-travelThermograph.sql      |    7 -
 .../10140-kings/00-triggerInvoiceOut.sql      |   27 -
 db/changes/10140-kings/00-triggerReceipt.sql  |   20 -
 .../10140-kings/00-weekWaste_getDetail.sql    |   29 -
 .../10140-kings/00-worker_isWorking.sql       |   32 -
 .../10140-kings/01-order_confirmWithUser.sql  |  240 --
 .../10140-kings/01-tarifaComponentSerie.sql   |   12 -
 db/dump/dumpedFixtures.sql                    |   32 +-
 db/dump/structure.sql                         | 2347 +++++++++++------
 .../specs/activeWorkersWithRole.spec.js       |    2 +-
 .../methods/client/specs/listWorkers.spec.js  |    2 +-
 26 files changed, 1535 insertions(+), 1934 deletions(-)
 delete mode 100644 db/changes/10121-zoneClosure/00-zoneClosure.sql
 delete mode 100644 db/changes/10121-zoneClosure/00-zoneClosure_recalc.sql
 delete mode 100644 db/changes/10121-zoneClosure/00-zoneConfig.sql
 delete mode 100644 db/changes/10130-christmas/00-catalog_componentCalculate.sql
 delete mode 100644 db/changes/10130-christmas/00-chatConfig.sql
 delete mode 100644 db/changes/10130-christmas/00-greugeConfig.sql
 delete mode 100644 db/changes/10130-christmas/00-manaSpellersRequery.sql
 delete mode 100644 db/changes/10130-christmas/00-timeControl_calculate.sql
 delete mode 100644 db/changes/10140-kings/00-ACL.sql
 delete mode 100644 db/changes/10140-kings/00-buy_afterUpsert.sql
 delete mode 100644 db/changes/10140-kings/00-clientRisk_update.sql
 delete mode 100644 db/changes/10140-kings/00-componentType.sql
 delete mode 100644 db/changes/10140-kings/00-customer_risk_update.sql
 delete mode 100644 db/changes/10140-kings/00-department.sql
 delete mode 100644 db/changes/10140-kings/00-ticketComponentUpdateSale.sql
 delete mode 100644 db/changes/10140-kings/00-travelThermograph.sql
 delete mode 100644 db/changes/10140-kings/00-triggerInvoiceOut.sql
 delete mode 100644 db/changes/10140-kings/00-triggerReceipt.sql
 delete mode 100644 db/changes/10140-kings/00-weekWaste_getDetail.sql
 delete mode 100644 db/changes/10140-kings/00-worker_isWorking.sql
 delete mode 100644 db/changes/10140-kings/01-order_confirmWithUser.sql
 delete mode 100644 db/changes/10140-kings/01-tarifaComponentSerie.sql

diff --git a/db/changes/10121-zoneClosure/00-zoneClosure.sql b/db/changes/10121-zoneClosure/00-zoneClosure.sql
deleted file mode 100644
index 07db5b167..000000000
--- a/db/changes/10121-zoneClosure/00-zoneClosure.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-CREATE TABLE `vn`.`zoneClosure` (
-  `zoneFk` INT NOT NULL,
-  `dated` DATE NOT NULL,
-  `hour` TIME NOT NULL,
-  PRIMARY KEY (`zoneFk`, `dated`));
diff --git a/db/changes/10121-zoneClosure/00-zoneClosure_recalc.sql b/db/changes/10121-zoneClosure/00-zoneClosure_recalc.sql
deleted file mode 100644
index cb313cdec..000000000
--- a/db/changes/10121-zoneClosure/00-zoneClosure_recalc.sql
+++ /dev/null
@@ -1,50 +0,0 @@
-
-DROP procedure IF EXISTS vn.`zoneClosure_recalc`;
-
-DELIMITER $$
-CREATE DEFINER=`root`@`%` PROCEDURE vn.`zoneClosure_recalc`()
-proc: BEGIN
-/**
- * Recalculates the delivery time (hour) for every zone in days + scope in future
- */
-    DECLARE vScope INT;
-    DECLARE vCounter INT DEFAULT 0;
-    DECLARE vShipped DATE DEFAULT CURDATE();
-
-	DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
-    BEGIN
-		DO RELEASE_LOCK('vn.zoneClosure_recalc');
-        RESIGNAL;
-	END;
-
-	IF NOT GET_LOCK('vn.zoneClosure_recalc', 0) THEN
-		LEAVE proc;
-	END IF;
-
-	SELECT scope INTO vScope
-		FROM zoneConfig;
-        
-	DROP TEMPORARY TABLE IF EXISTS tmp.zone;
-    CREATE TEMPORARY TABLE tmp.zone
-		(INDEX (id))
-		ENGINE = MEMORY
-        SELECT id FROM zone;
-              
-	TRUNCATE TABLE zoneClosure;
-    
-    REPEAT
-		CALL zone_getOptionsForShipment(vShipped);
-		INSERT INTO zoneClosure(zoneFk, dated, `hour`)
-			SELECT zoneFk, vShipped, `hour` FROM tmp.zoneOption;
-		
-        SET vCounter = vCounter + 1;
-        SET vShipped = TIMESTAMPADD(DAY, 1, vShipped);
-	UNTIL vCounter > vScope
-    END REPEAT;
-    
-    DROP TEMPORARY TABLE tmp.zone;
-	DO RELEASE_LOCK('vn.zoneClosure_recalc');
-END$$
-
-DELIMITER ;
-
diff --git a/db/changes/10121-zoneClosure/00-zoneConfig.sql b/db/changes/10121-zoneClosure/00-zoneConfig.sql
deleted file mode 100644
index 915fb8894..000000000
--- a/db/changes/10121-zoneClosure/00-zoneConfig.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-CREATE TABLE `vn`.`zoneConfig` (
-  `id` INT UNSIGNED NOT NULL,
-  `scope` INT UNSIGNED NOT NULL,
-  PRIMARY KEY (`id`));
-
-ALTER TABLE `vn`.`zoneConfig` 
-CHANGE COLUMN `id` `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT ;
-
-INSERT INTO `vn`.`zoneConfig` (`scope`) VALUES ('1');
-
-INSERT INTO `bs`.`nightTask` (`order`, `schema`, `procedure`) VALUES ('100', 'vn', 'zoneClosure_recalc');
diff --git a/db/changes/10130-christmas/00-catalog_componentCalculate.sql b/db/changes/10130-christmas/00-catalog_componentCalculate.sql
deleted file mode 100644
index c778c7b3a..000000000
--- a/db/changes/10130-christmas/00-catalog_componentCalculate.sql
+++ /dev/null
@@ -1,254 +0,0 @@
-DROP procedure IF EXISTS `vn`.`catalog_componentCalculate`;
-
-DELIMITER $$
-CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`catalog_componentCalculate`(
-    vZoneFk INT,
-    vAddressFk INT,
-    vShipped DATE)
-proc: BEGIN
-/**
- * Calcula los componentes de los articulos de tmp.ticketLot
- *
- * @param vZoneFk para calcular el transporte
- * @param vAgencyModeFk Id del modo de agencia
- * @param tmp.ticketLot (warehouseFk,available,itemFk,buyFk)
- *
- * @return tmp.ticketComponent(itemFk, warehouseFk, available, rate2, rate3, minPrice,
- *		packing, grouping, groupingMode, buyFk, typeFk)
- * @return tmp.ticketComponentPrice (warehouseFk, itemFk, rate, grouping, price)
- */
-	DECLARE vClientFk INT;
-    DECLARE vGeneralInflationCoefficient INT DEFAULT 1;
-    DECLARE vMinimumDensityWeight INT DEFAULT 167;
-	DECLARE vBoxFreightItem INT DEFAULT 71;
-    DECLARE vBoxVolume BIGINT; -- DEFAULT 138000;
-	DECLARE vSpecialPriceComponent INT DEFAULT 10;
-	DECLARE vDeliveryComponent INT DEFAULT 15;
-	DECLARE vRecoveryComponent INT DEFAULT 17;
-	DECLARE vSellByPacketComponent INT DEFAULT 22;
-	DECLARE vBuyValueComponent INT DEFAULT 28;
-	DECLARE vMarginComponent INT DEFAULT 29;
-	DECLARE vDiscountLastItemComponent INT DEFAULT 32;
-	DECLARE vExtraBaggedComponent INT DEFAULT 38;
-	DECLARE vManaAutoComponent INT DEFAULT 39;
-
-    SELECT volume INTO vBoxVolume
-		FROM vn.packaging
-        WHERE id = '94';
-        
-    SELECT clientFk INTO vClientFK 
-		FROM address 
-        WHERE id = vAddressFk;
-
-    SET @rate2 := 0;
-    SET @rate3 := 0;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentCalculate;
-	CREATE TEMPORARY TABLE tmp.ticketComponentCalculate
-	(PRIMARY KEY (itemFk, warehouseFk))
-	ENGINE = MEMORY
-		SELECT 
-			tl.itemFk, tl.warehouseFk, tl.available,
-			IF((@rate2 := IFNULL(pf.rate2, b.price2)) < i.minPrice AND i.hasMinPrice, i.minPrice, @rate2) * 1.0 rate2,
-			IF((@rate3 := IFNULL(pf.rate3, b.price3)) < i.minPrice AND i.hasMinPrice, i.minPrice, @rate3) * 1.0 rate3,
-            IFNULL(pf.rate3, 0) AS minPrice,
-			IFNULL(pf.packing, b.packing) packing,
-			IFNULL(pf.`grouping`, b.`grouping`) `grouping`,
-			ABS(IFNULL(pf.box, b.groupingMode)) groupingMode,
-            tl.buyFk, 
-            i.typeFk,
-            IF(i.hasKgPrice, b.weight / b.packing, NULL) weightGrouping
-        FROM tmp.ticketLot tl
-		JOIN buy b ON b.id = tl.buyFk
-		JOIN item i ON i.id = tl.itemFk
-        JOIN itemType it ON it.id = i.typeFk
-        LEFT JOIN itemCategory ic ON ic.id = it.categoryFk
-		LEFT JOIN specialPrice sp ON sp.itemFk = i.id AND sp.clientFk = vClientFk
-		LEFT JOIN (
-			SELECT * FROM (
-				SELECT pf.itemFk, pf.`grouping`, pf.packing, pf.box, pf.rate2, pf.rate3, zw.warehouseFk
-					FROM priceFixed pf
-					JOIN zoneWarehouse zw ON zw.zoneFk = vZoneFk AND (zw.warehouseFk = pf.warehouseFk OR pf.warehouseFk = 0)
-						WHERE vShipped BETWEEN pf.started AND pf.ended ORDER BY pf.itemFk, pf.warehouseFk DESC
-			) tpf
-			GROUP BY tpf.itemFk, tpf.warehouseFk
-		) pf ON pf.itemFk = tl.itemFk AND pf.warehouseFk = tl.warehouseFk
-        WHERE b.buyingValue + b.freightValue + b.packageValue + b.comissionValue > 0.01 AND ic.display <> 0;
-        
-    DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponent;
-    CREATE TEMPORARY TABLE tmp.ticketComponent (
-		`warehouseFk` INT UNSIGNED NOT NULL,
-		`itemFk` INT NOT NULL,
-		`componentFk` INT UNSIGNED NOT NULL,
-		`cost` DECIMAL(10,4) NOT NULL,
-		INDEX `itemWarehouse` USING BTREE (`itemFk` ASC, `warehouseFk` ASC),
-		UNIQUE INDEX `itemWarehouseComponent` (`itemFk` ASC, `warehouseFk` ASC, `componentFk` ASC));
-
-	INSERT INTO tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost)
-		SELECT 
-				tcc.warehouseFk, 
-				tcc.itemFk, 
-				vBuyValueComponent, 
-				b.buyingValue + b.freightValue + b.packageValue + b.comissionValue
-			FROM tmp.ticketComponentCalculate tcc 
-				JOIN buy b ON b.id = tcc.buyFk;
-                
-	INSERT INTO tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost)
-		SELECT 
-				tcc.warehouseFk, 
-				tcc.itemFk, 
-				vMarginComponent, 
-				tcc.rate3 - b.buyingValue - b.freightValue - b.packageValue - b.comissionValue
-			FROM tmp.ticketComponentCalculate tcc 
-				JOIN buy b ON b.id = tcc.buyFk;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentBase;
-	CREATE TEMPORARY TABLE tmp.ticketComponentBase ENGINE = MEMORY
-		SELECT tc.itemFk, ROUND(SUM(tc.cost), 4) AS base, tc.warehouseFk
-			FROM tmp.ticketComponent tc
-			GROUP BY tc.itemFk, warehouseFk;
-
-	INSERT INTO tmp.ticketComponent
-		SELECT tcb.warehouseFk, tcb.itemFk, vRecoveryComponent, ROUND(tcb.base * LEAST(cr.priceIncreasing, 0.25), 3)
-			FROM tmp.ticketComponentBase tcb
-			JOIN claimRatio cr ON cr.clientFk = vClientFk
-				WHERE cr.priceIncreasing > 0.009;
-            
-    INSERT INTO tmp.ticketComponent
-		SELECT tcb.warehouseFk, tcb.itemFk, vManaAutoComponent, ROUND(base * (0.01 + wm.pricesModifierRate), 3) as manaAuto
-			FROM tmp.ticketComponentBase tcb
-				JOIN `client` c on c.id = vClientFk
-				JOIN workerMana wm ON c.salesPersonFk = wm.workerFk 
-			WHERE wm.isPricesModifierActivated
-			HAVING manaAuto <> 0;
-	
-	INSERT INTO tmp.ticketComponent
-		SELECT tcb.warehouseFk, 
-                tcb.itemFk, 
-                c.id, 
-                GREATEST(IFNULL(ROUND(tcb.base * c.tax, 4), 0), tcc.minPrice - tcc.rate3)
-			FROM tmp.ticketComponentBase tcb
-				JOIN component c
-				JOIN tmp.ticketComponentCalculate tcc ON tcc.itemFk = tcb.itemFk AND tcc.warehouseFk = tcb.warehouseFk 
-				LEFT JOIN specialPrice sp ON sp.clientFk = vClientFk AND sp.itemFk = tcc.itemFk
-			WHERE c.id = vDiscountLastItemComponent AND c.tax <> 0 AND tcc.minPrice < tcc.rate3 AND sp.value IS NULL;
-	
-	INSERT INTO tmp.ticketComponent
-		SELECT tcc.warehouseFk, tcc.itemFk, vSellByPacketComponent, tcc.rate2 - tcc.rate3 
-			FROM tmp.ticketComponentCalculate tcc
-				JOIN buy b ON b.id = tcc.buyFk
-			LEFT JOIN specialPrice sp ON sp.clientFk = vClientFk AND sp.itemFk = tcc.itemFk
-		WHERE sp.value IS NULL;
-             
-	INSERT INTO tmp.ticketComponent
-		SELECT tcc.warehouseFK, 
-				tcc.itemFk,
-				vDeliveryComponent, 
-				vGeneralInflationCoefficient
-				* ROUND((
-					i.compression
-					* ic.cm3 
-					* IF(am.deliveryMethodFk = 1, (GREATEST(i.density, vMinimumDensityWeight) / vMinimumDensityWeight), 1)
-					* IFNULL((z.price - z.bonus)
-					* 1/*amz.inflation*/ , 50)) / vBoxVolume, 4
-				) cost
-		FROM tmp.ticketComponentCalculate tcc
-			JOIN item i ON i.id = tcc.itemFk
-            JOIN zone z ON z.id = vZoneFk
-			JOIN agencyMode am ON am.id = z.agencyModeFk
-			LEFT JOIN itemCost ic ON ic.warehouseFk = tcc.warehouseFk 
-				AND ic.itemFk = tcc.itemFk
-			HAVING cost <> 0; 
-            
-    IF (SELECT COUNT(*) FROM vn.addressForPackaging WHERE addressFk = vAddressFk) THEN
-		INSERT INTO tmp.ticketComponent
-			SELECT tcc.warehouseFk, b.itemFk, vExtraBaggedComponent, ap.packagingValue cost
-				FROM tmp.ticketComponentCalculate tcc
-					JOIN vn.addressForPackaging ap
-				WHERE ap.addressFk = vAddressFk;
-    END IF;
-	
-    DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentCopy;
-    CREATE TEMPORARY TABLE tmp.ticketComponentCopy ENGINE = MEMORY
-		SELECT * FROM tmp.ticketComponent;
-        
-	INSERT INTO tmp.ticketComponent
-		SELECT tcc.warehouseFk, 
-				tcc.itemFk, 
-				vSpecialPriceComponent, 
-				sp.value - SUM(tcc.cost) sumCost
-			FROM tmp.ticketComponentCopy tcc
-				JOIN component c ON c.id = tcc.componentFk
-				JOIN specialPrice sp ON sp.clientFk = vClientFK AND sp.itemFk = tcc.itemFk
-			WHERE c.classRate IS NULL
-			GROUP BY tcc.itemFk, tcc.warehouseFk
-			HAVING ABS(sumCost) > 0.001;
-	
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentSum;
-	CREATE TEMPORARY TABLE tmp.ticketComponentSum
-		(INDEX (itemFk, warehouseFk))
-		ENGINE = MEMORY
-		SELECT SUM(cost) sumCost, tc.itemFk, tc.warehouseFk, c.classRate
-			FROM tmp.ticketComponent tc
-				JOIN component c ON c.id = tc.componentFk
-			GROUP BY tc.itemFk, tc.warehouseFk, c.classRate;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentRate;
-	CREATE TEMPORARY TABLE tmp.ticketComponentRate ENGINE = MEMORY
-		SELECT tcc.warehouseFk,  
-				tcc.itemFk, 
-				1 rate,
-				IF(tcc.groupingMode = 1, tcc.`grouping`, 1) `grouping`, 
-				CAST(SUM(tcs.sumCost) AS DECIMAL(10,2)) price,
-                CAST(SUM(tcs.sumCost) AS DECIMAL(10,2)) / weightGrouping priceKg                
-			FROM tmp.ticketComponentCalculate tcc
-				JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk 
-					AND tcs.warehouseFk = tcc.warehouseFk
-			WHERE IFNULL(tcs.classRate, 1) = 1 
-				AND tcc.groupingMode < 2 AND (tcc.packing > tcc.`grouping` or tcc.groupingMode = 0)
-			GROUP BY tcs.warehouseFk, tcs.itemFk;
-
-	INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, `grouping`, price, priceKg)
-        SELECT 
-				tcc.warehouseFk, 
-				tcc.itemFk, 
-				2 rate, 
-				tcc.packing `grouping`, 
-				SUM(tcs.sumCost) price,
-                SUM(tcs.sumCost) / weightGrouping priceKg   
-			FROM tmp.ticketComponentCalculate tcc
-				JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk 
-					AND tcs.warehouseFk = tcc.warehouseFk
-			WHERE tcc.available IS NULL OR (IFNULL(tcs.classRate, 2) = 2 
-				AND tcc.packing > 0 AND tcc.available >= tcc.packing)
-			GROUP BY tcs.warehouseFk, tcs.itemFk;
-
-	INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, `grouping`, price, priceKg)
-		 SELECT 				
-		 		tcc.warehouseFk, 
-				tcc.itemFk, 
-				3 rate, 
-				tcc.available `grouping`, 
-				SUM(tcs.sumCost) price,
-                SUM(tcs.sumCost) / weightGrouping priceKg   
-			FROM tmp.ticketComponentCalculate tcc
-				JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk 
-					AND tcs.warehouseFk = tcc.warehouseFk
-			WHERE IFNULL(tcs.classRate, 3) = 3 
-			GROUP BY tcs.warehouseFk, tcs.itemFk;
-        
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentPrice;
-	CREATE TEMPORARY TABLE tmp.ticketComponentPrice ENGINE = MEMORY 
-		SELECT * FROM (
-			SELECT * FROM tmp.ticketComponentRate ORDER BY price
-		) t
-		GROUP BY itemFk, warehouseFk, `grouping`;
-
-    DROP TEMPORARY TABLE 
-		tmp.ticketComponentCalculate,
-		tmp.ticketComponentSum,
-		tmp.ticketComponentBase,
-		tmp.ticketComponentRate,
-    	tmp.ticketComponentCopy;
-END$$
-DELIMITER ;
\ No newline at end of file
diff --git a/db/changes/10130-christmas/00-chatConfig.sql b/db/changes/10130-christmas/00-chatConfig.sql
deleted file mode 100644
index beff3bde4..000000000
--- a/db/changes/10130-christmas/00-chatConfig.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE `vn`.`chatConfig`
-ADD COLUMN `host` VARCHAR(255) NOT NULL AFTER `id`,
-CHANGE COLUMN `uri` `api` VARCHAR(255) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NOT NULL ;
-
-UPDATE `vn`.`chatConfig` SET `host` = 'https://chat.verdnatura.es' WHERE (`id` = '1');
diff --git a/db/changes/10130-christmas/00-greugeConfig.sql b/db/changes/10130-christmas/00-greugeConfig.sql
deleted file mode 100644
index c21751f08..000000000
--- a/db/changes/10130-christmas/00-greugeConfig.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-CREATE TABLE `vn`.`greugeConfig` (
-  `id` INT NOT NULL AUTO_INCREMENT,
-  `freightPickUpPrice` DECIMAL(10,2) NOT NULL,
-  PRIMARY KEY (`id`));
-
-INSERT IGNORE INTO `vn`.`greugeConfig` (`id`, `freightPickUpPrice`) VALUES ('1', '11');
diff --git a/db/changes/10130-christmas/00-manaSpellersRequery.sql b/db/changes/10130-christmas/00-manaSpellersRequery.sql
deleted file mode 100644
index cc185fdba..000000000
--- a/db/changes/10130-christmas/00-manaSpellersRequery.sql
+++ /dev/null
@@ -1,70 +0,0 @@
-
-DROP procedure IF EXISTS `vn`.`manaSpellersRequery`;
-
-DELIMITER $$
-CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`manaSpellersRequery`(vWorkerFk INTEGER)
-BEGIN
-
-	DECLARE vWorkerIsExcluded BOOLEAN;
-	DECLARE vFromDated DATE;
-    DECLARE vToDated DATE DEFAULT TIMESTAMPADD(DAY,1,CURDATE());
-	DECLARE vMana INT;
-    DECLARE vAutoMana INT;
-    DECLARE vManaBank INT;
-    DECLARE vManaGreugeType INT;
-    
-    SELECT id INTO vMana 
-		FROM `component` WHERE code = 'mana';
-    
-    SELECT id INTO vAutoMana 
-		FROM `component` WHERE code = 'autoMana';
-	
-	SELECT id INTO vManaBank 
-		FROM `bank` WHERE code = 'mana';
-	
-	SELECT id INTO vManaGreugeType 
-		FROM `greugeType` WHERE code = 'mana';
-        
-    SELECT COUNT(*) INTO vWorkerIsExcluded
-		FROM workerManaExcluded
-		WHERE workerFk = vWorkerFk;
-    
-	IF NOT vWorkerIsExcluded THEN
-
-		SELECT max(dated) INTO vFromDated 
-			FROM clientManaCache;
-            
-        REPLACE workerMana (workerFk, amount)
-			SELECT vWorkerFk, sum(mana) FROM 
-			(
-				SELECT s.quantity * sc.value as mana
-					FROM ticket t
-						JOIN address a ON a.id = t.addressFk
-						JOIN client c ON c.id = a.clientFk
-						JOIN sale s ON s.ticketFk = t.id
-						JOIN saleComponent sc ON sc.saleFk = s.id
-					WHERE c.salesPersonFk =  vWorkerFk AND sc.componentFk IN (vMana, vAutoMana)
-						AND t.shipped > vFromDated AND t.shipped < vToDated
-				UNION ALL
-				SELECT  - r.amountPaid
-					FROM receipt r
-						JOIN client c ON c.id = r.clientFk
-					WHERE c.salesPersonFk = vWorkerFk AND bankFk = vManaBank
-						AND payed > vFromDated
-				UNION ALL
-				SELECT g.amount
-					FROM greuge g
-						JOIN client c ON c.id = g.clientFk
-					WHERE c.salesPersonFk = vWorkerFk AND g.greugeTypeFk = vManaGreugeType
-						AND g.shipped > vFromDated and g.shipped < CURDATE()				
-				UNION ALL				
-				SELECT cc.mana
-					FROM clientManaCache cc
-						JOIN client c ON c.id = cc.clientFk
-					WHERE c.salesPersonFk = vWorkerFk AND cc.dated = vFromDated
-			) sub;
-	END IF;
-END$$
-
-DELIMITER ;
-
diff --git a/db/changes/10130-christmas/00-timeControl_calculate.sql b/db/changes/10130-christmas/00-timeControl_calculate.sql
deleted file mode 100644
index 0a6470216..000000000
--- a/db/changes/10130-christmas/00-timeControl_calculate.sql
+++ /dev/null
@@ -1,44 +0,0 @@
-USE `vn`;
-DROP procedure IF EXISTS `timeControl_calculate`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `timeControl_calculate`(vDatedFrom DATETIME, vDatedTo DATETIME)
-BEGIN
-	SET @vIsOdd := TRUE;
-	SET @vUser := NULL;
-	SET @vDated := NULL;	
- 
-	DROP TEMPORARY TABLE IF EXISTS tmp.timeControlCalculate;
-	
-	CREATE TEMPORARY TABLE tmp.timeControlCalculate
-	  SELECT  userFk,
-			  dated,
-			  IF( timeWork >= 18000, @timeWork:=timeWork + 1200, @timeWork:=timeWork) timeWorkSeconds,
-			  SEC_TO_TIME(@timeWork ) timeWorkSexagesimal,    
-			  @timeWork / 3600 timeWorkDecimal 
-			FROM (SELECT SUM(timeWork) timeWork, 
-						 userFk, 
-                         dated 
-					FROM (SELECT IF(@vUser = wtc.userFk, @vUser :=@vUser, @vUser := wtc.userFk ),
-								 IF(@vIsOdd, @vIsOdd := FALSE, @vIsOdd := TRUE ),
-								 IF(direction='in', @vIsOdd := TRUE, @vIsOdd := @vIsOdd ),
-								 IF(@vIsOdd, @vLastTimed:=UNIX_TIMESTAMP(timed),@vLastTimed:=@vLastTimed), 
-								 IF(@vIsOdd, 0, UNIX_TIMESTAMP(timed)-@vLastTimed) timeWork,
-								 IF(direction='in', @vDated := DATE(wtc.timed), @vDated :=@vDated) dated,
-								 wtc.userFk,
-								 wtc.timed timed,
-								 direction
-							FROM (SELECT * FROM workerTimeControl ORDER BY userFk, timed ASC) wtc
-								JOIN tmp.`user` w ON w.userFk = wtc.userFk
-							WHERE wtc.timed BETWEEN vDatedFrom AND vDatedTo 
-							ORDER BY userFk, timed ASC
-						 ) sub
-					GROUP BY userFk, dated
-					ORDER BY userFk, dated
-				 )sub2;
-
-END$$
-
-DELIMITER ;
-
diff --git a/db/changes/10140-kings/00-ACL.sql b/db/changes/10140-kings/00-ACL.sql
deleted file mode 100644
index fe1cbeb24..000000000
--- a/db/changes/10140-kings/00-ACL.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('Thermograph', '*', '*', 'ALLOW', 'ROLE', 'buyer');
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('TravelThermograph', '*', '*', 'ALLOW', 'ROLE', 'buyer');
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('Entry', '*', '*', 'ALLOW', 'ROLE', 'buyer');
\ No newline at end of file
diff --git a/db/changes/10140-kings/00-buy_afterUpsert.sql b/db/changes/10140-kings/00-buy_afterUpsert.sql
deleted file mode 100644
index ab038628c..000000000
--- a/db/changes/10140-kings/00-buy_afterUpsert.sql
+++ /dev/null
@@ -1,81 +0,0 @@
-
-DROP procedure IF EXISTS `vn`.`buy_afterUpsert`;
-
-DELIMITER $$
-CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`buy_afterUpsert`(vSelf INT)
-BEGIN
-/**
- * Triggered actions when a buy is updated or inserted.
- *
- * @param vSelf The buy reference
- */
-	DECLARE vEntryFk INT;
-	DECLARE vItemFk INT;
-	DECLARE vStickers INT;
-	DECLARE vPacking INT;
-	DECLARE vWarehouse INT;
-	DECLARE vWarehouseOut INT;
-	DECLARE vIsMerchandise BOOL;
-	DECLARE vIsFeedStock BOOL;
-    DECLARE vLanded DATE;
-    DECLARE vBuyerFk INT;
-    DECLARE vItemName VARCHAR(50);
-    
-	SELECT entryFk, itemFk, stickers, packing
-		INTO vEntryFk, vItemFk, vStickers, vPacking
-		FROM buy
-		WHERE id = vSelf;
-
-	SELECT t.warehouseInFk, t.warehouseOutFk, t.landed
-		INTO vWarehouse, vWarehouseOut, vLanded
-		FROM entry e
-			JOIN travel t ON t.id = e.travelFk
-		WHERE e.id = vEntryFk;
-
-	SELECT k.merchandise, it.workerFk, i.longName
-		INTO vIsMerchandise, vBuyerFk, vItemName
-		FROM itemCategory k
-			JOIN itemType it ON it.categoryFk = k.id
-			JOIN item i ON i.typeFk = it.id
-		WHERE i.id = vItemFk;
-
-	IF vIsMerchandise THEN
-		REPLACE itemCost	SET
-			itemFk = vItemFk,
-			warehouseFk = vWarehouse,
-			cm3 = buy_getUnitVolume(vSelf);
-	END IF;
-
-	SELECT isFeedStock INTO vIsFeedStock
-		FROM warehouse WHERE id = vWarehouseOut AND id <> 13;
-
-	IF vIsFeedStock THEN
-		INSERT IGNORE INTO producer(`name`)
-			SELECT es.company_name
-				FROM buy b
-					JOIN edi.ekt be ON be.id = b.ektFk
-					JOIN edi.supplier es ON es.supplier_id = be.pro
-				WHERE b.id = vSelf;
-                
-		IF buy_hasNotifyPassport(vSelf, vItemFk) THEN
-			CALL vn.buy_notifyPassport(vSelf, vItemFk, vStickers, vPacking);
-		END IF;
-	END IF;
-    
-    -- Aviso al comprador de modificacion de entrada en Barajas
-	IF (SELECT isBuyerToBeEmailed FROM warehouse WHERE id = vWarehouse)
-		AND vLanded = CURDATE()
-        AND vBuyerFk != account.myUserGetId() 
-	THEN
-        
-        CALL vn.mail_insert(CONCAT(account.userGetNameFromId(vBuyerFk),'@verdnatura.es'),
-							CONCAT(account.myUserGetName(),'@verdnatura.es'),
-                            CONCAT('E ',vEntryFk,' Se ha modificado item ', vItemFk, ' ',vItemName),
-                            'Este email se ha generado automáticamente');
-           
-	END IF;
-
-END$$
-
-DELIMITER ;
-
diff --git a/db/changes/10140-kings/00-clientRisk_update.sql b/db/changes/10140-kings/00-clientRisk_update.sql
deleted file mode 100644
index 389236e1d..000000000
--- a/db/changes/10140-kings/00-clientRisk_update.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-
-DELIMITER $$
-CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`clientRisk_update`(vClientId INT, vCompanyId INT, vAmount DECIMAL(10,2))
-BEGIN
-	IF vAmount IS NOT NULL
-	THEN
-		INSERT INTO clientRisk
-			SET
-				clientFk = vClientId,
-				companyFk = vCompanyId,
-				amount = vAmount
-			ON DUPLICATE KEY UPDATE
-				amount = amount + VALUES(amount);
-	END IF;
-END$$
-
-DELIMITER ;
-
diff --git a/db/changes/10140-kings/00-componentType.sql b/db/changes/10140-kings/00-componentType.sql
deleted file mode 100644
index e17d35400..000000000
--- a/db/changes/10140-kings/00-componentType.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `vn`.`componentType` 
-CHANGE COLUMN `base` `isBase` TINYINT(4) NOT NULL DEFAULT '0' COMMENT 'Marca aquellas series que se utilizan para calcular el precio base de las ventas, a efectos estadisticos' ;
-
diff --git a/db/changes/10140-kings/00-customer_risk_update.sql b/db/changes/10140-kings/00-customer_risk_update.sql
deleted file mode 100644
index c7ecead4f..000000000
--- a/db/changes/10140-kings/00-customer_risk_update.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-
-DROP procedure IF EXISTS `bi`.`customer_risk_update`;
-
-DELIMITER $$
-USE `bi`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `bi`.`customer_risk_update`(v_customer INT, v_company INT, v_amount DECIMAL(10,2))
-BEGIN
-	CALL vn.clientRisk_update(v_customer, v_company, v_amount);
-END$$
-
-DELIMITER ;
-
diff --git a/db/changes/10140-kings/00-department.sql b/db/changes/10140-kings/00-department.sql
deleted file mode 100644
index 29008d753..000000000
--- a/db/changes/10140-kings/00-department.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE `vn`.`department` 
-ADD COLUMN `chatName` VARCHAR(45) NULL AFTER `path`;
diff --git a/db/changes/10140-kings/00-ticketComponentUpdateSale.sql b/db/changes/10140-kings/00-ticketComponentUpdateSale.sql
deleted file mode 100644
index b40debce6..000000000
--- a/db/changes/10140-kings/00-ticketComponentUpdateSale.sql
+++ /dev/null
@@ -1,155 +0,0 @@
-
-
-DROP procedure IF EXISTS `vn`.`ticketComponentUpdateSale`;
-
-DELIMITER $$
-
-CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`ticketComponentUpdateSale`(vOption INT)
-BEGIN
-/**
- * A partir de la tabla tmp.sale, crea los Movimientos_componentes
- * y modifica el campo Preu de la tabla Movimientos
- *
- * @param i_option integer tipo de actualizacion
- * @param table tmp.sale  tabla memory con el campo saleFk, warehouseFk
- **/
-	DECLARE vComponentFk INT;
-    DECLARE vRenewComponents BOOLEAN;
-    DECLARE vKeepPrices BOOLEAN;
-    
-    CASE vOption
-		WHEN 1 THEN  
-			SET vRenewComponents = TRUE;
-            SET vKeepPrices = FALSE;
-		WHEN 2 THEN
-			SET vComponentFk = 17;  
-			SET vRenewComponents = TRUE;
-            SET vKeepPrices = TRUE;
-		WHEN 3 THEN 
-			SET vComponentFk = 37; 
-			SET vRenewComponents = TRUE;
-            SET vKeepPrices = TRUE;	
-		WHEN 4 THEN 
-			SET vComponentFk = 34; 
-			SET vRenewComponents = TRUE;
-            SET vKeepPrices = TRUE;
-        WHEN 5 THEN 
-			SET vComponentFk = 35;
-			SET vRenewComponents = TRUE;
-            SET vKeepPrices = TRUE;
-		WHEN 6 THEN 
-    		SET vComponentFk = 36;   
-			SET vRenewComponents = TRUE;
-            SET vKeepPrices = TRUE;
-        WHEN 7 THEN
-		    REPLACE INTO saleComponent(saleFk, componentFk, value)
-				SELECT s.id, 28, ROUND(((s.price * (100 - s.discount) / 100) - SUM(IFNULL(sc.value, 0))) * 0.8, 3) 
-				    FROM sale s
-                        JOIN tmp.sale tmps ON tmps.saleFk = s.id
-				        LEFT JOIN saleComponent sc ON sc.saleFk = s.id 
-                            AND sc.componentFk NOT IN (28, 29)
-                    GROUP BY s.id;
-			
-			REPLACE INTO saleComponent(saleFk, componentFk, value)
-				SELECT s.id, 29, ROUND(((s.price * (100 - s.discount) / 100) - SUM(IFNULL(sc.value, 0))) * 0.2, 3) 
-				    FROM sale s
-                        JOIN tmp.sale tmps ON tmps.saleFk = s.id
-				        LEFT JOIN saleComponent sc ON sc.saleFk = s.id 
-                            AND sc.componentFk NOT IN (28, 29)
-                GROUP BY s.id;
-                
-			SET vRenewComponents = FALSE;
-            SET vKeepPrices = FALSE;
-		WHEN 8 THEN
-            DELETE sc.* 
-				FROM tmp.sale tmps JOIN saleComponent sc ON sc.saleFk = tmps.saleFk;
-			
-			REPLACE INTO saleComponent(saleFk, componentFk, value)
-				SELECT s.id, 28, ROUND(((s.price * (100 - s.discount) / 100)), 3) 
-                    FROM sale s
-                        JOIN tmp.sale tmps ON tmps.saleFk = s.id;
-				
-			SET vRenewComponents = FALSE;
-            SET vKeepPrices = FALSE;
-		WHEN 9 THEN  
-			SET vRenewComponents = TRUE;
-            SET vKeepPrices = TRUE;
-    END CASE;
-
-    IF vRenewComponents THEN
-        DELETE sc.* 
-            FROM tmp.sale tmps 
-                JOIN saleComponent sc ON sc.saleFk = tmps.saleFk
-                JOIN `component` c ON c.id = sc.componentFk
-        WHERE c.isRenewable;
-				
-        REPLACE INTO saleComponent(saleFk, componentFk, value)
-            SELECT s.id, tc.componentFk, tc.cost
-                FROM sale s 
-                    JOIN tmp.sale tmps ON tmps.saleFk = s.id
-                    JOIN tmp.ticketComponent tc ON tc.itemFk = s.itemFk AND tc.warehouseFk = tmps.warehouseFk
-                    LEFT JOIN saleComponent sc ON sc.saleFk = s.id 
-                        AND sc.componentFk = tc.componentFk 
-                    LEFT JOIN `component` c ON c.id = tc.componentFk 
-                WHERE IF(sc.componentFk IS NULL AND NOT c.isRenewable, FALSE, TRUE);
-    END IF;
-
-    IF vKeepPrices THEN
-		REPLACE INTO saleComponent(saleFk, componentFk, value)
-		    SELECT s.id, vComponentFk, ROUND((s.price * (100 - s.discount) / 100) - SUM(sc.value), 3) dif
-		        FROM sale s
-                    JOIN tmp.sale tmps ON tmps.saleFk = s.id
-                    LEFT JOIN saleComponent sc ON sc.saleFk = s.id
-		    WHERE  sc.saleFk <> vComponentFk
-		    GROUP BY s.id
-		    HAVING dif <> 0;
-    ELSE
-		UPDATE sale s
-			JOIN item i on i.id = s.itemFk
-			JOIN itemType it on it.id = i.typeFk
-				JOIN (SELECT SUM(sc.value) sumValue, sc.saleFk 
-						FROM saleComponent sc
-							JOIN tmp.sale tmps ON tmps.saleFk = sc.saleFk
-						GROUP BY sc.saleFk) sc ON sc.saleFk = s.id
-				SET s.price = sumValue
-			WHERE it.code != 'PRT' ; 
-            
-		REPLACE INTO saleComponent(saleFk, componentFk, value)
-			SELECT s.id, 21, ROUND((s.price * (100 - s.discount) / 100) - SUM(value), 3) saleValue
-				FROM sale s
-					JOIN tmp.sale tmps ON tmps.saleFk = s.id
-					LEFT JOIN saleComponent sc ON sc.saleFk = s.id
-				WHERE sc.componentFk != 21
-				GROUP BY s.id 
-				HAVING ROUND(saleValue, 4) <> 0;
-    END IF;
-    
-    UPDATE sale s
-		JOIN (
-			SELECT SUM(sc.value) sumValue, sc.saleFk 
-				FROM saleComponent sc
-					JOIN tmp.sale tmps ON tmps.saleFk = sc.saleFk
-					JOIN `component` c ON c.id = sc.componentFk
-					JOIN componentType ct on ct.id = c.typeFk AND ct.isBase
-				GROUP BY sc.saleFk) sc ON sc.saleFk = s.id
-		SET s.priceFixed = sumValue, s.isPriceFixed = 1;
-
-    DELETE sc.*
-		FROM saleComponent sc
-			JOIN tmp.sale tmps ON tmps.saleFk = sc.saleFk
-			JOIN sale s on s.id = sc.saleFk
-			JOIN item i ON i.id = s.itemFk
-			JOIN itemType it ON it.id = i.typeFk
-		WHERE it.code = 'PRT'; 
-		
-	INSERT INTO saleComponent(saleFk, componentFk, value)
-		SELECT s.id, 15, s.price   
-			FROM sale s
-				JOIN tmp.sale tmps ON tmps.saleFk = s.id
-				JOIN item i ON i.id = s.itemFK
-				JOIN itemType it ON it.id = i.typeFk
-		WHERE it.code = 'PRT' AND s.price > 0;
-END$$
-
-DELIMITER ;
-
diff --git a/db/changes/10140-kings/00-travelThermograph.sql b/db/changes/10140-kings/00-travelThermograph.sql
deleted file mode 100644
index c19151a45..000000000
--- a/db/changes/10140-kings/00-travelThermograph.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-ALTER TABLE `vn`.`travelThermograph` 
-ADD COLUMN `id` INT NOT NULL AUTO_INCREMENT FIRST,
-DROP PRIMARY KEY,
-ADD PRIMARY KEY (`id`);
-
-ALTER TABLE `vn`.`travelThermograph` 
-ADD UNIQUE INDEX `thermograph_created` (`thermographFk` ASC, `created` ASC) VISIBLE;
\ No newline at end of file
diff --git a/db/changes/10140-kings/00-triggerInvoiceOut.sql b/db/changes/10140-kings/00-triggerInvoiceOut.sql
deleted file mode 100644
index 7f6ed30b1..000000000
--- a/db/changes/10140-kings/00-triggerInvoiceOut.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-DROP TRIGGER IF EXISTS `vn`.`invoiceOut_afterInsert`;
-
-DELIMITER $$
-CREATE DEFINER=`root`@`%` TRIGGER `vn`.`invoiceOut_afterInsert` AFTER INSERT ON `vn`.`invoiceOut` FOR EACH ROW BEGIN
-	CALL clientRisk_update(NEW.clientFk, NEW.companyFk, NEW.amount);
-END$$
-DELIMITER ;
-
-DROP TRIGGER IF EXISTS `vn`.`invoiceOut_beforeUpdate`;
-
-DELIMITER $$
-CREATE DEFINER=`root`@`%` TRIGGER `vn`.`invoiceOut_beforeUpdate` BEFORE UPDATE ON `vn`.`invoiceOut` FOR EACH ROW
-BEGIN
-	CALL clientRisk_update (OLD.clientFk, OLD.companyFk, -OLD.amount);
-	CALL clientRisk_update (NEW.clientFk, NEW.companyFk, NEW.amount);
-END$$
-
-DELIMITER ;
-
-
-DROP TRIGGER IF EXISTS `vn`.`invoiceOut_beforeDelete`;
-
-DELIMITER $$
-CREATE DEFINER=`root`@`%` TRIGGER `vn`.`invoiceOut_beforeDelete` BEFORE DELETE ON `invoiceOut` FOR EACH ROW BEGIN
-	CALL clientRisk_update (OLD.clientFk, OLD.companyFk, -OLD.amount);
-END$$
-DELIMITER ;
diff --git a/db/changes/10140-kings/00-triggerReceipt.sql b/db/changes/10140-kings/00-triggerReceipt.sql
deleted file mode 100644
index c9c368a40..000000000
--- a/db/changes/10140-kings/00-triggerReceipt.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-DROP TRIGGER IF EXISTS `vn`.`receipt_afterInsert`;
-
-DELIMITER $$
-CREATE DEFINER=`root`@`%` TRIGGER `vn`.`receipt_afterInsert` AFTER INSERT ON `receipt` FOR EACH ROW 
-	CALL clientRisk_update(NEW.clientFk, NEW.companyFk, -NEW.amountPaid)$$
-DELIMITER ;
-DROP TRIGGER IF EXISTS `vn`.`receipt_beforeUpdate`;
-
-DELIMITER $$
-CREATE DEFINER=`root`@`%` TRIGGER `vn`.`receipt_beforeUpdate` BEFORE UPDATE ON `receipt` FOR EACH ROW BEGIN
-	CALL clientRisk_update(OLD.clientFk, OLD.companyFk, OLD.amountPaid);
-	CALL clientRisk_update(NEW.clientFk, NEW.companyFk, -NEW.amountPaid);
-END$$
-DELIMITER ;
-DROP TRIGGER IF EXISTS `vn`.`receipt_beforeDelete`;
-
-DELIMITER $$
-CREATE DEFINER=`root`@`%` TRIGGER `vn`.`receipt_beforeDelete` BEFORE DELETE ON `receipt` FOR EACH ROW 
-	CALL clientRisk_update(OLD.clientFk, OLD.companyFk, OLD.amountPaid)$$
-DELIMITER ;
diff --git a/db/changes/10140-kings/00-weekWaste_getDetail.sql b/db/changes/10140-kings/00-weekWaste_getDetail.sql
deleted file mode 100644
index a7e099f58..000000000
--- a/db/changes/10140-kings/00-weekWaste_getDetail.sql
+++ /dev/null
@@ -1,29 +0,0 @@
-USE `bs`;
-DROP procedure IF EXISTS `weekWaste_getDetail`;
-
-DELIMITER $$
-USE `bs`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `weekWaste_getDetail`()
-BEGIN
-	DECLARE vLastWeek DATE;
-	DECLARE vWeek INT;
-    DECLARE vYear INT;
-    
-    SET vLastWeek = TIMESTAMPADD(WEEK,-1,CURDATE());
-    SET vYear = YEAR(vLastWeek);
-    SET vWeek = WEEK(vLastWeek, 1);
-    
-	SELECT *, 100 * dwindle / total AS percentage
-		FROM (
-			SELECT  buyer,
-					ws.family,  
-					sum(ws.saleTotal) AS total, 
-					sum(ws.saleWaste) AS dwindle
-				FROM bs.waste ws
-				WHERE year = vYear AND week = vWeek
-				GROUP BY buyer, family
-			) sub
-			ORDER BY percentage DESC;
-END$$
-
-DELIMITER ;
diff --git a/db/changes/10140-kings/00-worker_isWorking.sql b/db/changes/10140-kings/00-worker_isWorking.sql
deleted file mode 100644
index b80d287e0..000000000
--- a/db/changes/10140-kings/00-worker_isWorking.sql
+++ /dev/null
@@ -1,32 +0,0 @@
-USE `vn`;
-DROP function IF EXISTS `worker_isWorking`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE DEFINER=`root`@`%` FUNCTION `worker_isWorking`(vWorkerFk INT) RETURNS tinyint(1)
-    READS SQL DATA
-BEGIN
-/**
- * Comprueba si el trabajador está trabajando en el momento de la consulta
- * @return Devuelve TRUE en caso de que este trabajando. Si se encuentra en un descanso devolverá FALSE
- */
-	DECLARE vLastIn DATETIME ;
-	
-	SELECT MAX(timed) INTO vLastIn
-		FROM vn.workerTimeControl 
-		WHERE userFk = vWorkerFk AND
-		      direction = 'in';
-
-	IF (SELECT MOD(COUNT(*),2) 						
-			FROM vn.workerTimeControl 
-			WHERE userFk = vWorkerFk AND 
-                  timed >= vLastIn
-	   ) THEN	
-		RETURN TRUE;
-	ELSE
-		RETURN FALSE;
-	END IF;
-END$$
-
-DELIMITER ;
-
diff --git a/db/changes/10140-kings/01-order_confirmWithUser.sql b/db/changes/10140-kings/01-order_confirmWithUser.sql
deleted file mode 100644
index c398edc4c..000000000
--- a/db/changes/10140-kings/01-order_confirmWithUser.sql
+++ /dev/null
@@ -1,240 +0,0 @@
-
-DROP procedure IF EXISTS `hedera`.`order_confirmWithUser`;
-
-DELIMITER $$
-CREATE DEFINER=`root`@`%` PROCEDURE `hedera`.`order_confirmWithUser`(IN `vOrder` INT, IN `vUserId` INT)
-BEGIN
-/**
- * Confirms an order, creating each of its tickets on the corresponding
- * date, store and user.
- *
- * @param vOrder The order identifier
- * @param vUser The user identifier
- */
-	DECLARE vOk BOOL;
-	DECLARE vDone BOOL DEFAULT FALSE;
-	DECLARE vWarehouse INT;
-	DECLARE vShipment DATETIME;
-	DECLARE vTicket INT;
-	DECLARE vNotes VARCHAR(255);
-	DECLARE vItem INT;
-	DECLARE vConcept VARCHAR(30);
-	DECLARE vAmount INT;
-	DECLARE vPrice DECIMAL(10,2);
-	DECLARE vSale INT;
-	DECLARE vRate INT;
-	DECLARE vRowId INT;
-	DECLARE vDelivery DATE;
-	DECLARE vAddress INT;
-	DECLARE vIsConfirmed BOOL;
-	DECLARE vClientId INT;
-	DECLARE vCompanyId INT;
-	DECLARE vAgencyModeId INT;
-
-	DECLARE TICKET_FREE INT DEFAULT 2;
-
-	DECLARE cDates CURSOR FOR
-		SELECT zgs.shipped, r.warehouse_id
-			FROM `order` o
-				JOIN order_row r ON r.order_id = o.id
-				LEFT JOIN tmp.zoneGetShipped zgs ON zgs.warehouseFk = r.warehouse_id
-			WHERE o.id = vOrder AND r.amount != 0
-			GROUP BY r.warehouse_id;
-
-	DECLARE cRows CURSOR FOR 
-		SELECT r.id, r.item_id, i.name, r.amount, r.price, r.rate
-			FROM order_row r
-				JOIN vn.item i ON i.id = r.item_id
-			WHERE r.amount != 0
-				AND r.warehouse_id = vWarehouse
-				AND r.order_id = vOrder
-			ORDER BY r.rate DESC;
-
-	DECLARE CONTINUE HANDLER FOR NOT FOUND
-		SET vDone = TRUE;
-
-	DECLARE EXIT HANDLER FOR SQLEXCEPTION
-	BEGIN
-		ROLLBACK;
-		RESIGNAL;
-	END;
-
-	-- Carga los datos del pedido
-
-	SELECT o.date_send, o.address_id, o.note,
-			o.confirmed, a.clientFk, o.company_id, o.agency_id
-		INTO vDelivery, vAddress, vNotes, 
-			vIsConfirmed, vClientId, vCompanyId, vAgencyModeId
-		FROM hedera.`order` o
-			JOIN vn.address a ON a.id = o.address_id
-		WHERE o.id = vOrder;
-			
-	-- Comprueba que el pedido no está confirmado
-
-	IF vIsConfirmed THEN
-		CALL util.throw ('ORDER_ALREADY_CONFIRMED');
-	END IF;
-
-	-- Comprueba que el pedido no está vacío
-
-	SELECT COUNT(*) > 0 INTO vOk
-		FROM order_row WHERE order_id = vOrder AND amount > 0;
-
-	IF !vOk THEN
-		CALL util.throw ('ORDER_EMPTY');
-	END IF;
-
-	-- Carga las fechas de salida de cada almacén
-
-	CALL vn.zone_getShippedWarehouse (vDelivery, vAddress, vAgencyModeId);
-
-	-- Trabajador que realiza la acción
-
-	IF vUserId IS NULL THEN
-		SELECT employeeFk INTO vUserId FROM orderConfig;
-	END IF;
-
-	-- Crea los tickets del pedido
-
-	START TRANSACTION;
-
-	OPEN cDates;
-
-	lDates:
-	LOOP
-		SET vTicket = NULL;
-		SET vDone = FALSE;
-		FETCH cDates INTO vShipment, vWarehouse;
-		
-		IF vDone THEN
-			LEAVE lDates;
-		END IF;
-
-		-- Busca un ticket existente que coincida con los parametros
-
-		SELECT t.id INTO vTicket
-			FROM vn.ticket t
-				LEFT JOIN vn.ticketState tls on tls.ticket = t.id
-				JOIN `order` o
-					ON o.address_id = t.addressFk
-						AND vWarehouse = t.warehouseFk
-						AND o.agency_id = t.agencyModeFk
-						AND o.date_send = t.landed 
-						AND vShipment = DATE(t.shipped)
-			WHERE o.id = vOrder
-				AND t.invoiceOutFk IS NULL
-				AND IFNULL(tls.alertLevel,0) = 0
-                AND t.clientFk <> 1118
-			LIMIT 1;
-		
-		-- Crea el ticket en el caso de no existir uno adecuado
-
-		IF vTicket IS NULL
-		THEN
-			CALL vn.ticketCreateWithUser(
-				vClientId,
-				IFNULL(vShipment, CURDATE()),
-				vWarehouse,
-				vCompanyId,
-				vAddress,
-				vAgencyModeId,
-				NULL,
-				vDelivery,
-				vUserId,
-				vTicket
-			);
-		ELSE
-			INSERT INTO vncontrol.inter
-				SET Id_Ticket = vTicket,
-					Id_Trabajador = vUserId,
-					state_id = TICKET_FREE;
-		END IF;
-		
-		INSERT IGNORE INTO vn.orderTicket
-			SET orderFk = vOrder,
-				ticketFk = vTicket;
-
-		-- Añade las notas
-
-		IF vNotes IS NOT NULL AND vNotes != ''
-		THEN
-			INSERT INTO vn.ticketObservation SET
-					ticketFk = vTicket,
-					observationTypeFk = 4 /* salesperson */ ,
-					`description` = vNotes
-				ON DUPLICATE KEY UPDATE
-					`description` = CONCAT(VALUES(`description`),'. ', `description`);
-		END IF;
-
-		-- Añade los movimientos y sus componentes
-
-		OPEN cRows;
-
-		lRows:
-		LOOP
-			SET vDone = FALSE;
-			FETCH cRows INTO vRowId, vItem, vConcept, vAmount, vPrice, vRate;
-
-			IF vDone THEN
-				LEAVE lRows;
-			END IF;
-
-			INSERT INTO vn.sale 
-			SET
-				itemFk = vItem,
-				ticketFk = vTicket,
-				concept = vConcept,
-				quantity = vAmount,
-				price = vPrice,
-				priceFixed = 0,
-				isPriceFixed = TRUE;
-
-			SET vSale = LAST_INSERT_ID();
-
-			INSERT INTO vn.saleComponent
-				(saleFk, componentFk, `value`)
-				SELECT vSale, cm.component_id, cm.price
-					FROM order_component cm
-						JOIN vn.component c ON c.id = cm.component_id
-					WHERE cm.order_row_id = vRowId
-					GROUP BY vSale, cm.component_id;
-
-			UPDATE order_row SET Id_Movimiento = vSale 
-				WHERE id = vRowId;
-
-		END LOOP;
-
-		CLOSE cRows;
-
-		-- Fija el coste
-
-		DROP TEMPORARY TABLE IF EXISTS tComponents;
-		CREATE TEMPORARY TABLE tComponents
-			(INDEX (saleFk))
-			ENGINE = MEMORY
-			SELECT SUM(sc.`value`) valueSum, sc.saleFk
-				FROM vn.saleComponent sc
-					JOIN vn.component c ON c.id = sc.componentFk
-					JOIN vn.componentType ct ON ct.id = c.typeFk AND ct.isBase
-					JOIN vn.sale s ON s.id = sc.saleFk
-				WHERE s.ticketFk = vTicket
-				GROUP BY sc.saleFk;
-
-		UPDATE vn.sale s
-			JOIN tComponents mc ON mc.saleFk = s.id
-			SET s.priceFixed = valueSum;
-
-		DROP TEMPORARY TABLE tComponents;
-	END LOOP;
-
-	CLOSE cDates;
-
-	DELETE FROM basketOrder WHERE orderFk = vOrder;
-	UPDATE `order` SET confirmed = TRUE, confirm_date = NOW() 
-		WHERE id = vOrder;
-
-	COMMIT;
-END$$
-
-DELIMITER ;
-
diff --git a/db/changes/10140-kings/01-tarifaComponentSerie.sql b/db/changes/10140-kings/01-tarifaComponentSerie.sql
deleted file mode 100644
index acdae0b13..000000000
--- a/db/changes/10140-kings/01-tarifaComponentSerie.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-CREATE 
-     OR REPLACE ALGORITHM = UNDEFINED 
-    DEFINER = `root`@`%` 
-    SQL SECURITY DEFINER
-VIEW `bi`.`tarifa_componentes_series` AS
-    SELECT 
-        `ct`.`id` AS `tarifa_componentes_series_id`,
-        `ct`.`type` AS `Serie`,
-        `ct`.`isBase` AS `base`,
-        `ct`.`isMargin` AS `margen`
-    FROM
-        `vn`.`componentType` `ct`;
diff --git a/db/dump/dumpedFixtures.sql b/db/dump/dumpedFixtures.sql
index 7e766195d..47bfd9b53 100644
--- a/db/dump/dumpedFixtures.sql
+++ b/db/dump/dumpedFixtures.sql
@@ -23,7 +23,7 @@ USE `util`;
 
 LOCK TABLES `config` WRITE;
 /*!40000 ALTER TABLE `config` DISABLE KEYS */;
-INSERT INTO `config` VALUES (1,'10121',0,'production',NULL);
+INSERT INTO `config` VALUES (1,'10140',0,'production',NULL);
 /*!40000 ALTER TABLE `config` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -36,7 +36,7 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-01-23 14:05:01
+-- Dump completed on 2020-02-12 13:30:39
 USE `account`;
 -- MySQL dump 10.13  Distrib 5.7.28, for osx10.15 (x86_64)
 --
@@ -61,7 +61,7 @@ USE `account`;
 
 LOCK TABLES `role` WRITE;
 /*!40000 ALTER TABLE `role` DISABLE KEYS */;
-INSERT INTO `role` VALUES (0,'root','Rol con todos los privilegios',0,'2018-04-23 14:33:36','2018-04-23 14:33:59'),(1,'employee','Empleado básico',1,'2017-05-19 07:04:58','2017-11-29 10:06:31'),(2,'customer','Privilegios básicos de un cliente',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(3,'agency','Consultar tablas de predicciones de bultos',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(5,'administrative','Tareas relacionadas con la contabilidad',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(6,'guest','Privilegios para usuarios sin cuenta',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(9,'developer','Desarrolladores del sistema',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(11,'account','Privilegios relacionados con el login',0,'2017-05-19 07:04:58','2017-09-20 17:06:35'),(13,'teamBoss','Jefe de departamento',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(15,'logistic','Departamento de compras, responsables de la logistica',1,'2017-05-19 07:04:58','2018-02-12 10:50:10'),(16,'logisticBoss','Jefe del departamento de logística',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(17,'adminBoss','Jefe del departamento de administración',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(18,'salesPerson','Departamento de ventas',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(19,'salesBoss','Jefe del departamento de ventas',1,'2017-05-19 07:04:58','2017-08-16 12:38:27'),(20,'manager','Departamento de gerencia',1,'2017-06-01 14:57:02','2017-06-01 14:57:51'),(21,'salesAssistant','Jefe auxiliar de ventas',1,'2017-08-16 12:40:52','2017-08-16 12:40:52'),(22,'teamManager','Jefe de departamento con privilegios de auxiliar de venta.',1,'2017-09-07 09:08:12','2017-09-07 09:08:12'),(30,'financialBoss','Director finaciero',1,'2017-09-21 11:05:36','2017-09-21 11:05:36'),(31,'freelancer','Trabajadores por cuenta ajena',1,'2017-10-10 12:57:26','2017-10-10 12:59:27'),(32,'ett','Trabajadores de empresa temporal',1,'2017-10-10 12:58:58','2017-10-10 12:59:20'),(33,'invoicing','Personal con acceso a facturación',0,'2018-01-29 16:43:34','2018-01-29 16:43:34'),(34,'agencyBoss','Jefe/a del departamento de agencias',1,'2018-01-29 16:44:39','2018-02-23 07:58:53'),(35,'buyer','Departamento de compras',1,'2018-02-12 10:35:42','2018-02-12 10:35:42'),(36,'replenisher','Trabajadores de camara',1,'2018-02-16 14:07:10','2019-04-12 05:38:08'),(37,'hr','Gestor/a de recursos humanos',1,'2018-02-22 17:34:53','2018-02-22 17:34:53'),(38,'hrBoss','Jefe/a de recursos humanos',1,'2018-02-22 17:35:09','2018-02-22 17:35:09'),(39,'adminAssistant','Jefe auxiliar administrativo',1,'2018-02-23 10:37:36','2018-02-23 10:38:41'),(40,'handmade','Departamento de confección',1,'2018-02-23 11:14:53','2018-02-23 11:39:12'),(41,'handmadeBoss','Jefe de departamento de confección',1,'2018-02-23 11:15:09','2018-02-23 11:39:26'),(42,'artificial','Departamento de artificial',1,'2018-02-23 11:39:59','2018-02-23 11:39:59'),(43,'artificialBoss','Jefe del departamento de artificial',1,'2018-02-23 11:40:16','2018-02-23 11:40:16'),(44,'accessory','Departamento de complementos',1,'2018-02-23 11:41:12','2018-02-23 11:41:12'),(45,'accessoryBoss','Jefe del departamento de complementos',1,'2018-02-23 11:41:23','2018-02-23 11:41:23'),(47,'cooler','Empleados de cámara',1,'2018-02-23 13:08:18','2018-02-23 13:08:18'),(48,'coolerBoss','Jefe del departamento de cámara',1,'2018-02-23 13:12:01','2018-02-23 13:12:01'),(49,'production','Empleado de producción',0,'2018-02-26 15:28:23','2019-01-21 12:57:21'),(50,'productionBoss','Jefe de producción',1,'2018-02-26 15:34:12','2018-02-26 15:34:12'),(51,'marketing','Departamento de marketing',1,'2018-03-01 07:28:39','2018-03-01 07:28:39'),(52,'marketingBoss','Jefe del departamento de marketing',1,'2018-03-01 07:28:57','2018-03-01 07:28:57'),(53,'insurance','Gestor de seguros de cambio',0,'2018-03-05 07:44:35','2019-02-01 13:47:57'),(54,'itemPicker','Sacador en cámara',1,'2018-03-05 12:08:17','2018-03-05 12:08:17'),(55,'itemPickerBoss','Jefe de sacadores',1,'2018-03-05 12:08:31','2018-03-05 12:08:31'),(56,'delivery','Personal de reparto',1,'2018-05-30 06:07:02','2018-05-30 06:07:02'),(57,'deliveryBoss','Jefe de personal de reparto',1,'2018-05-30 06:07:19','2018-05-30 06:07:19'),(58,'packager','Departamento encajadores',1,'2019-01-21 12:43:45','2019-01-21 12:43:45'),(59,'packagerBoss','Jefe departamento encajadores',1,'2019-01-21 12:44:10','2019-01-21 12:44:10'),(60,'productionAssi','Tareas relacionadas con producción y administración',1,'2019-01-29 13:29:01','2019-01-29 13:29:01'),(61,'replenisherBos','Jefe de Complementos/Camara',1,'2019-07-01 06:44:07','2019-07-01 06:44:07'),(62,'noLogin','Role without login access to MySQL',0,'2019-07-01 06:50:19','2019-07-02 13:42:05'),(64,'balanceSheet','Consulta de Balance',0,'2019-07-16 12:12:08','2019-07-16 12:12:08'),(65,'officeBoss','Jefe de filial',1,'2019-08-02 06:54:26','2019-08-02 06:54:26'),(66,'sysadmin','Administrador de sistema',1,'2019-08-08 06:58:56','2019-08-08 06:58:56'),(67,'adminOfficer','categoria profesional oficial de administración',1,'2020-01-03 08:09:23','2020-01-03 08:09:23');
+INSERT INTO `role` VALUES (0,'root','Rol con todos los privilegios',0,'2018-04-23 14:33:36','2018-04-23 14:33:59'),(1,'employee','Empleado básico',1,'2017-05-19 07:04:58','2017-11-29 10:06:31'),(2,'customer','Privilegios básicos de un cliente',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(3,'agency','Consultar tablas de predicciones de bultos',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(5,'administrative','Tareas relacionadas con la contabilidad',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(6,'guest','Privilegios para usuarios sin cuenta',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(9,'developer','Desarrolladores del sistema',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(11,'account','Privilegios relacionados con el login',0,'2017-05-19 07:04:58','2017-09-20 17:06:35'),(13,'teamBoss','Jefe de departamento',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(15,'logistic','Departamento de compras, responsables de la logistica',1,'2017-05-19 07:04:58','2018-02-12 10:50:10'),(16,'logisticBoss','Jefe del departamento de logística',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(17,'adminBoss','Jefe del departamento de administración',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(18,'salesPerson','Departamento de ventas',1,'2017-05-19 07:04:58','2017-05-19 07:04:58'),(19,'salesBoss','Jefe del departamento de ventas',1,'2017-05-19 07:04:58','2017-08-16 12:38:27'),(20,'manager','Departamento de gerencia',1,'2017-06-01 14:57:02','2017-06-01 14:57:51'),(21,'salesAssistant','Jefe auxiliar de ventas',1,'2017-08-16 12:40:52','2017-08-16 12:40:52'),(22,'teamManager','Jefe de departamento con privilegios de auxiliar de venta.',1,'2017-09-07 09:08:12','2017-09-07 09:08:12'),(30,'financialBoss','Director finaciero',1,'2017-09-21 11:05:36','2017-09-21 11:05:36'),(31,'freelancer','Trabajadores por cuenta ajena',1,'2017-10-10 12:57:26','2017-10-10 12:59:27'),(32,'ett','Trabajadores de empresa temporal',1,'2017-10-10 12:58:58','2017-10-10 12:59:20'),(33,'invoicing','Personal con acceso a facturación',0,'2018-01-29 16:43:34','2018-01-29 16:43:34'),(34,'agencyBoss','Jefe/a del departamento de agencias',1,'2018-01-29 16:44:39','2018-02-23 07:58:53'),(35,'buyer','Departamento de compras',1,'2018-02-12 10:35:42','2018-02-12 10:35:42'),(36,'replenisher','Trabajadores de camara',1,'2018-02-16 14:07:10','2019-04-12 05:38:08'),(37,'hr','Gestor/a de recursos humanos',1,'2018-02-22 17:34:53','2018-02-22 17:34:53'),(38,'hrBoss','Jefe/a de recursos humanos',1,'2018-02-22 17:35:09','2018-02-22 17:35:09'),(39,'adminAssistant','Jefe auxiliar administrativo',1,'2018-02-23 10:37:36','2018-02-23 10:38:41'),(40,'handmade','Departamento de confección',1,'2018-02-23 11:14:53','2018-02-23 11:39:12'),(41,'handmadeBoss','Jefe de departamento de confección',1,'2018-02-23 11:15:09','2018-02-23 11:39:26'),(42,'artificial','Departamento de artificial',1,'2018-02-23 11:39:59','2018-02-23 11:39:59'),(43,'artificialBoss','Jefe del departamento de artificial',1,'2018-02-23 11:40:16','2018-02-23 11:40:16'),(44,'accessory','Departamento de complementos',1,'2018-02-23 11:41:12','2018-02-23 11:41:12'),(45,'accessoryBoss','Jefe del departamento de complementos',1,'2018-02-23 11:41:23','2018-02-23 11:41:23'),(47,'cooler','Empleados de cámara',1,'2018-02-23 13:08:18','2018-02-23 13:08:18'),(48,'coolerBoss','Jefe del departamento de cámara',1,'2018-02-23 13:12:01','2018-02-23 13:12:01'),(49,'production','Empleado de producción',0,'2018-02-26 15:28:23','2019-01-21 12:57:21'),(50,'productionBoss','Jefe de producción',1,'2018-02-26 15:34:12','2018-02-26 15:34:12'),(51,'marketing','Departamento de marketing',1,'2018-03-01 07:28:39','2018-03-01 07:28:39'),(52,'marketingBoss','Jefe del departamento de marketing',1,'2018-03-01 07:28:57','2018-03-01 07:28:57'),(53,'insurance','Gestor de seguros de cambio',0,'2018-03-05 07:44:35','2019-02-01 13:47:57'),(54,'itemPicker','Sacador en cámara',1,'2018-03-05 12:08:17','2018-03-05 12:08:17'),(55,'itemPickerBoss','Jefe de sacadores',1,'2018-03-05 12:08:31','2018-03-05 12:08:31'),(56,'delivery','Personal de reparto',1,'2018-05-30 06:07:02','2018-05-30 06:07:02'),(57,'deliveryBoss','Jefe de personal de reparto',1,'2018-05-30 06:07:19','2018-05-30 06:07:19'),(58,'packager','Departamento encajadores',1,'2019-01-21 12:43:45','2019-01-21 12:43:45'),(59,'packagerBoss','Jefe departamento encajadores',1,'2019-01-21 12:44:10','2019-01-21 12:44:10'),(60,'productionAssi','Tareas relacionadas con producción y administración',1,'2019-01-29 13:29:01','2019-01-29 13:29:01'),(61,'replenisherBos','Jefe de Complementos/Camara',1,'2019-07-01 06:44:07','2019-07-01 06:44:07'),(62,'noLogin','Role without login access to MySQL',0,'2019-07-01 06:50:19','2019-07-02 13:42:05'),(64,'balanceSheet','Consulta de Balance',0,'2019-07-16 12:12:08','2019-07-16 12:12:08'),(65,'officeBoss','Jefe de filial',1,'2019-08-02 06:54:26','2019-08-02 06:54:26'),(66,'sysadmin','Administrador de sistema',1,'2019-08-08 06:58:56','2019-08-08 06:58:56'),(67,'adminOfficer','categoria profesional oficial de administración',1,'2020-01-03 08:09:23','2020-01-03 08:09:23'),(69,'coolerAssist','Empleado cámara con permiso compras',1,'2020-02-05 12:36:09','2020-02-05 12:36:09');
 /*!40000 ALTER TABLE `role` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -71,7 +71,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `roleInherit` WRITE;
 /*!40000 ALTER TABLE `roleInherit` DISABLE KEYS */;
-INSERT INTO `roleInherit` VALUES (9,0),(66,0),(5,1),(13,1),(18,1),(31,1),(32,1),(34,1),(35,1),(37,1),(40,1),(42,1),(44,1),(47,1),(51,1),(53,1),(54,1),(56,1),(58,1),(1,2),(1,3),(30,5),(39,5),(60,5),(67,5),(11,6),(1,11),(2,11),(3,11),(16,13),(20,13),(21,13),(22,13),(34,13),(41,13),(43,13),(45,13),(48,13),(50,13),(52,13),(55,13),(57,13),(59,13),(61,13),(16,15),(20,16),(21,18),(52,19),(65,19),(17,20),(30,20),(5,21),(19,21),(22,21),(39,21),(30,22),(5,33),(34,33),(15,35),(41,35),(52,35),(65,35),(49,36),(61,36),(17,37),(38,37),(60,37),(67,37),(17,39),(41,40),(43,42),(36,44),(45,44),(36,47),(48,47),(50,49),(60,50),(65,50),(52,51),(21,53),(30,53),(55,54),(57,56),(15,57),(39,57),(50,57),(60,57),(49,58),(59,58),(50,59),(17,64),(30,64),(38,64),(20,65);
+INSERT INTO `roleInherit` VALUES (9,0),(66,0),(5,1),(13,1),(18,1),(31,1),(32,1),(34,1),(35,1),(37,1),(40,1),(42,1),(44,1),(47,1),(51,1),(53,1),(54,1),(56,1),(58,1),(1,2),(1,3),(30,5),(39,5),(60,5),(67,5),(11,6),(1,11),(2,11),(3,11),(16,13),(20,13),(21,13),(22,13),(34,13),(41,13),(43,13),(45,13),(48,13),(50,13),(52,13),(55,13),(57,13),(59,13),(61,13),(16,15),(20,16),(21,18),(52,19),(65,19),(17,20),(30,20),(5,21),(19,21),(22,21),(39,21),(30,22),(5,33),(34,33),(15,35),(41,35),(52,35),(65,35),(69,35),(49,36),(61,36),(17,37),(38,37),(60,37),(67,37),(17,39),(41,40),(43,42),(36,44),(45,44),(36,47),(48,47),(69,47),(50,49),(60,50),(65,50),(52,51),(21,53),(30,53),(55,54),(57,56),(15,57),(39,57),(50,57),(60,57),(49,58),(59,58),(50,59),(17,64),(30,64),(38,64),(20,65);
 /*!40000 ALTER TABLE `roleInherit` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -81,7 +81,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `roleRole` WRITE;
 /*!40000 ALTER TABLE `roleRole` DISABLE KEYS */;
-INSERT INTO `roleRole` VALUES (0,0),(0,1),(0,2),(0,3),(0,5),(0,6),(0,9),(0,11),(0,13),(0,15),(0,16),(0,17),(0,18),(0,19),(0,20),(0,21),(0,22),(0,30),(0,31),(0,32),(0,33),(0,34),(0,35),(0,36),(0,37),(0,38),(0,39),(0,40),(0,41),(0,42),(0,43),(0,44),(0,45),(0,47),(0,48),(0,49),(0,50),(0,51),(0,52),(0,53),(0,54),(0,55),(0,56),(0,57),(0,58),(0,59),(0,60),(0,61),(0,62),(0,64),(0,65),(0,66),(0,67),(1,1),(1,2),(1,3),(1,6),(1,11),(2,2),(2,6),(2,11),(3,3),(3,6),(3,11),(5,1),(5,2),(5,3),(5,5),(5,6),(5,11),(5,13),(5,18),(5,21),(5,33),(5,53),(6,6),(9,0),(9,1),(9,2),(9,3),(9,5),(9,6),(9,9),(9,11),(9,13),(9,15),(9,16),(9,17),(9,18),(9,19),(9,20),(9,21),(9,22),(9,30),(9,31),(9,32),(9,33),(9,34),(9,35),(9,36),(9,37),(9,38),(9,39),(9,40),(9,41),(9,42),(9,43),(9,44),(9,45),(9,47),(9,48),(9,49),(9,50),(9,51),(9,52),(9,53),(9,54),(9,55),(9,56),(9,57),(9,58),(9,59),(9,60),(9,61),(9,62),(9,64),(9,65),(9,66),(9,67),(11,6),(11,11),(13,1),(13,2),(13,3),(13,6),(13,11),(13,13),(15,1),(15,2),(15,3),(15,6),(15,11),(15,13),(15,15),(15,35),(15,56),(15,57),(16,1),(16,2),(16,3),(16,6),(16,11),(16,13),(16,15),(16,16),(16,35),(16,56),(16,57),(17,1),(17,2),(17,3),(17,5),(17,6),(17,11),(17,13),(17,15),(17,16),(17,17),(17,18),(17,19),(17,20),(17,21),(17,33),(17,35),(17,36),(17,37),(17,39),(17,44),(17,47),(17,49),(17,50),(17,53),(17,56),(17,57),(17,58),(17,59),(17,64),(17,65),(18,1),(18,2),(18,3),(18,6),(18,11),(18,18),(19,1),(19,2),(19,3),(19,6),(19,11),(19,13),(19,18),(19,19),(19,21),(19,53),(20,1),(20,2),(20,3),(20,6),(20,11),(20,13),(20,15),(20,16),(20,18),(20,19),(20,20),(20,21),(20,35),(20,36),(20,44),(20,47),(20,49),(20,50),(20,53),(20,56),(20,57),(20,58),(20,59),(20,65),(21,1),(21,2),(21,3),(21,6),(21,11),(21,13),(21,18),(21,21),(21,53),(22,1),(22,2),(22,3),(22,6),(22,11),(22,13),(22,18),(22,21),(22,22),(22,53),(30,1),(30,2),(30,3),(30,5),(30,6),(30,11),(30,13),(30,15),(30,16),(30,18),(30,19),(30,20),(30,21),(30,22),(30,30),(30,33),(30,35),(30,36),(30,44),(30,47),(30,49),(30,50),(30,53),(30,56),(30,57),(30,58),(30,59),(30,64),(30,65),(31,1),(31,2),(31,3),(31,6),(31,11),(31,31),(32,1),(32,2),(32,3),(32,6),(32,11),(32,32),(33,33),(34,1),(34,2),(34,3),(34,6),(34,11),(34,13),(34,33),(34,34),(35,1),(35,2),(35,3),(35,6),(35,11),(35,35),(36,1),(36,2),(36,3),(36,6),(36,11),(36,36),(36,44),(36,47),(37,1),(37,2),(37,3),(37,6),(37,11),(37,37),(38,1),(38,2),(38,3),(38,6),(38,11),(38,37),(38,38),(38,64),(39,1),(39,2),(39,3),(39,5),(39,6),(39,11),(39,13),(39,18),(39,21),(39,33),(39,39),(39,53),(39,56),(39,57),(40,1),(40,2),(40,3),(40,6),(40,11),(40,40),(41,1),(41,2),(41,3),(41,6),(41,11),(41,13),(41,35),(41,40),(41,41),(42,1),(42,2),(42,3),(42,6),(42,11),(42,42),(43,1),(43,2),(43,3),(43,6),(43,11),(43,13),(43,42),(43,43),(44,1),(44,2),(44,3),(44,6),(44,11),(44,44),(45,1),(45,2),(45,3),(45,6),(45,11),(45,13),(45,44),(45,45),(47,1),(47,2),(47,3),(47,6),(47,11),(47,47),(48,1),(48,2),(48,3),(48,6),(48,11),(48,13),(48,47),(48,48),(49,1),(49,2),(49,3),(49,6),(49,11),(49,36),(49,44),(49,47),(49,49),(49,58),(50,1),(50,2),(50,3),(50,6),(50,11),(50,13),(50,36),(50,44),(50,47),(50,49),(50,50),(50,56),(50,57),(50,58),(50,59),(51,1),(51,2),(51,3),(51,6),(51,11),(51,51),(52,1),(52,2),(52,3),(52,6),(52,11),(52,13),(52,18),(52,19),(52,21),(52,35),(52,51),(52,52),(52,53),(53,1),(53,2),(53,3),(53,6),(53,11),(53,53),(54,1),(54,2),(54,3),(54,6),(54,11),(54,54),(55,1),(55,2),(55,3),(55,6),(55,11),(55,13),(55,54),(55,55),(56,1),(56,2),(56,3),(56,6),(56,11),(56,56),(57,1),(57,2),(57,3),(57,6),(57,11),(57,13),(57,56),(57,57),(58,1),(58,2),(58,3),(58,6),(58,11),(58,58),(59,1),(59,2),(59,3),(59,6),(59,11),(59,13),(59,58),(59,59),(60,1),(60,2),(60,3),(60,5),(60,6),(60,11),(60,13),(60,18),(60,21),(60,33),(60,36),(60,37),(60,44),(60,47),(60,49),(60,50),(60,53),(60,56),(60,57),(60,58),(60,59),(60,60),(61,1),(61,2),(61,3),(61,6),(61,11),(61,13),(61,36),(61,44),(61,47),(61,61),(62,62),(64,64),(65,1),(65,2),(65,3),(65,6),(65,11),(65,13),(65,18),(65,19),(65,21),(65,35),(65,36),(65,44),(65,47),(65,49),(65,50),(65,53),(65,56),(65,57),(65,58),(65,59),(65,65),(66,0),(66,1),(66,2),(66,3),(66,5),(66,6),(66,9),(66,11),(66,13),(66,15),(66,16),(66,17),(66,18),(66,19),(66,20),(66,21),(66,22),(66,30),(66,31),(66,32),(66,33),(66,34),(66,35),(66,36),(66,37),(66,38),(66,39),(66,40),(66,41),(66,42),(66,43),(66,44),(66,45),(66,47),(66,48),(66,49),(66,50),(66,51),(66,52),(66,53),(66,54),(66,55),(66,56),(66,57),(66,58),(66,59),(66,60),(66,61),(66,62),(66,64),(66,65),(66,66),(66,67),(67,1),(67,2),(67,3),(67,5),(67,6),(67,11),(67,13),(67,18),(67,21),(67,33),(67,37),(67,53),(67,67);
+INSERT INTO `roleRole` VALUES (0,0),(0,1),(0,2),(0,3),(0,5),(0,6),(0,9),(0,11),(0,13),(0,15),(0,16),(0,17),(0,18),(0,19),(0,20),(0,21),(0,22),(0,30),(0,31),(0,32),(0,33),(0,34),(0,35),(0,36),(0,37),(0,38),(0,39),(0,40),(0,41),(0,42),(0,43),(0,44),(0,45),(0,47),(0,48),(0,49),(0,50),(0,51),(0,52),(0,53),(0,54),(0,55),(0,56),(0,57),(0,58),(0,59),(0,60),(0,61),(0,62),(0,64),(0,65),(0,66),(0,67),(0,69),(1,1),(1,2),(1,3),(1,6),(1,11),(2,2),(2,6),(2,11),(3,3),(3,6),(3,11),(5,1),(5,2),(5,3),(5,5),(5,6),(5,11),(5,13),(5,18),(5,21),(5,33),(5,53),(6,6),(9,0),(9,1),(9,2),(9,3),(9,5),(9,6),(9,9),(9,11),(9,13),(9,15),(9,16),(9,17),(9,18),(9,19),(9,20),(9,21),(9,22),(9,30),(9,31),(9,32),(9,33),(9,34),(9,35),(9,36),(9,37),(9,38),(9,39),(9,40),(9,41),(9,42),(9,43),(9,44),(9,45),(9,47),(9,48),(9,49),(9,50),(9,51),(9,52),(9,53),(9,54),(9,55),(9,56),(9,57),(9,58),(9,59),(9,60),(9,61),(9,62),(9,64),(9,65),(9,66),(9,67),(9,69),(11,6),(11,11),(13,1),(13,2),(13,3),(13,6),(13,11),(13,13),(15,1),(15,2),(15,3),(15,6),(15,11),(15,13),(15,15),(15,35),(15,56),(15,57),(16,1),(16,2),(16,3),(16,6),(16,11),(16,13),(16,15),(16,16),(16,35),(16,56),(16,57),(17,1),(17,2),(17,3),(17,5),(17,6),(17,11),(17,13),(17,15),(17,16),(17,17),(17,18),(17,19),(17,20),(17,21),(17,33),(17,35),(17,36),(17,37),(17,39),(17,44),(17,47),(17,49),(17,50),(17,53),(17,56),(17,57),(17,58),(17,59),(17,64),(17,65),(18,1),(18,2),(18,3),(18,6),(18,11),(18,18),(19,1),(19,2),(19,3),(19,6),(19,11),(19,13),(19,18),(19,19),(19,21),(19,53),(20,1),(20,2),(20,3),(20,6),(20,11),(20,13),(20,15),(20,16),(20,18),(20,19),(20,20),(20,21),(20,35),(20,36),(20,44),(20,47),(20,49),(20,50),(20,53),(20,56),(20,57),(20,58),(20,59),(20,65),(21,1),(21,2),(21,3),(21,6),(21,11),(21,13),(21,18),(21,21),(21,53),(22,1),(22,2),(22,3),(22,6),(22,11),(22,13),(22,18),(22,21),(22,22),(22,53),(30,1),(30,2),(30,3),(30,5),(30,6),(30,11),(30,13),(30,15),(30,16),(30,18),(30,19),(30,20),(30,21),(30,22),(30,30),(30,33),(30,35),(30,36),(30,44),(30,47),(30,49),(30,50),(30,53),(30,56),(30,57),(30,58),(30,59),(30,64),(30,65),(31,1),(31,2),(31,3),(31,6),(31,11),(31,31),(32,1),(32,2),(32,3),(32,6),(32,11),(32,32),(33,33),(34,1),(34,2),(34,3),(34,6),(34,11),(34,13),(34,33),(34,34),(35,1),(35,2),(35,3),(35,6),(35,11),(35,35),(36,1),(36,2),(36,3),(36,6),(36,11),(36,36),(36,44),(36,47),(37,1),(37,2),(37,3),(37,6),(37,11),(37,37),(38,1),(38,2),(38,3),(38,6),(38,11),(38,37),(38,38),(38,64),(39,1),(39,2),(39,3),(39,5),(39,6),(39,11),(39,13),(39,18),(39,21),(39,33),(39,39),(39,53),(39,56),(39,57),(40,1),(40,2),(40,3),(40,6),(40,11),(40,40),(41,1),(41,2),(41,3),(41,6),(41,11),(41,13),(41,35),(41,40),(41,41),(42,1),(42,2),(42,3),(42,6),(42,11),(42,42),(43,1),(43,2),(43,3),(43,6),(43,11),(43,13),(43,42),(43,43),(44,1),(44,2),(44,3),(44,6),(44,11),(44,44),(45,1),(45,2),(45,3),(45,6),(45,11),(45,13),(45,44),(45,45),(47,1),(47,2),(47,3),(47,6),(47,11),(47,47),(48,1),(48,2),(48,3),(48,6),(48,11),(48,13),(48,47),(48,48),(49,1),(49,2),(49,3),(49,6),(49,11),(49,36),(49,44),(49,47),(49,49),(49,58),(50,1),(50,2),(50,3),(50,6),(50,11),(50,13),(50,36),(50,44),(50,47),(50,49),(50,50),(50,56),(50,57),(50,58),(50,59),(51,1),(51,2),(51,3),(51,6),(51,11),(51,51),(52,1),(52,2),(52,3),(52,6),(52,11),(52,13),(52,18),(52,19),(52,21),(52,35),(52,51),(52,52),(52,53),(53,1),(53,2),(53,3),(53,6),(53,11),(53,53),(54,1),(54,2),(54,3),(54,6),(54,11),(54,54),(55,1),(55,2),(55,3),(55,6),(55,11),(55,13),(55,54),(55,55),(56,1),(56,2),(56,3),(56,6),(56,11),(56,56),(57,1),(57,2),(57,3),(57,6),(57,11),(57,13),(57,56),(57,57),(58,1),(58,2),(58,3),(58,6),(58,11),(58,58),(59,1),(59,2),(59,3),(59,6),(59,11),(59,13),(59,58),(59,59),(60,1),(60,2),(60,3),(60,5),(60,6),(60,11),(60,13),(60,18),(60,21),(60,33),(60,36),(60,37),(60,44),(60,47),(60,49),(60,50),(60,53),(60,56),(60,57),(60,58),(60,59),(60,60),(61,1),(61,2),(61,3),(61,6),(61,11),(61,13),(61,36),(61,44),(61,47),(61,61),(62,62),(64,64),(65,1),(65,2),(65,3),(65,6),(65,11),(65,13),(65,18),(65,19),(65,21),(65,35),(65,36),(65,44),(65,47),(65,49),(65,50),(65,53),(65,56),(65,57),(65,58),(65,59),(65,65),(66,0),(66,1),(66,2),(66,3),(66,5),(66,6),(66,9),(66,11),(66,13),(66,15),(66,16),(66,17),(66,18),(66,19),(66,20),(66,21),(66,22),(66,30),(66,31),(66,32),(66,33),(66,34),(66,35),(66,36),(66,37),(66,38),(66,39),(66,40),(66,41),(66,42),(66,43),(66,44),(66,45),(66,47),(66,48),(66,49),(66,50),(66,51),(66,52),(66,53),(66,54),(66,55),(66,56),(66,57),(66,58),(66,59),(66,60),(66,61),(66,62),(66,64),(66,65),(66,66),(66,67),(66,69),(67,1),(67,2),(67,3),(67,5),(67,6),(67,11),(67,13),(67,18),(67,21),(67,33),(67,37),(67,53),(67,67),(69,1),(69,2),(69,3),(69,6),(69,11),(69,35),(69,47),(69,69);
 /*!40000 ALTER TABLE `roleRole` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -94,7 +94,7 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-01-23 14:05:01
+-- Dump completed on 2020-02-12 13:30:39
 USE `salix`;
 -- MySQL dump 10.13  Distrib 5.7.28, for osx10.15 (x86_64)
 --
@@ -119,7 +119,7 @@ USE `salix`;
 
 LOCK TABLES `ACL` WRITE;
 /*!40000 ALTER TABLE `ACL` DISABLE KEYS */;
-INSERT INTO `ACL` VALUES (1,'Account','*','*','ALLOW','ROLE','employee'),(3,'Address','*','*','ALLOW','ROLE','employee'),(5,'AgencyService','*','READ','ALLOW','ROLE','employee'),(7,'Client','*','*','ALLOW','ROLE','employee'),(9,'ClientObservation','*','*','ALLOW','ROLE','employee'),(11,'ContactChannel','*','READ','ALLOW','ROLE','employee'),(13,'Employee','*','READ','ALLOW','ROLE','employee'),(14,'PayMethod','*','READ','ALLOW','ROLE','employee'),(16,'FakeProduction','*','READ','ALLOW','ROLE','employee'),(17,'Warehouse','* ','READ','ALLOW','ROLE','employee'),(18,'State','*','READ','ALLOW','ROLE','employee'),(20,'TicketState','*','*','ALLOW','ROLE','employee'),(24,'Delivery','*','READ','ALLOW','ROLE','employee'),(25,'Zone','*','READ','ALLOW','ROLE','employee'),(26,'ClientCredit','*','*','ALLOW','ROLE','employee'),(27,'ClientCreditLimit','*','READ','ALLOW','ROLE','employee'),(30,'GreugeType','*','READ','ALLOW','ROLE','employee'),(31,'Mandate','*','READ','ALLOW','ROLE','employee'),(32,'MandateType','*','READ','ALLOW','ROLE','employee'),(33,'Company','*','READ','ALLOW','ROLE','employee'),(34,'Greuge','*','READ','ALLOW','ROLE','employee'),(35,'AddressObservation','*','*','ALLOW','ROLE','employee'),(36,'ObservationType','*','*','ALLOW','ROLE','employee'),(37,'Greuge','*','WRITE','ALLOW','ROLE','employee'),(38,'AgencyMode','*','READ','ALLOW','ROLE','employee'),(39,'ItemTag','*','WRITE','ALLOW','ROLE','buyer'),(40,'ItemBotanical','*','WRITE','ALLOW','ROLE','buyer'),(41,'ItemBotanical','*','READ','ALLOW','ROLE','employee'),(42,'ItemPlacement','*','WRITE','ALLOW','ROLE','buyer'),(43,'ItemPlacement','*','WRITE','ALLOW','ROLE','replenisher'),(44,'ItemPlacement','*','READ','ALLOW','ROLE','employee'),(45,'ItemBarcode','*','READ','ALLOW','ROLE','employee'),(46,'ItemBarcode','*','WRITE','ALLOW','ROLE','buyer'),(47,'ItemBarcode','*','WRITE','ALLOW','ROLE','replenisher'),(48,'ItemNiche','*','READ','ALLOW','ROLE','employee'),(49,'ItemNiche','*','WRITE','ALLOW','ROLE','buyer'),(50,'ItemNiche','*','WRITE','ALLOW','ROLE','replenisher'),(51,'ItemTag','*','READ','ALLOW','ROLE','employee'),(53,'Item','*','READ','ALLOW','ROLE','employee'),(54,'Item','*','WRITE','ALLOW','ROLE','buyer'),(55,'Recovery','*','READ','ALLOW','ROLE','employee'),(56,'Recovery','*','WRITE','ALLOW','ROLE','administrative'),(58,'CreditClassification','*','*','ALLOW','ROLE','insurance'),(60,'CreditInsurance','*','*','ALLOW','ROLE','insurance'),(61,'InvoiceOut','*','READ','ALLOW','ROLE','employee'),(62,'Ticket','*','*','ALLOW','ROLE','employee'),(63,'TicketObservation','*','*','ALLOW','ROLE','employee'),(64,'Route','*','READ','ALLOW','ROLE','employee'),(65,'Sale','*','READ','ALLOW','ROLE','employee'),(66,'TicketTracking','*','READ','ALLOW','ROLE','employee'),(68,'TicketPackaging','*','*','ALLOW','ROLE','employee'),(69,'Packaging','*','READ','ALLOW','ROLE','employee'),(70,'Packaging','*','WRITE','ALLOW','ROLE','logistic'),(71,'SaleChecked','*','READ','ALLOW','ROLE','employee'),(72,'SaleComponent','*','READ','ALLOW','ROLE','employee'),(73,'Expedition','*','READ','ALLOW','ROLE','employee'),(74,'Expedition','*','WRITE','ALLOW','ROLE','deliveryBoss'),(75,'Expedition','*','WRITE','ALLOW','ROLE','production'),(76,'AnnualAverageInvoiced','*','READ','ALLOW','ROLE','employee'),(77,'WorkerMana','*','READ','ALLOW','ROLE','employee'),(78,'TicketTracking','*','WRITE','ALLOW','ROLE','production'),(79,'TicketTracking','changeState','*','ALLOW','ROLE','employee'),(80,'Sale','removes','*','ALLOW','ROLE','employee'),(81,'Sale','moveToTicket','*','ALLOW','ROLE','employee'),(82,'Sale','updateQuantity','*','ALLOW','ROLE','employee'),(83,'Sale','updatePrice','*','ALLOW','ROLE','employee'),(84,'Sale','updateDiscount','*','ALLOW','ROLE','employee'),(85,'SaleTracking','*','READ','ALLOW','ROLE','employee'),(86,'Order','*','*','ALLOW','ROLE','employee'),(87,'OrderRow','*','*','ALLOW','ROLE','employee'),(88,'ClientContact','*','*','ALLOW','ROLE','employee'),(89,'Sale','moveToNewTicket','*','ALLOW','ROLE','employee'),(90,'Sale','reserve','*','ALLOW','ROLE','employee'),(91,'TicketWeekly','*','*','ALLOW','ROLE','employee'),(94,'Agency','landsThatDay','*','ALLOW','ROLE','employee'),(96,'ClaimEnd','*','READ','ALLOW','ROLE','employee'),(97,'ClaimEnd','*','WRITE','ALLOW','ROLE','salesAssistant'),(98,'ClaimBeginning','*','*','ALLOW','ROLE','employee'),(99,'ClaimDevelopment','*','READ','ALLOW','ROLE','employee'),(100,'ClaimDevelopment','*','WRITE','ALLOW','ROLE','salesAssistant'),(101,'Claim','*','*','ALLOW','ROLE','employee'),(102,'Claim','createFromSales','*','ALLOW','ROLE','employee'),(103,'ClaimEnd','importTicketSales','WRITE','ALLOW','ROLE','salesAssistant'),(104,'Item','*','WRITE','ALLOW','ROLE','marketingBoss'),(105,'ItemBarcode','*','WRITE','ALLOW','ROLE','marketingBoss'),(106,'ItemBotanical','*','WRITE','ALLOW','ROLE','marketingBoss'),(107,'ItemNiche','*','WRITE','ALLOW','ROLE','marketingBoss'),(108,'ItemPlacement','*','WRITE','ALLOW','ROLE','marketingBoss'),(109,'UserConfig','*','*','ALLOW','ROLE','employee'),(110,'Bank','*','READ','ALLOW','ROLE','employee'),(111,'ClientLog','*','READ','ALLOW','ROLE','employee'),(112,'Defaulter','*','READ','ALLOW','ROLE','employee'),(113,'ClientRisk','*','READ','ALLOW','ROLE','employee'),(114,'Receipt','*','READ','ALLOW','ROLE','employee'),(115,'Receipt','*','WRITE','ALLOW','ROLE','administrative'),(116,'BankEntity','*','*','ALLOW','ROLE','employee'),(117,'ClientSample','*','*','ALLOW','ROLE','employee'),(118,'WorkerTeam','*','*','ALLOW','ROLE','salesPerson'),(119,'Travel','*','READ','ALLOW','ROLE','employee'),(120,'Travel','*','WRITE','ALLOW','ROLE','buyer'),(121,'Item','regularize','*','ALLOW','ROLE','employee'),(122,'TicketRequest','*','*','ALLOW','ROLE','employee'),(123,'Worker','*','*','ALLOW','ROLE','employee'),(124,'Client','confirmTransaction','WRITE','ALLOW','ROLE','administrative'),(125,'Agency','getAgenciesWithWarehouse','*','ALLOW','ROLE','employee'),(126,'Client','activeWorkersWithRole','*','ALLOW','ROLE','employee'),(127,'TicketLog','*','READ','ALLOW','ROLE','employee'),(129,'TicketService','*','*','ALLOW','ROLE','employee'),(130,'Expedition','*','WRITE','ALLOW','ROLE','packager'),(131,'CreditInsurance','*','READ','ALLOW','ROLE','employee'),(132,'CreditClassification','*','READ','ALLOW','ROLE','employee'),(133,'ItemTag','*','WRITE','ALLOW','ROLE','marketingBoss'),(135,'ZoneGeo','*','READ','ALLOW','ROLE','employee'),(136,'ZoneCalendar','*','READ','ALLOW','ROLE','employee'),(137,'ZoneIncluded','*','READ','ALLOW','ROLE','employee'),(138,'LabourHoliday','*','READ','ALLOW','ROLE','employee'),(139,'LabourHolidayLegend','*','READ','ALLOW','ROLE','employee'),(140,'LabourHolidayType','*','READ','ALLOW','ROLE','employee'),(141,'Zone','*','*','ALLOW','ROLE','deliveryBoss'),(142,'ZoneCalendar','*','WRITE','ALLOW','ROLE','deliveryBoss'),(143,'ZoneIncluded','*','*','ALLOW','ROLE','deliveryBoss'),(144,'Stowaway','*','*','ALLOW','ROLE','employee'),(145,'Ticket','getPossibleStowaways','READ','ALLOW','ROLE','employee'),(147,'UserConfigView','*','*','ALLOW','ROLE','employee'),(148,'UserConfigView','*','*','ALLOW','ROLE','employee'),(149,'Sip','*','READ','ALLOW','ROLE','employee'),(150,'Sip','*','WRITE','ALLOW','ROLE','hr'),(151,'Department','*','READ','ALLOW','ROLE','employee'),(152,'Department','*','WRITE','ALLOW','ROLE','hr'),(153,'Route','*','READ','ALLOW','ROLE','employee'),(154,'Route','*','WRITE','ALLOW','ROLE','delivery'),(155,'WorkerCalendar','*','READ','ALLOW','ROLE','hr'),(156,'WorkerLabour','*','READ','ALLOW','ROLE','hr'),(157,'WorkerCalendar','absences','READ','ALLOW','ROLE','employee'),(158,'ItemTag','*','WRITE','ALLOW','ROLE','accessory'),(160,'TicketServiceType','*','READ','ALLOW','ROLE','employee'),(161,'TicketConfig','*','READ','ALLOW','ROLE','employee'),(162,'InvoiceOut','delete','WRITE','ALLOW','ROLE','invoicing'),(163,'InvoiceOut','book','WRITE','ALLOW','ROLE','invoicing'),(164,'InvoiceOut','regenerate','WRITE','ALLOW','ROLE','invoicing'),(165,'TicketDms','*','READ','ALLOW','ROLE','employee'),(167,'Worker','isSubordinate','READ','ALLOW','ROLE','employee'),(168,'Worker','mySubordinates','READ','ALLOW','ROLE','employee'),(169,'WorkerTimeControl','filter','READ','ALLOW','ROLE','employee'),(170,'WorkerTimeControl','addTime','WRITE','ALLOW','ROLE','employee'),(171,'TicketServiceType','*','WRITE','ALLOW','ROLE','administrative'),(172,'Sms','*','READ','ALLOW','ROLE','employee'),(173,'Sms','send','WRITE','ALLOW','ROLE','employee'),(174,'Agency','getLanded','READ','ALLOW','ROLE','employee'),(175,'Agency','getShipped','READ','ALLOW','ROLE','employee'),(176,'Device','*','*','ALLOW','ROLE','employee'),(177,'Device','*','*','ALLOW','ROLE','employee'),(178,'WorkerTimeControl','*','*','ALLOW','ROLE','employee'),(179,'ItemLog','*','READ','ALLOW','ROLE','employee'),(180,'RouteLog','*','READ','ALLOW','ROLE','employee'),(181,'Dms','removeFile','WRITE','ALLOW','ROLE','employee'),(182,'Dms','uploadFile','WRITE','ALLOW','ROLE','employee'),(183,'Dms','downloadFile','READ','ALLOW','ROLE','employee'),(184,'Client','uploadFile','WRITE','ALLOW','ROLE','employee'),(185,'ClientDms','removeFile','WRITE','ALLOW','ROLE','employee'),(186,'ClientDms','*','READ','ALLOW','ROLE','employee'),(187,'Ticket','uploadFile','WRITE','ALLOW','ROLE','employee'),(188,'TicketDms','removeFile','WRITE','ALLOW','ROLE','employee'),(189,'TicketDms','*','READ','ALLOW','ROLE','employee'),(190,'Route','updateVolume','WRITE','ALLOW','ROLE','deliveryBoss'),(191,'Agency','getLanded','READ','ALLOW','ROLE','employee'),(192,'Agency','getShipped','READ','ALLOW','ROLE','employee'),(194,'Postcode','*','WRITE','ALLOW','ROLE','employee'),(195,'Ticket','addSale','WRITE','ALLOW','ROLE','employee'),(196,'Dms','updateFile','WRITE','ALLOW','ROLE','employee'),(197,'Dms','*','READ','ALLOW','ROLE','employee'),(198,'ClaimDms','removeFile','WRITE','ALLOW','ROLE','employee'),(199,'ClaimDms','*','READ','ALLOW','ROLE','employee'),(200,'Claim','uploadFile','WRITE','ALLOW','ROLE','employee'),(201,'Sale','updateConcept','WRITE','ALLOW','ROLE','employee'),(202,'Claim','updateClaimAction','WRITE','ALLOW','ROLE','salesAssistant'),(203,'UserPhone','*','*','ALLOW','ROLE','employee'),(204,'WorkerDms','removeFile','WRITE','ALLOW','ROLE','hr'),(205,'WorkerDms','*','READ','ALLOW','ROLE','hr'),(206,'Chat','*','*','ALLOW','ROLE','employee'),(207,'Chat','sendMessage','*','ALLOW','ROLE','employee'),(208,'Sale','recalculatePrice','WRITE','ALLOW','ROLE','employee'),(209,'Ticket','recalculateComponents','WRITE','ALLOW','ROLE','employee'),(211,'TravelLog','*','READ','ALLOW','ROLE','buyer');
+INSERT INTO `ACL` VALUES (1,'Account','*','*','ALLOW','ROLE','employee'),(3,'Address','*','*','ALLOW','ROLE','employee'),(5,'AgencyService','*','READ','ALLOW','ROLE','employee'),(7,'Client','*','*','ALLOW','ROLE','employee'),(9,'ClientObservation','*','*','ALLOW','ROLE','employee'),(11,'ContactChannel','*','READ','ALLOW','ROLE','employee'),(13,'Employee','*','READ','ALLOW','ROLE','employee'),(14,'PayMethod','*','READ','ALLOW','ROLE','employee'),(16,'FakeProduction','*','READ','ALLOW','ROLE','employee'),(17,'Warehouse','* ','READ','ALLOW','ROLE','employee'),(18,'State','*','READ','ALLOW','ROLE','employee'),(20,'TicketState','*','*','ALLOW','ROLE','employee'),(24,'Delivery','*','READ','ALLOW','ROLE','employee'),(25,'Zone','*','READ','ALLOW','ROLE','employee'),(26,'ClientCredit','*','*','ALLOW','ROLE','employee'),(27,'ClientCreditLimit','*','READ','ALLOW','ROLE','employee'),(30,'GreugeType','*','READ','ALLOW','ROLE','employee'),(31,'Mandate','*','READ','ALLOW','ROLE','employee'),(32,'MandateType','*','READ','ALLOW','ROLE','employee'),(33,'Company','*','READ','ALLOW','ROLE','employee'),(34,'Greuge','*','READ','ALLOW','ROLE','employee'),(35,'AddressObservation','*','*','ALLOW','ROLE','employee'),(36,'ObservationType','*','*','ALLOW','ROLE','employee'),(37,'Greuge','*','WRITE','ALLOW','ROLE','employee'),(38,'AgencyMode','*','READ','ALLOW','ROLE','employee'),(39,'ItemTag','*','WRITE','ALLOW','ROLE','buyer'),(40,'ItemBotanical','*','WRITE','ALLOW','ROLE','buyer'),(41,'ItemBotanical','*','READ','ALLOW','ROLE','employee'),(42,'ItemPlacement','*','WRITE','ALLOW','ROLE','buyer'),(43,'ItemPlacement','*','WRITE','ALLOW','ROLE','replenisher'),(44,'ItemPlacement','*','READ','ALLOW','ROLE','employee'),(45,'ItemBarcode','*','READ','ALLOW','ROLE','employee'),(46,'ItemBarcode','*','WRITE','ALLOW','ROLE','buyer'),(47,'ItemBarcode','*','WRITE','ALLOW','ROLE','replenisher'),(48,'ItemNiche','*','READ','ALLOW','ROLE','employee'),(49,'ItemNiche','*','WRITE','ALLOW','ROLE','buyer'),(50,'ItemNiche','*','WRITE','ALLOW','ROLE','replenisher'),(51,'ItemTag','*','READ','ALLOW','ROLE','employee'),(53,'Item','*','READ','ALLOW','ROLE','employee'),(54,'Item','*','WRITE','ALLOW','ROLE','buyer'),(55,'Recovery','*','READ','ALLOW','ROLE','employee'),(56,'Recovery','*','WRITE','ALLOW','ROLE','administrative'),(58,'CreditClassification','*','*','ALLOW','ROLE','insurance'),(60,'CreditInsurance','*','*','ALLOW','ROLE','insurance'),(61,'InvoiceOut','*','READ','ALLOW','ROLE','employee'),(62,'Ticket','*','*','ALLOW','ROLE','employee'),(63,'TicketObservation','*','*','ALLOW','ROLE','employee'),(64,'Route','*','READ','ALLOW','ROLE','employee'),(65,'Sale','*','READ','ALLOW','ROLE','employee'),(66,'TicketTracking','*','READ','ALLOW','ROLE','employee'),(68,'TicketPackaging','*','*','ALLOW','ROLE','employee'),(69,'Packaging','*','READ','ALLOW','ROLE','employee'),(70,'Packaging','*','WRITE','ALLOW','ROLE','logistic'),(71,'SaleChecked','*','READ','ALLOW','ROLE','employee'),(72,'SaleComponent','*','READ','ALLOW','ROLE','employee'),(73,'Expedition','*','READ','ALLOW','ROLE','employee'),(74,'Expedition','*','WRITE','ALLOW','ROLE','deliveryBoss'),(75,'Expedition','*','WRITE','ALLOW','ROLE','production'),(76,'AnnualAverageInvoiced','*','READ','ALLOW','ROLE','employee'),(77,'WorkerMana','*','READ','ALLOW','ROLE','employee'),(78,'TicketTracking','*','WRITE','ALLOW','ROLE','production'),(79,'TicketTracking','changeState','*','ALLOW','ROLE','employee'),(80,'Sale','removes','*','ALLOW','ROLE','employee'),(81,'Sale','moveToTicket','*','ALLOW','ROLE','employee'),(82,'Sale','updateQuantity','*','ALLOW','ROLE','employee'),(83,'Sale','updatePrice','*','ALLOW','ROLE','employee'),(84,'Sale','updateDiscount','*','ALLOW','ROLE','employee'),(85,'SaleTracking','*','READ','ALLOW','ROLE','employee'),(86,'Order','*','*','ALLOW','ROLE','employee'),(87,'OrderRow','*','*','ALLOW','ROLE','employee'),(88,'ClientContact','*','*','ALLOW','ROLE','employee'),(89,'Sale','moveToNewTicket','*','ALLOW','ROLE','employee'),(90,'Sale','reserve','*','ALLOW','ROLE','employee'),(91,'TicketWeekly','*','READ','ALLOW','ROLE','employee'),(94,'Agency','landsThatDay','*','ALLOW','ROLE','employee'),(96,'ClaimEnd','*','READ','ALLOW','ROLE','employee'),(97,'ClaimEnd','*','WRITE','ALLOW','ROLE','salesAssistant'),(98,'ClaimBeginning','*','*','ALLOW','ROLE','employee'),(99,'ClaimDevelopment','*','READ','ALLOW','ROLE','employee'),(100,'ClaimDevelopment','*','WRITE','ALLOW','ROLE','salesAssistant'),(101,'Claim','*','*','ALLOW','ROLE','employee'),(102,'Claim','createFromSales','*','ALLOW','ROLE','employee'),(103,'ClaimEnd','importTicketSales','WRITE','ALLOW','ROLE','salesAssistant'),(104,'Item','*','WRITE','ALLOW','ROLE','marketingBoss'),(105,'ItemBarcode','*','WRITE','ALLOW','ROLE','marketingBoss'),(106,'ItemBotanical','*','WRITE','ALLOW','ROLE','marketingBoss'),(107,'ItemNiche','*','WRITE','ALLOW','ROLE','marketingBoss'),(108,'ItemPlacement','*','WRITE','ALLOW','ROLE','marketingBoss'),(109,'UserConfig','*','*','ALLOW','ROLE','employee'),(110,'Bank','*','READ','ALLOW','ROLE','employee'),(111,'ClientLog','*','READ','ALLOW','ROLE','employee'),(112,'Defaulter','*','READ','ALLOW','ROLE','employee'),(113,'ClientRisk','*','READ','ALLOW','ROLE','employee'),(114,'Receipt','*','READ','ALLOW','ROLE','employee'),(115,'Receipt','*','WRITE','ALLOW','ROLE','administrative'),(116,'BankEntity','*','*','ALLOW','ROLE','employee'),(117,'ClientSample','*','*','ALLOW','ROLE','employee'),(118,'WorkerTeam','*','*','ALLOW','ROLE','salesPerson'),(119,'Travel','*','READ','ALLOW','ROLE','employee'),(120,'Travel','*','WRITE','ALLOW','ROLE','buyer'),(121,'Item','regularize','*','ALLOW','ROLE','employee'),(122,'TicketRequest','*','*','ALLOW','ROLE','employee'),(123,'Worker','*','*','ALLOW','ROLE','employee'),(124,'Client','confirmTransaction','WRITE','ALLOW','ROLE','administrative'),(125,'Agency','getAgenciesWithWarehouse','*','ALLOW','ROLE','employee'),(126,'Client','activeWorkersWithRole','*','ALLOW','ROLE','employee'),(127,'TicketLog','*','READ','ALLOW','ROLE','employee'),(129,'TicketService','*','*','ALLOW','ROLE','employee'),(130,'Expedition','*','WRITE','ALLOW','ROLE','packager'),(131,'CreditInsurance','*','READ','ALLOW','ROLE','employee'),(132,'CreditClassification','*','READ','ALLOW','ROLE','employee'),(133,'ItemTag','*','WRITE','ALLOW','ROLE','marketingBoss'),(135,'ZoneGeo','*','READ','ALLOW','ROLE','employee'),(136,'ZoneCalendar','*','READ','ALLOW','ROLE','employee'),(137,'ZoneIncluded','*','READ','ALLOW','ROLE','employee'),(138,'LabourHoliday','*','READ','ALLOW','ROLE','employee'),(139,'LabourHolidayLegend','*','READ','ALLOW','ROLE','employee'),(140,'LabourHolidayType','*','READ','ALLOW','ROLE','employee'),(141,'Zone','*','*','ALLOW','ROLE','deliveryBoss'),(142,'ZoneCalendar','*','WRITE','ALLOW','ROLE','deliveryBoss'),(143,'ZoneIncluded','*','*','ALLOW','ROLE','deliveryBoss'),(144,'Stowaway','*','*','ALLOW','ROLE','employee'),(145,'Ticket','getPossibleStowaways','READ','ALLOW','ROLE','employee'),(147,'UserConfigView','*','*','ALLOW','ROLE','employee'),(148,'UserConfigView','*','*','ALLOW','ROLE','employee'),(149,'Sip','*','READ','ALLOW','ROLE','employee'),(150,'Sip','*','WRITE','ALLOW','ROLE','hr'),(151,'Department','*','READ','ALLOW','ROLE','employee'),(152,'Department','*','WRITE','ALLOW','ROLE','hr'),(153,'Route','*','READ','ALLOW','ROLE','employee'),(154,'Route','*','WRITE','ALLOW','ROLE','delivery'),(155,'WorkerCalendar','*','READ','ALLOW','ROLE','hr'),(156,'WorkerLabour','*','READ','ALLOW','ROLE','hr'),(157,'WorkerCalendar','absences','READ','ALLOW','ROLE','employee'),(158,'ItemTag','*','WRITE','ALLOW','ROLE','accessory'),(160,'TicketServiceType','*','READ','ALLOW','ROLE','employee'),(161,'TicketConfig','*','READ','ALLOW','ROLE','employee'),(162,'InvoiceOut','delete','WRITE','ALLOW','ROLE','invoicing'),(163,'InvoiceOut','book','WRITE','ALLOW','ROLE','invoicing'),(164,'InvoiceOut','regenerate','WRITE','ALLOW','ROLE','invoicing'),(165,'TicketDms','*','READ','ALLOW','ROLE','employee'),(167,'Worker','isSubordinate','READ','ALLOW','ROLE','employee'),(168,'Worker','mySubordinates','READ','ALLOW','ROLE','employee'),(169,'WorkerTimeControl','filter','READ','ALLOW','ROLE','employee'),(170,'WorkerTimeControl','addTime','WRITE','ALLOW','ROLE','employee'),(171,'TicketServiceType','*','WRITE','ALLOW','ROLE','administrative'),(172,'Sms','*','READ','ALLOW','ROLE','employee'),(173,'Sms','send','WRITE','ALLOW','ROLE','employee'),(174,'Agency','getLanded','READ','ALLOW','ROLE','employee'),(175,'Agency','getShipped','READ','ALLOW','ROLE','employee'),(176,'Device','*','*','ALLOW','ROLE','employee'),(177,'Device','*','*','ALLOW','ROLE','employee'),(178,'WorkerTimeControl','*','*','ALLOW','ROLE','employee'),(179,'ItemLog','*','READ','ALLOW','ROLE','employee'),(180,'RouteLog','*','READ','ALLOW','ROLE','employee'),(181,'Dms','removeFile','WRITE','ALLOW','ROLE','employee'),(182,'Dms','uploadFile','WRITE','ALLOW','ROLE','employee'),(183,'Dms','downloadFile','READ','ALLOW','ROLE','employee'),(184,'Client','uploadFile','WRITE','ALLOW','ROLE','employee'),(185,'ClientDms','removeFile','WRITE','ALLOW','ROLE','employee'),(186,'ClientDms','*','READ','ALLOW','ROLE','employee'),(187,'Ticket','uploadFile','WRITE','ALLOW','ROLE','employee'),(188,'TicketDms','removeFile','WRITE','ALLOW','ROLE','employee'),(189,'TicketDms','*','READ','ALLOW','ROLE','employee'),(190,'Route','updateVolume','WRITE','ALLOW','ROLE','deliveryBoss'),(191,'Agency','getLanded','READ','ALLOW','ROLE','employee'),(192,'Agency','getShipped','READ','ALLOW','ROLE','employee'),(194,'Postcode','*','WRITE','ALLOW','ROLE','employee'),(195,'Ticket','addSale','WRITE','ALLOW','ROLE','employee'),(196,'Dms','updateFile','WRITE','ALLOW','ROLE','employee'),(197,'Dms','*','READ','ALLOW','ROLE','employee'),(198,'ClaimDms','removeFile','WRITE','ALLOW','ROLE','employee'),(199,'ClaimDms','*','READ','ALLOW','ROLE','employee'),(200,'Claim','uploadFile','WRITE','ALLOW','ROLE','employee'),(201,'Sale','updateConcept','WRITE','ALLOW','ROLE','employee'),(202,'Claim','updateClaimAction','WRITE','ALLOW','ROLE','salesAssistant'),(203,'UserPhone','*','*','ALLOW','ROLE','employee'),(204,'WorkerDms','removeFile','WRITE','ALLOW','ROLE','hr'),(205,'WorkerDms','*','READ','ALLOW','ROLE','hr'),(206,'Chat','*','*','ALLOW','ROLE','employee'),(207,'Chat','sendMessage','*','ALLOW','ROLE','employee'),(208,'Sale','recalculatePrice','WRITE','ALLOW','ROLE','employee'),(209,'Ticket','recalculateComponents','WRITE','ALLOW','ROLE','employee'),(211,'TravelLog','*','READ','ALLOW','ROLE','buyer'),(212,'Thermograph','*','*','ALLOW','ROLE','buyer'),(213,'TravelThermograph','*','*','ALLOW','ROLE','buyer'),(214,'Entry','*','*','ALLOW','ROLE','buyer'),(215,'TicketWeekly','*','WRITE','ALLOW','ROLE','buyer'),(216,'TravelThermograph','*','READ','ALLOW','ROLE','employee');
 /*!40000 ALTER TABLE `ACL` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -142,7 +142,7 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-01-23 14:05:01
+-- Dump completed on 2020-02-12 13:30:39
 USE `vn`;
 -- MySQL dump 10.13  Distrib 5.7.28, for osx10.15 (x86_64)
 --
@@ -217,7 +217,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `pgc` WRITE;
 /*!40000 ALTER TABLE `pgc` DISABLE KEYS */;
-INSERT INTO `pgc` VALUES ('4722000000',0.00,'Importación Exento ',1,0,0,1),('4722000010',10.00,'Importación Reducido ',1,0,0,1),('4722000021',21.00,'Importación General ',1,0,0,1),('4770000001',8.00,'Reducido',1,1,1,1),('4770000002',0.00,'Extra-Community supply',3,1,0,2),('4770000004',4.00,'Super reducido',1,1,1,1),('4770000010',10.00,'Reducido',1,1,1,1),('4770000020',0.00,'Exento',7,1,1,1),('4770000021',21.00,'General',1,1,1,1),('4770000101',10.00,'Reducido ',1,1,1,1),('4770000108',8.00,'Reducido',1,1,1,1),('4770000110',1.40,'Rec. Eq. Reducido',1,0,0,1),('4770000215',21.00,'General',1,1,1,1),('4770000405',0.50,'Rec. Eq. Super Reducido',1,0,0,1),('4770000504',4.00,'Super reducido',1,1,1,1),('4770000521',5.20,'Rec. Eq. General',1,0,0,1),('4770000701',1.00,'Rec. Eq. Reducido',1,0,0,1),('4771000000',0.00,'Intra-Community supply',6,1,1,1),('4771000001',0.00,'Intra-Community services',7,1,1,1),('HolandaGEN',21.00,'General',1,0,0,1),('HolandaRED',9.00,'Reducido',1,0,0,1),('IGIC cero',0.00,'Cero',1,0,0,1),('IGIC gener',6.50,'General',1,0,0,1),('IGIC reduc',3.00,'Reducido',1,0,0,1);
+INSERT INTO `pgc` VALUES ('4722000000',0.00,'Importación Exento ',1,0,0,1,0),('4722000010',10.00,'Importación Reducido ',1,0,0,1,0),('4722000021',21.00,'Importación General ',1,0,0,1,0),('4770000001',8.00,'Reducido',1,1,1,1,0),('4770000002',0.00,'Extra-Community supply',3,1,0,2,0),('4770000004',4.00,'Super reducido',1,1,1,1,0),('4770000010',10.00,'Reducido',1,1,1,1,0),('4770000020',0.00,'Exento',7,1,1,1,0),('4770000021',21.00,'General',1,1,1,1,0),('4770000101',10.00,'Reducido ',1,1,1,1,0),('4770000108',8.00,'Reducido',1,1,1,1,0),('4770000110',1.40,'Rec. Eq. Reducido',1,0,0,1,1),('4770000215',21.00,'General',1,1,1,1,0),('4770000405',0.50,'Rec. Eq. Super Reducido',1,0,0,1,1),('4770000504',4.00,'Super reducido',1,1,1,1,0),('4770000521',5.20,'Rec. Eq. General',1,0,0,1,1),('4770000701',1.00,'Rec. Eq. Reducido',1,0,0,1,1),('4771000000',0.00,'Intra-Community supply',6,1,1,1,0),('4771000001',0.00,'Intra-Community services',7,1,1,1,0),('HolandaGEN',21.00,'General',1,0,0,1,0),('HolandaRED',9.00,'Reducido',1,0,0,1,0),('IGIC cero',0.00,'Cero',1,0,0,1,0),('IGIC gener',6.50,'General',1,0,0,1,0),('IGIC reduc',3.00,'Reducido',1,0,0,1,0);
 /*!40000 ALTER TABLE `pgc` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -307,7 +307,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `department` WRITE;
 /*!40000 ALTER TABLE `department` DISABLE KEYS */;
-INSERT INTO `department` VALUES (1,'VERDNATURA',1,2,763,0,NULL,NULL,NULL,0,0,0,0,NULL,'/'),(22,'COMPRAS',3,4,NULL,72,596,2,5,0,0,0,0,NULL,'/'),(23,'CAMARA',5,6,NULL,72,604,2,6,1,0,0,0,NULL,'/'),(31,'INFORMATICA',7,8,NULL,72,127,3,9,0,0,0,0,NULL,'/'),(34,'CONTABILIDAD',9,10,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/'),(35,'FINANZAS',11,12,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/'),(36,'LABORAL',13,14,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/'),(37,'PRODUCCION',15,24,NULL,72,230,3,11,0,0,0,4,NULL,'/'),(38,'SACADO',16,17,NULL,72,230,4,14,1,0,1,0,37,'/37/'),(39,'ENCAJADO',18,19,NULL,72,230,4,12,1,0,1,0,37,'/37/'),(41,'ADMINISTRACION',25,26,NULL,72,599,3,8,0,0,0,0,NULL,'/'),(43,'VENTAS',27,48,NULL,0,NULL,NULL,NULL,0,0,0,10,NULL,'/'),(44,'GERENCIA',49,50,NULL,72,300,2,7,0,0,0,0,NULL,'/'),(45,'LOGISTICA',51,52,NULL,72,596,3,19,0,0,0,0,NULL,'/'),(46,'REPARTO',20,21,NULL,72,659,3,10,0,0,1,0,37,'/37/'),(48,'ALMACENAJE',53,54,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/'),(49,'PROPIEDAD',55,56,NULL,72,1008,1,1,0,0,0,0,NULL,'/'),(52,'CARGA AEREA',57,58,NULL,72,163,4,28,0,0,0,0,NULL,'/'),(53,'MARKETING Y COMUNICACIÓN',59,60,NULL,72,1238,0,0,0,0,0,0,NULL,'/'),(54,'ORNAMENTALES',61,62,NULL,72,433,3,21,0,0,0,0,NULL,'/'),(55,'TALLER NATURAL',63,64,NULL,72,695,2,23,0,0,0,0,NULL,'/'),(56,'TALLER ARTIFICIAL',65,66,NULL,72,1780,2,24,0,0,0,0,NULL,'/'),(58,'CAMPOS',67,68,NULL,72,225,2,2,0,0,0,0,NULL,'/'),(59,'MANTENIMIENTO',69,70,NULL,72,1907,4,16,0,0,0,0,NULL,'/'),(60,'RECLAMACIONES',71,72,NULL,72,563,3,20,0,0,0,0,NULL,'/'),(61,'VNH',73,74,NULL,73,1297,3,17,0,0,0,0,NULL,'/'),(63,'VENTAS FRANCIA',28,29,NULL,72,277,2,27,0,0,1,0,43,'/43/'),(66,'VERDNAMADRID',75,76,NULL,72,163,3,18,0,0,0,0,NULL,'/'),(68,'COMPLEMENTOS',77,78,NULL,72,617,3,26,1,0,0,0,NULL,'/'),(69,'VERDNABARNA',79,80,NULL,74,432,3,22,0,0,0,0,NULL,'/'),(77,'PALETIZADO',22,23,NULL,72,230,4,15,1,0,1,0,37,'/37/'),(80,'EQUIPO J VALLES',30,31,NULL,72,693,3,4,0,0,1,0,43,'/43/'),(86,'LIMPIEZA',81,82,NULL,72,599,0,0,0,0,0,0,NULL,'/'),(89,'COORDINACION',83,84,NULL,0,NULL,NULL,NULL,1,0,0,0,NULL,'/'),(90,'TRAILER',85,86,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/'),(91,'ARTIFICIAL',87,88,NULL,0,NULL,NULL,NULL,1,0,0,0,NULL,'/'),(92,'EQUIPO SILVERIO',32,33,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/'),(93,'CONFECCION',89,90,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/'),(94,'EQUIPO J BROCAL',34,35,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/'),(95,'EQUIPO C ZAMBRANO',36,37,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/'),(96,'EQUIPO C LOPEZ',38,39,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/'),(97,'EQUIPO D SARRION',40,41,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/'),(98,'EQUIPO RODRIGO',42,43,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/'),(99,'EQUIPO  MANOLI',44,45,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/'),(101,'EQUIPO J IBAÑEZ',46,47,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/');
+INSERT INTO `department` VALUES (1,'VERDNATURA',1,2,763,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL),(22,'COMPRAS',3,4,NULL,72,596,2,5,0,0,0,0,NULL,'/',NULL),(23,'CAMARA',5,6,NULL,72,604,2,6,1,0,0,0,NULL,'/',NULL),(31,'INFORMATICA',7,8,NULL,72,127,3,9,0,0,0,0,NULL,'/','informatica'),(34,'CONTABILIDAD',9,10,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL),(35,'FINANZAS',11,12,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL),(36,'LABORAL',13,14,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL),(37,'PRODUCCION',15,24,NULL,72,230,3,11,0,0,0,4,NULL,'/',NULL),(38,'SACADO',16,17,NULL,72,230,4,14,1,0,1,0,37,'/37/',NULL),(39,'ENCAJADO',18,19,NULL,72,230,4,12,1,0,1,0,37,'/37/',NULL),(41,'ADMINISTRACION',25,26,NULL,72,599,3,8,0,0,0,0,NULL,'/',NULL),(43,'VENTAS',27,48,NULL,0,NULL,NULL,NULL,0,0,0,10,NULL,'/',NULL),(44,'GERENCIA',49,50,NULL,72,300,2,7,0,0,0,0,NULL,'/',NULL),(45,'LOGISTICA',51,52,NULL,72,596,3,19,0,0,0,0,NULL,'/',NULL),(46,'REPARTO',20,21,NULL,72,659,3,10,0,0,1,0,37,'/37/',NULL),(48,'ALMACENAJE',53,54,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL),(49,'PROPIEDAD',55,56,NULL,72,1008,1,1,0,0,0,0,NULL,'/',NULL),(52,'CARGA AEREA',57,58,NULL,72,163,4,28,0,0,0,0,NULL,'/',NULL),(53,'MARKETING Y COMUNICACIÓN',59,60,NULL,72,1238,0,0,0,0,0,0,NULL,'/',NULL),(54,'ORNAMENTALES',61,62,NULL,72,433,3,21,0,0,0,0,NULL,'/',NULL),(55,'TALLER NATURAL',63,64,NULL,72,695,2,23,0,0,0,0,NULL,'/',NULL),(56,'TALLER ARTIFICIAL',65,66,NULL,72,1780,2,24,0,0,0,0,NULL,'/',NULL),(58,'CAMPOS',67,68,NULL,72,225,2,2,0,0,0,0,NULL,'/',NULL),(59,'MANTENIMIENTO',69,70,NULL,72,1907,4,16,0,0,0,0,NULL,'/',NULL),(60,'RECLAMACIONES',71,72,NULL,72,563,3,20,0,0,0,0,NULL,'/',NULL),(61,'VNH',73,74,NULL,73,1297,3,17,0,0,0,0,NULL,'/',NULL),(63,'VENTAS FRANCIA',28,29,NULL,72,277,2,27,0,0,1,0,43,'/43/',NULL),(66,'VERDNAMADRID',75,76,NULL,72,163,3,18,0,0,0,0,NULL,'/',NULL),(68,'COMPLEMENTOS',77,78,NULL,72,617,3,26,1,0,0,0,NULL,'/',NULL),(69,'VERDNABARNA',79,80,NULL,74,432,3,22,0,0,0,0,NULL,'/',NULL),(77,'PALETIZADO',22,23,NULL,72,230,4,15,1,0,1,0,37,'/37/',NULL),(80,'EQUIPO J VALLES',30,31,NULL,72,693,3,4,0,0,1,0,43,'/43/','jvp_equipo'),(86,'LIMPIEZA',81,82,NULL,72,599,0,0,0,0,0,0,NULL,'/',NULL),(89,'COORDINACION',83,84,NULL,0,NULL,NULL,NULL,1,0,0,0,NULL,'/',NULL),(90,'TRAILER',85,86,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL),(91,'ARTIFICIAL',87,88,NULL,0,NULL,NULL,NULL,1,0,0,0,NULL,'/',NULL),(92,'EQUIPO SILVERIO',32,33,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','sdc_equipo'),(93,'CONFECCION',89,90,NULL,0,NULL,NULL,NULL,0,0,0,0,NULL,'/',NULL),(94,'EQUIPO J BROCAL',34,35,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','jes_equipo'),(95,'EQUIPO C ZAMBRANO',36,37,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','czg_equipo'),(96,'EQUIPO C LOPEZ',38,39,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','cla_equipo'),(97,'EQUIPO D SARRION',40,41,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','dsr_equipo'),(98,'EQUIPO RODRIGO',42,43,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','rhr_equipo'),(99,'EQUIPO  MANOLI',44,45,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','man_equipo'),(101,'EQUIPO J IBAÑEZ',46,47,NULL,0,NULL,NULL,NULL,0,0,1,0,43,'/43/','jmi_equipo');
 /*!40000 ALTER TABLE `department` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -340,7 +340,7 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-01-23 14:05:01
+-- Dump completed on 2020-02-12 13:30:40
 USE `cache`;
 -- MySQL dump 10.13  Distrib 5.7.28, for osx10.15 (x86_64)
 --
@@ -378,7 +378,7 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-01-23 14:05:01
+-- Dump completed on 2020-02-12 13:30:40
 USE `hedera`;
 -- MySQL dump 10.13  Distrib 5.7.28, for osx10.15 (x86_64)
 --
@@ -436,7 +436,7 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-01-23 14:05:01
+-- Dump completed on 2020-02-12 13:30:40
 USE `postgresql`;
 -- MySQL dump 10.13  Distrib 5.7.28, for osx10.15 (x86_64)
 --
@@ -491,7 +491,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `professional_category` WRITE;
 /*!40000 ALTER TABLE `professional_category` DISABLE KEYS */;
-INSERT INTO `professional_category` VALUES (1,'Mozos',5,1,27.5),(2,'Encargados',3,1,27.5),(4,'Comprador',3,1,27.5),(5,'Aux Administracion',NULL,1,27.5),(6,'Of Administracion',3,1,27.5),(7,'Jefe Administracion',2,1,27.5),(8,'Informatico',3,1,27.5),(9,'Directivo',1,0,27.5),(10,'Aux Ventas',4,1,27.5),(11,'Vendedor',4,1,27.5),(12,'Jefe de Ventas',4,0,27.5),(13,'Repartidor',5,1,27.5),(14,'Aprendices',NULL,1,27.5),(15,'Técnicos',2,1,27.5),(16,'Aux Florista',5,1,27.5),(17,'Florista',4,1,27.5),(18,'Jefe Floristas',2,1,27.5),(19,'Técnico marketing',3,1,27.5),(20,'Auxiliar marketing',4,1,27.5),(21,'Aux Informática',4,1,27.5),(22,'Peón agrícola',5,1,27.5),(23,'Oficial mantenimiento',4,1,27.5),(24,'Aux mantenimiento',5,1,27.5),(25,'Mozo Aeropuerto',5,1,27.5),(26,'Coordinador',2,1,27.5),(28,'Aux Logistica',4,1,27.5),(29,'Oficial Logistica',3,1,27.5),(30,'Subencargado',4,1,27.5);
+INSERT INTO `professional_category` VALUES (1,'Mozos',5,1,27.5),(2,'Encargados',3,1,27.5),(4,'Comprador',3,1,27.5),(5,'Aux Administracion',NULL,1,27.5),(6,'Of Administracion',3,1,27.5),(7,'Jefe Administracion',2,1,27.5),(8,'Informatico',3,1,27.5),(9,'Directivo',1,0,27.5),(10,'Aux Ventas',4,1,27.5),(11,'Vendedor',4,1,27.5),(12,'Jefe de Ventas',4,0,27.5),(13,'Repartidor',5,1,27.5),(14,'Aprendices',NULL,1,27.5),(15,'Técnicos',2,1,27.5),(16,'Aux Florista',5,1,27.5),(17,'Florista',4,1,27.5),(18,'Jefe Floristas',2,1,27.5),(19,'Técnico marketing',3,1,27.5),(20,'Auxiliar marketing',4,1,27.5),(21,'Aux Informática',4,1,27.5),(22,'Peón agrícola',5,1,27.5),(23,'Oficial mantenimiento',4,1,27.5),(24,'Aux mantenimiento',5,1,27.5),(25,'Mozo Aeropuerto',5,1,27.5),(26,'Coordinador',2,1,27.5),(28,'Aux Logistica',4,1,27.5),(29,'Oficial Logistica',3,1,27.5),(30,'Subencargado',4,1,27.5),(31,'Conductor +3500kg',NULL,1,NULL);
 /*!40000 ALTER TABLE `professional_category` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -511,7 +511,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `workcenter` WRITE;
 /*!40000 ALTER TABLE `workcenter` DISABLE KEYS */;
-INSERT INTO `workcenter` VALUES (1,'Silla',20,1027,1),(2,'Mercaflor',19,NULL,NULL),(3,'Marjales',26,20008,NULL),(4,'VNH',NULL,NULL,3),(5,'Madrid',28,2852,5),(6,'Vilassar',88,88031,2),(7,'Tenerife',NULL,NULL,10);
+INSERT INTO `workcenter` VALUES (1,'Silla',20,1030,1),(2,'Mercaflor',19,NULL,NULL),(3,'Marjales',26,20008,NULL),(4,'VNH',NULL,NULL,3),(5,'Madrid',28,2852,5),(6,'Vilassar',88,88031,2),(7,'Tenerife',NULL,NULL,10);
 /*!40000 ALTER TABLE `workcenter` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -524,4 +524,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-01-23 14:05:01
+-- Dump completed on 2020-02-12 13:30:40
diff --git a/db/dump/structure.sql b/db/dump/structure.sql
index c78730381..76756c9be 100644
--- a/db/dump/structure.sql
+++ b/db/dump/structure.sql
@@ -3217,7 +3217,7 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `comercialesCompleto__`(IN vWorker INT, vDate DATE)
 BEGIN
 
-CALL vn.subordinateGetList(vWorker);
+CALL vn.worker_GetHierarchy(vWorker);
 
 SELECT 
     c.Id_Cliente id_cliente,
@@ -3323,9 +3323,9 @@ FROM
     WHERE
         (c.Id_Trabajador = vWorker OR tr.boss = vWorker)
     GROUP BY Id_Cliente) dead ON dead.Id_Cliente = c.Id_Cliente
-    JOIN tmp.subordinate s ON s.workerFk = c.Id_Trabajador;
+    JOIN tmp.workerHierarchyList s ON s.workerFk = c.Id_Trabajador;
 
-DROP TEMPORARY TABLE tmp.subordinate;
+DROP TEMPORARY TABLE tmp.workerHierarchyList;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -3583,6 +3583,36 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 ALTER DATABASE `bs` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
+/*!50003 DROP PROCEDURE IF EXISTS `fruitsEvolution` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`z-developer`@`%` PROCEDURE `fruitsEvolution`()
+BEGIN
+select Id_Cliente, 
+		Cliente, count(semana) as semanas, (w.code IS NOT NULL) isWorker
+from (
+select distinct v.Id_Cliente, c.name as Cliente, week(fecha, 3) as semana
+from bs.ventas  v
+join vn.itemType it ON it.id = v.tipo_id
+join vn.client c ON c.id = v.Id_Cliente
+where it.categoryFk = 12
+and v.fecha > '2020-01-01') sub
+left join vn.worker w ON w.id = sub.Id_Cliente
+group by Id_Cliente;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `indicatorsUpdate` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -4725,13 +4755,194 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `vendedores_add`(intYEAR INT, vQuarter INT)
+BEGIN
+
+	DECLARE vCommissionRate DOUBLE DEFAULT 0.029;
+    
+	-- vaciar tabla
+    DELETE v.* FROM vendedores v
+		JOIN vn.`time` t ON t.`year` = v.año AND t.`month` = v.mes
+		WHERE t.`year` = intYEAR AND QUARTER(t.dated) = vQuarter;
+        
+	REPLACE vendedores(Id_Trabajador, año, mes, importe, comision)
+		SELECT c.Id_Trabajador
+			, intYEAR
+			, MONTH(v.fecha) intMONTH
+			, sum(v.importe) 
+			, sum(v.importe) * vCommissionRate 
+		FROM ventas v
+			JOIN vn2008.Clientes c on v.Id_Cliente = c.Id_Cliente
+            JOIN vn.`time` t on t.dated = v.fecha
+		WHERE c.Id_Trabajador is not null
+			AND t.`year` = intYEAR AND QUARTER(t.dated) = vQuarter
+		GROUP BY c.Id_Trabajador, t.`month`;
+      
+	-- Ventas nuevas
+	UPDATE vendedores v
+		JOIN
+		(
+		SELECT c.Id_Trabajador
+			, sum(importe) * vCommissionRate as comisionNueva
+			, t.`month`
+			, t.`year`
+		FROM ventas v
+			JOIN bs.clientNewBorn cnb on v.Id_Cliente = cnb.clientFk
+            JOIN vn2008.Clientes c ON c.Id_Cliente = v.Id_Cliente
+			JOIN vn2008.`time` t on t.`date` = v.fecha
+		WHERE c.Id_Trabajador is not null
+			AND t.`year` = intYEAR AND QUARTER(v.fecha) = vQuarter
+		GROUP BY c.Id_Trabajador, t.`month`
+		) sub ON sub.Id_Trabajador = v.Id_Trabajador AND sub.`month` = v.mes AND sub.`year` = v.año
+		SET v.comisionNuevos = sub.comisionNueva, v.comision = v.comision - sub.comisionNueva;
+
+	-- Ventas cedidas
+	UPDATE vendedores v
+		JOIN (
+		SELECT cc.Id_Trabajador_old as Id_Trabajador
+				 , sum(importe) * vCommissionRate * comision_old as cedido
+				 , sum(importe) * vCommissionRate * comision_new as arrendada
+                 , t.`month`
+                 , t.`year`
+			FROM ventas v
+				JOIN vn2008.Clientes c on v.Id_Cliente = c.Id_Cliente
+				JOIN vn2008.Clientes_cedidos cc on cc.Id_Cliente = c.Id_Cliente AND v.fecha between datSTART and datEND
+				JOIN vn2008.`time` t on t.`date` = v.fecha
+			WHERE c.Id_Trabajador is not null
+				AND t.`year` = intYEAR AND QUARTER(v.fecha) = vQuarter
+			GROUP BY cc.Id_Trabajador_old, t.`month`
+			) sub ON sub.Id_Trabajador = v.Id_Trabajador AND sub.`month` = v.mes AND sub.`year` = v.año
+		SET v.comisionCedida = sub.cedido, v.comision = v.comision - sub.cedido - sub.arrendada;
+
+	-- Ventas arrendadas
+	UPDATE vendedores v
+		JOIN (
+			SELECT cc.Id_Trabajador_new as Id_Trabajador
+				 , sum(importe) * vCommissionRate * comision_new as arrendada 
+                 , t.`month`
+                 , t.`year`
+			FROM ventas v
+				JOIN vn2008.Clientes c on v.Id_Cliente = c.Id_Cliente
+				JOIN vn2008.Clientes_cedidos cc on cc.Id_Cliente = c.Id_Cliente AND v.fecha between datSTART and datEND
+				JOIN vn2008.`time` t on t.`date` = v.fecha
+			WHERE c.Id_Trabajador is not null
+				AND t.`year` = intYEAR AND QUARTER(v.fecha) = vQuarter
+			GROUP BY cc.Id_Trabajador_new, t.`month`
+		) sub ON sub.Id_Trabajador = v.Id_Trabajador AND sub.`month` = v.mes AND sub.`year` = v.año
+		SET v.comisionArrendada = sub.arrendada;
+           
+	-- Sustitucion cedidas - lended
+	INSERT INTO vendedores (Id_Trabajador, mes, año, comision)
+		SELECT c.salesPersonFk
+                 , t.`month`
+                 , t.`year`
+				 , sum(importe) * vCommissionRate as lended
+			FROM ventas v
+				JOIN vn.client c ON c.id = v.Id_Cliente
+				JOIN vn.sharingCartDaily scd on scd.ownerFk = c.salesPersonFk AND scd.dated = v.fecha
+				JOIN vn.`time` t ON t.dated = v.fecha
+			WHERE t.`year` = intYEAR AND QUARTER(t.dated) = vQuarter
+			GROUP BY c.salesPersonFk, t.`month`
+	ON DUPLICATE KEY UPDATE comision = comision - VALUES(comision);
+    
+	-- Sustitucion arrendadas - borrowed
+	INSERT INTO vendedores (Id_Trabajador, mes, año, sustitucionArrendada)
+		SELECT scd.substituteFk
+                 , t.`month`
+                 , t.`year`
+				 , sum(importe) * vCommissionRate as borrowed
+			FROM ventas v
+				JOIN vn.client c ON c.id = v.Id_Cliente
+				JOIN vn.sharingCartDaily scd on scd.ownerFk = c.salesPersonFk AND scd.dated = v.fecha
+				JOIN vn.`time` t ON t.dated = v.fecha
+			WHERE t.`year` = intYEAR AND QUARTER(t.dated) = vQuarter
+			GROUP BY scd.substituteFk, t.`month`
+		ON DUPLICATE KEY UPDATE sustitucionArrendada = VALUES(sustitucionArrendada);
+            
+	DROP TEMPORARY TABLE IF EXISTS tmp.workerItemType;
+    CREATE TEMPORARY TABLE tmp.workerItemType
+    (INDEX(ownerWorkerFk, itemTypeFk))
+		SELECT wd.workerFk ownerWorkerFk, itemTypeFk, dit.workerFk substituteFk
+			FROM vn.departmentItemType dit 
+				JOIN vn.workerDepartment wd ON wd.departmentFk = dit.departmentFk;
+               
+	-- itemType Lended, prestado
+	UPDATE vendedores v
+		JOIN (
+		SELECT c.Id_Trabajador
+				 , sum(importe) * vCommissionRate as amount
+                 , t.`month`
+                 , t.`year`
+			FROM ventas v
+				JOIN vn2008.Clientes c on v.Id_Cliente = c.Id_Cliente
+				JOIN tmp.workerItemType wit ON wit.ownerWorkerFk = c.Id_Trabajador AND wit.itemTypeFk = v.tipo_id
+				JOIN vn2008.`time` t on t.`date` = v.fecha
+			WHERE t.`year` = intYEAR AND QUARTER(v.fecha) = vQuarter
+			GROUP BY c.Id_Trabajador, t.`month`
+			) sub ON sub.Id_Trabajador = v.Id_Trabajador AND sub.`month` = v.mes AND sub.`year` = v.año
+		SET v.comision = v.comision - sub.amount;
+       
+	-- itemType borrowed, tomado prestado
+	INSERT INTO vendedores (Id_Trabajador, año, mes, itemTypeBorrowed) 
+		SELECT wit.substituteFk
+				 , t.`year`
+				 , t.`month`
+				 , importe * vCommissionRate
+			FROM ventas v
+				JOIN vn2008.Clientes c on v.Id_Cliente = c.Id_Cliente
+				JOIN tmp.workerItemType wit ON wit.ownerWorkerFk = c.Id_Trabajador AND wit.itemTypeFk = v.tipo_id
+				JOIN vn2008.`time` t on t.`date` = v.fecha
+			WHERE t.`year` = intYEAR AND QUARTER(v.fecha) = vQuarter
+	ON DUPLICATE KEY UPDATE itemTypeBorrowed = itemTypeBorrowed + values(itemTypeBorrowed);
+            
+    DROP TEMPORARY TABLE tmp.workerItemType;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `vendedores_add_launcher` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
 /*!50003 SET character_set_client  = utf8 */ ;
 /*!50003 SET character_set_results = utf8 */ ;
 /*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `vendedores_add`(intYEAR INT, vQuarter INT)
+CREATE DEFINER=`root`@`%` PROCEDURE `vendedores_add_launcher`()
+BEGIN
+
+	call bs.vendedores_add(YEAR(CURDATE()),QUARTER(CURDATE()));
+ 
+    call bs.vendedores_evolution_add;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `vendedores_add__` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `vendedores_add__`(intYEAR INT, vQuarter INT)
 BEGIN
 
 	DECLARE vCommissionRate DOUBLE DEFAULT 0.029;
@@ -4879,40 +5090,17 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `vendedores_add_launcher` */;
+/*!50003 DROP PROCEDURE IF EXISTS `vendedores_add___` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `vendedores_add_launcher`()
-BEGIN
-
-	call bs.vendedores_add(YEAR(CURDATE()),QUARTER(CURDATE()));
- 
-    call bs.vendedores_evolution_add;
-
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `vendedores_add__` */;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `vendedores_add__`(intYEAR INT, vQuarter INT)
+CREATE DEFINER=`root`@`%` PROCEDURE `vendedores_add___`(intYEAR INT, vQuarter INT)
 BEGIN
 
 	DECLARE comisionRate DOUBLE DEFAULT 0.029;
@@ -5573,9 +5761,9 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
@@ -11666,20 +11854,20 @@ BEGIN
 	-- Comprueba que se ha seleccionado una dirección
 
 	IF vDeliveryMethod IN ('AGENCY', 'DELIVERY')
-	&& vAddress IS NULL
+	AND vAddress IS NULL
 	THEN
 		CALL util.throw ('ORDER_EMPTY_ADDRESS');
 	END IF;
 
 	-- Comprueba que la agencia es correcta
 
-	CALL vn.zoneGetAgency(vAddress, vLanded);
+	CALL vn.zone_getAgency(vAddress, vLanded);
     
     SELECT COUNT(*) > 0 INTO vIsAvailable
 		FROM tmp.zoneGetAgency
         WHERE agencyModeFk = vAgencyMode;
 
-	IF !vIsAvailable THEN
+	IF NOT vIsAvailable THEN
 		CALL util.throw ('ORDER_INVALID_AGENCY');
 	END IF;
     
@@ -11719,9 +11907,9 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
@@ -11918,8 +12106,7 @@ BEGIN
 				(saleFk, componentFk, `value`)
 				SELECT vSale, cm.component_id, cm.price
 					FROM order_component cm
-						JOIN bi.tarifa_componentes tc
-							ON tc.Id_Componente = cm.component_id
+						JOIN vn.component c ON c.id = cm.component_id
 					WHERE cm.order_row_id = vRowId
 					GROUP BY vSale, cm.component_id;
 
@@ -11938,12 +12125,9 @@ BEGIN
 			ENGINE = MEMORY
 			SELECT SUM(sc.`value`) valueSum, sc.saleFk
 				FROM vn.saleComponent sc
-					JOIN bi.tarifa_componentes tc ON tc.Id_Componente = sc.componentFk
-					JOIN bi.tarifa_componentes_series tcs
-						ON tcs.tarifa_componentes_series_id = tc.tarifa_componentes_series_id
-							AND tcs.base
-					JOIN vn.sale s
-						ON s.id = sc.saleFk
+					JOIN vn.component c ON c.id = sc.componentFk
+					JOIN vn.componentType ct ON ct.id = c.typeFk AND ct.isBase
+					JOIN vn.sale s ON s.id = sc.saleFk
 				WHERE s.ticketFk = vTicket
 				GROUP BY sc.saleFk;
 
@@ -16604,6 +16788,37 @@ CREATE TABLE `debug` (
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Log de depuración';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `version`
+--
+
+DROP TABLE IF EXISTS `version`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `version` (
+  `code` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `number` char(11) COLLATE utf8_unicode_ci NOT NULL,
+  `updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `versionUser`
+--
+
+DROP TABLE IF EXISTS `versionUser`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `versionUser` (
+  `code` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `user` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `number` char(11) COLLATE utf8_unicode_ci NOT NULL,
+  `updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`code`,`user`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Dumping events for database 'util'
 --
@@ -17270,7 +17485,6 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `findObject` */;
-ALTER DATABASE `util` CHARACTER SET utf8 COLLATE utf8_general_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
@@ -17292,6 +17506,78 @@ BEGIN
  */
 	SET vChain = CONCAT('%', vChain, '%');
 
+	SELECT * FROM
+	( 
+		SELECT
+				`db`,
+				`name`,
+				`type`,
+				`body`,
+				`created`,
+				`modified`
+			FROM `mysql`.`proc`
+			WHERE `body` LIKE vChain COLLATE utf8_general_ci
+		UNION ALL
+		SELECT
+				`db`,
+				`name`,
+				'EVENT',
+				`body_utf8`,
+				`created`,
+				`modified`
+			FROM `mysql`.`event`
+			WHERE `body_utf8` LIKE vChain COLLATE utf8_general_ci
+		UNION ALL
+		SELECT
+				`EVENT_OBJECT_SCHEMA`,
+				`TRIGGER_NAME`,
+				'TRIGGER',
+				`ACTION_STATEMENT`,
+				NULL,
+				NULL 
+			FROM `information_schema`.`TRIGGERS`
+			WHERE `ACTION_STATEMENT` LIKE vChain COLLATE utf8_general_ci
+		UNION ALL
+		SELECT
+				`TABLE_SCHEMA`,
+				`TABLE_NAME`,
+				'VIEW',
+				`VIEW_DEFINITION`,
+				NULL,
+				NULL 
+			FROM `information_schema`.`VIEWS`
+			WHERE `VIEW_DEFINITION` LIKE vChain COLLATE utf8_general_ci
+	) t
+	ORDER BY `db`, `name`;
+    
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `findObject__` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `findObject__`(vChain VARCHAR(45))
+    READS SQL DATA
+BEGIN
+/**
+ * Devuelve un listado de todos los procedimientos, funciones
+ * eventos, disparadores y vistas que inluyen una cadena dada.
+ *
+ * @param vChain Cadena a buscar
+ * @select Listado de objetos
+ */
+	SET vChain = CONCAT('%', vChain, '%');
+
 	SELECT * FROM
 	( 
 		SELECT
@@ -17341,7 +17627,6 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
-ALTER DATABASE `util` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
 /*!50003 DROP PROCEDURE IF EXISTS `proc_changedPrivs` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -17895,7 +18180,7 @@ CREATE TABLE `agencyMode` (
   `cod71` tinyint(3) unsigned DEFAULT '0',
   `web` smallint(1) unsigned zerofill NOT NULL DEFAULT '0',
   `agencyFk` smallint(5) unsigned NOT NULL,
-  `agencyServiceFk` tinyint(4) NOT NULL DEFAULT '1',
+  `agencyServiceFk__` tinyint(4) NOT NULL DEFAULT '1',
   `inflation` decimal(5,2) NOT NULL DEFAULT '0.00' COMMENT 'Este valor se utiliza para aumentar el valor del componente porte.',
   `isVolumetric` tinyint(1) NOT NULL DEFAULT '0',
   `reportMail` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -18042,7 +18327,7 @@ CREATE TABLE `bank` (
   `bank` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
   `account` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
   `cash` smallint(6) NOT NULL DEFAULT '0',
-  `warehouseFk` smallint(5) unsigned NOT NULL DEFAULT '1',
+  `warehouseFk__` smallint(5) unsigned NOT NULL DEFAULT '1',
   `entityFk` int(10) unsigned NOT NULL,
   `isActive` tinyint(4) NOT NULL DEFAULT '1',
   `currencyFk` tinyint(3) unsigned DEFAULT '1',
@@ -18516,7 +18801,8 @@ DROP TABLE IF EXISTS `chatConfig`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `chatConfig` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `uri` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `host` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `api` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   `user` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
   `password` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`id`)
@@ -18851,7 +19137,7 @@ CREATE TABLE `client` (
   `fi` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
   `phone` varchar(15) COLLATE utf8_unicode_ci DEFAULT NULL,
   `fax` varchar(11) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'obsoleta (comprobar)',
-  `email` varchar(150) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `email` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `cc` varchar(23) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'obsoleta (comprobar)',
   `dueDay` smallint(6) NOT NULL DEFAULT '5',
   `receipt` int(11) DEFAULT '1' COMMENT 'obsoleta',
@@ -19497,7 +19783,7 @@ CREATE TABLE `collectionVolumetry` (
   `level` int(10) unsigned NOT NULL DEFAULT '0',
   `lines` int(10) unsigned NOT NULL DEFAULT '1',
   `liters` int(10) unsigned NOT NULL DEFAULT '0',
-  `height` int(10) NOT NULL DEFAULT '20',
+  `height` int(10) unsigned NOT NULL DEFAULT '20',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -19607,7 +19893,7 @@ DROP TABLE IF EXISTS `componentType`;
 CREATE TABLE `componentType` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `type` varchar(45) COLLATE utf8_unicode_ci NOT NULL,
-  `base` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'Marca aquellas series que se utilizan para calcular el precio base de las ventas, a efectos estadisticos',
+  `isBase` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'Marca aquellas series que se utilizan para calcular el precio base de las ventas, a efectos estadisticos',
   `isMargin` tinyint(4) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `Serie_UNIQUE` (`type`)
@@ -19763,6 +20049,101 @@ CREATE TABLE `contactChannel` (
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Canal por el que nos ha conocido un cliente y  se ha dado de';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `conveyor`
+--
+
+DROP TABLE IF EXISTS `conveyor`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `conveyor` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `typeFk` int(11) NOT NULL,
+  `stratum` int(11) NOT NULL DEFAULT '0',
+  `length` int(11) DEFAULT NULL,
+  `width` int(11) DEFAULT NULL,
+  `height` int(11) DEFAULT NULL,
+  `x` int(11) DEFAULT NULL,
+  `y` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `conveyor_fk1_idx` (`typeFk`),
+  CONSTRAINT `conveyor_fk1` FOREIGN KEY (`typeFk`) REFERENCES `conveyorType` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `conveyorBuildingClass`
+--
+
+DROP TABLE IF EXISTS `conveyorBuildingClass`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `conveyorBuildingClass` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `description` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `priority` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Tipo de caja para el montaje de pallets';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `conveyorConfig`
+--
+
+DROP TABLE IF EXISTS `conveyorConfig`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `conveyorConfig` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `itemName` varchar(45) COLLATE utf8_unicode_ci NOT NULL,
+  `length` int(11) DEFAULT NULL,
+  `width` int(11) DEFAULT NULL,
+  `height` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `itemName_UNIQUE` (`itemName`)
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `conveyorExpedition`
+--
+
+DROP TABLE IF EXISTS `conveyorExpedition`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `conveyorExpedition` (
+  `expeditionFk` int(11) NOT NULL,
+  `conveyorFk` int(11) DEFAULT NULL,
+  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `conveyorBuildingClassFk` int(11) NOT NULL,
+  `length` int(11) NOT NULL DEFAULT '1',
+  `width` int(11) NOT NULL DEFAULT '1',
+  `height` int(11) NOT NULL DEFAULT '1',
+  `x` int(11) NOT NULL DEFAULT '1',
+  `y` int(11) NOT NULL DEFAULT '1',
+  `routeFk` int(11) NOT NULL,
+  PRIMARY KEY (`expeditionFk`),
+  KEY `conveyorExpedition_fk1_idx` (`conveyorFk`),
+  KEY `conveyorExpedition_fk2_idx` (`conveyorBuildingClassFk`),
+  CONSTRAINT `conveyorExpedition_fk1` FOREIGN KEY (`conveyorFk`) REFERENCES `conveyor` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `conveyorExpedition_fk2` FOREIGN KEY (`conveyorBuildingClassFk`) REFERENCES `conveyorBuildingClass` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `conveyorType`
+--
+
+DROP TABLE IF EXISTS `conveyorType`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `conveyorType` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `description` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `country`
 --
@@ -20208,6 +20589,7 @@ CREATE TABLE `department` (
   `sons` decimal(10,0) NOT NULL DEFAULT '0',
   `parentFk` int(10) unsigned DEFAULT NULL,
   `path` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `chatName` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `name_UNIQUE` (`name`),
   KEY `fk_department_Trabajadores1_idx` (`workerFk`),
@@ -21042,6 +21424,22 @@ CREATE TABLE `envialiaConfig` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `errorLogApp`
+--
+
+DROP TABLE IF EXISTS `errorLogApp`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `errorLogApp` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `error` varchar(55) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `date` datetime DEFAULT NULL,
+  `workerFk` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Guarda un registro de errores e la app de almacén';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Temporary table structure for view `exchangeInsuranceEntry`
 --
@@ -21381,6 +21779,20 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 
+--
+-- Table structure for table `greugeConfig`
+--
+
+DROP TABLE IF EXISTS `greugeConfig`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `greugeConfig` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `freightPickUpPrice` decimal(10,2) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `greugeType`
 --
@@ -21772,16 +22184,14 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`invoiceOut_afterInsert`
-	AFTER INSERT ON `invoiceOut` FOR EACH ROW
-BEGIN
-	CALL bi.customer_risk_update (NEW.clientFk, NEW.companyFk, NEW.amount);
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`invoiceOut_afterInsert` AFTER INSERT ON `vn`.`invoiceOut` FOR EACH ROW BEGIN
+	CALL clientRisk_update(NEW.clientFk, NEW.companyFk, NEW.amount);
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -21791,17 +22201,16 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`invoiceOut_beforeUpdate`
-	BEFORE UPDATE ON `invoiceOut` FOR EACH ROW
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`invoiceOut_beforeUpdate` BEFORE UPDATE ON `vn`.`invoiceOut` FOR EACH ROW
 BEGIN
-	CALL bi.customer_risk_update (OLD.clientFk, OLD.companyFk, -OLD.amount);
-	CALL bi.customer_risk_update (NEW.clientFk, NEW.companyFk, NEW.amount);
+	CALL clientRisk_update (OLD.clientFk, OLD.companyFk, -OLD.amount);
+	CALL clientRisk_update (NEW.clientFk, NEW.companyFk, NEW.amount);
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -21811,16 +22220,14 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`invoiceOut_beforeDelete`
-	BEFORE DELETE ON `invoiceOut` FOR EACH ROW
-BEGIN
-	CALL bi.customer_risk_update (OLD.clientFk, OLD.companyFk, -OLD.amount);
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`invoiceOut_beforeDelete` BEFORE DELETE ON `invoiceOut` FOR EACH ROW BEGIN
+	CALL clientRisk_update (OLD.clientFk, OLD.companyFk, -OLD.amount);
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -22366,6 +22773,23 @@ CREATE TABLE `itemFreeNumber` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `itemLabel`
+--
+
+DROP TABLE IF EXISTS `itemLabel`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `itemLabel` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `itemFk` int(11) DEFAULT NULL,
+  `itemName` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `price` decimal(10,2) DEFAULT NULL,
+  `labels` int(11) DEFAULT NULL COMMENT 'Tabla hecha para Ruben Espinosa, para sacar etiquetas en Holanda para un cliente.',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `itemLog`
 --
@@ -22457,7 +22881,7 @@ CREATE TABLE `itemPlacementSupply` (
   `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `userFk` int(10) unsigned NOT NULL COMMENT 'Persona que crea la orden',
   `repoUserFk` int(10) unsigned DEFAULT NULL COMMENT 'Reponedor que la tiene asignada',
-  `sectorFk` int(11) NOT NULL DEFAULT '2',
+  `sectorFk` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `itemPlacementSupply_fk1_idx` (`itemFk`),
   KEY `itemPlacementSupply_fk2_idx` (`userFk`),
@@ -22492,33 +22916,6 @@ SET character_set_client = utf8;
  1 AS `size`,
  1 AS `workerCode`,
  1 AS `repoCode`,
- 1 AS `parking`,
- 1 AS `sectorFk`*/;
-SET character_set_client = @saved_cs_client;
-
---
--- Temporary table structure for view `itemPlacementSupplyList__`
---
-
-DROP TABLE IF EXISTS `itemPlacementSupplyList__`;
-/*!50001 DROP VIEW IF EXISTS `itemPlacementSupplyList__`*/;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-/*!50001 CREATE VIEW `itemPlacementSupplyList__` AS SELECT 
- 1 AS `id`,
- 1 AS `itemFk`,
- 1 AS `quantity`,
- 1 AS `priority`,
- 1 AS `created`,
- 1 AS `userFk`,
- 1 AS `repoUserFk`,
- 1 AS `saldo`,
- 1 AS `longName`,
- 1 AS `subName`,
- 1 AS `size`,
- 1 AS `workerCode`,
- 1 AS `repoCode`,
- 1 AS `parking`,
  1 AS `sectorFk`*/;
 SET character_set_client = @saved_cs_client;
 
@@ -22654,7 +23051,8 @@ SET character_set_client = utf8;
  1 AS `packing`,
  1 AS `hour`,
  1 AS `isPreviousPreparable`,
- 1 AS `physicalVolume`*/;
+ 1 AS `physicalVolume`,
+ 1 AS `warehouseFk`*/;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -23211,6 +23609,18 @@ CREATE TABLE `itemVerdecora` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Relaciona nuestros articulos con los de Verdecora';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `kk`
+--
+
+DROP TABLE IF EXISTS `kk`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `kk` (
+  `pasillo` varchar(3) COLLATE utf8_unicode_ci NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `labourTree`
 --
@@ -23869,6 +24279,7 @@ CREATE TABLE `pgc` (
   `mod340` tinyint(1) NOT NULL DEFAULT '0',
   `mod347` tinyint(1) NOT NULL DEFAULT '0',
   `cplusTrascendency477Fk` int(10) unsigned DEFAULT '1',
+  `isEqualizated` tinyint(1) DEFAULT '0',
   PRIMARY KEY (`code`),
   KEY `pgc_fk1_idx` (`cplusTaxBreakFk`),
   KEY `pgc_fk2_idx` (`cplusTrascendency477Fk`),
@@ -24237,7 +24648,7 @@ CREATE TABLE `printServerQueue2` (
   KEY `Id_Informe` (`reportFk`),
   KEY `Id_Prioridad` (`priorityFk`),
   KEY `Id_Trabajador` (`workerFk`)
-) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -24512,14 +24923,14 @@ CREATE TABLE `receipt` (
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`receipt_afterInsert` AFTER INSERT ON `receipt` FOR EACH ROW
-	CALL bi.customer_risk_update (NEW.clientFk, NEW.companyFk, -NEW.amountPaid) */;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`receipt_afterInsert` AFTER INSERT ON `receipt` FOR EACH ROW 
+	CALL clientRisk_update(NEW.clientFk, NEW.companyFk, -NEW.amountPaid) */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
@@ -24528,16 +24939,15 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`receipt_beforeUpdate` BEFORE UPDATE ON `receipt` FOR EACH ROW
-BEGIN
-	CALL bi.customer_risk_update (OLD.clientFk, OLD.companyFk, OLD.amountPaid);
-	CALL bi.customer_risk_update (NEW.clientFk, NEW.companyFk, -NEW.amountPaid);
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`receipt_beforeUpdate` BEFORE UPDATE ON `receipt` FOR EACH ROW BEGIN
+	CALL clientRisk_update(OLD.clientFk, OLD.companyFk, OLD.amountPaid);
+	CALL clientRisk_update(NEW.clientFk, NEW.companyFk, -NEW.amountPaid);
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -24547,14 +24957,14 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`receipt_beforeDelete` BEFORE DELETE ON `receipt` FOR EACH ROW
-	CALL bi.customer_risk_update (OLD.clientFk, OLD.companyFk, OLD.amountPaid) */;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`receipt_beforeDelete` BEFORE DELETE ON `receipt` FOR EACH ROW 
+	CALL clientRisk_update(OLD.clientFk, OLD.companyFk, OLD.amountPaid) */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
@@ -24979,6 +25389,11 @@ BEGIN
 		SET NEW.discount = 0;
 	END IF;
 
+	IF old.discount > 0 AND  NEW.discount = 0 THEN
+        INSERT INTO ticketLog
+		SET originFk = NEW.ticketFk, userFk = account.myUserGetId(), `action` = 'insert', 
+			description = CONCAT('Cambio de descuento del item :', ' ', new.itemFk, ' de ', old.discount ,' a 0 ');
+	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -25422,9 +25837,12 @@ CREATE TABLE `shelving` (
   `isPrinted` tinyint(4) NOT NULL DEFAULT '0',
   `priority` int(11) DEFAULT NULL,
   `parked` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `userFk` int(11) DEFAULT NULL,
   PRIMARY KEY (`code`),
   KEY `shelving_fk1_idx` (`parkingFk`),
-  CONSTRAINT `shelving_fk1` FOREIGN KEY (`parkingFk`) REFERENCES `parking` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
+  KEY `shelving_fk2_idx` (`userFk`),
+  CONSTRAINT `shelving_fk1` FOREIGN KEY (`parkingFk`) REFERENCES `parking` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
+  CONSTRAINT `shelving_fk2` FOREIGN KEY (`userFk`) REFERENCES `worker` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Tabla usada para localizar el carro en el parking del altillo';
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
@@ -26212,8 +26630,8 @@ CREATE TABLE `ticketCollection` (
   `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `level` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`),
+  UNIQUE KEY `ticketCollection_fk2_idx` (`ticketFk`),
   KEY `ticketCollection_fk1_idx` (`collectionFk`),
-  KEY `ticketCollection_fk2_idx` (`ticketFk`),
   CONSTRAINT `ticketCollection_fk1` FOREIGN KEY (`collectionFk`) REFERENCES `collection` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `ticketCollection_fk2` FOREIGN KEY (`ticketFk`) REFERENCES `ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -26261,8 +26679,14 @@ DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`ticketDms_beforeDelete` BEFORE DELETE ON `ticketDms` FOR EACH ROW
 BEGIN
     UPDATE dms 
-        SET dmsTypeFk = (SELECT id FROM dmsType WHERE `code` = 'trash')
-    WHERE id = OLD.dmsFk;
+        SET dmsTypeFk = (SELECT id 
+							FROM dmsType 
+                            WHERE `code` = 'trash'
+						)
+		WHERE id = OLD.dmsFk AND ( SELECT IF(COUNT(*) > 0, FALSE, TRUE) 
+										FROM ticketDms 
+										WHERE dmsFk = OLD.dmsFk
+								  ) ;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -27204,6 +27628,7 @@ DROP TABLE IF EXISTS `travelThermograph`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `travelThermograph` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
   `thermographFk` varchar(45) COLLATE utf8_unicode_ci NOT NULL,
   `created` date NOT NULL,
   `warehouseFk` smallint(6) unsigned NOT NULL,
@@ -27211,7 +27636,7 @@ CREATE TABLE `travelThermograph` (
   `temperature` enum('COOL','WARM') COLLATE utf8_unicode_ci NOT NULL,
   `result` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
   `dmsFk` int(11) DEFAULT NULL,
-  PRIMARY KEY (`thermographFk`,`created`),
+  PRIMARY KEY (`id`),
   KEY `thermograph_fk_idx` (`thermographFk`),
   KEY `gestdoc_fk_idx` (`dmsFk`),
   KEY `travel_id` (`travelFk`),
@@ -27220,7 +27645,7 @@ CREATE TABLE `travelThermograph` (
   CONSTRAINT `travelThermographThermographFgn` FOREIGN KEY (`thermographFk`) REFERENCES `thermograph` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `travelThermographTravelFgn` FOREIGN KEY (`travelFk`) REFERENCES `travel` (`id`),
   CONSTRAINT `travelThermographWarehouseFgn` FOREIGN KEY (`warehouseFk`) REFERENCES `warehouse` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Registra cada termografo que se ha introducido en cada travel';
+) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Registra cada termografo que se ha introducido en cada travel';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -27505,7 +27930,7 @@ CREATE TABLE `worker` (
   `birthed` date NOT NULL,
   `maritalStatus` enum('soltero/a','casado/a') COLLATE utf8_unicode_ci NOT NULL,
   `phone` varchar(9) COLLATE utf8_unicode_ci NOT NULL,
-  `companyFk` smallint(5) unsigned NOT NULL,
+  `companyFk` smallint(5) unsigned DEFAULT NULL,
   `clientFk` int(11) DEFAULT NULL,
   `userFk` int(10) unsigned DEFAULT NULL,
   `bossFk` int(11) NOT NULL DEFAULT '2',
@@ -28016,14 +28441,14 @@ SET character_set_client = utf8;
 SET character_set_client = @saved_cs_client;
 
 --
--- Temporary table structure for view `workerTimeControl_Journey`
+-- Temporary table structure for view `workerTimeControl_Journey__`
 --
 
-DROP TABLE IF EXISTS `workerTimeControl_Journey`;
-/*!50001 DROP VIEW IF EXISTS `workerTimeControl_Journey`*/;
+DROP TABLE IF EXISTS `workerTimeControl_Journey__`;
+/*!50001 DROP VIEW IF EXISTS `workerTimeControl_Journey__`*/;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-/*!50001 CREATE VIEW `workerTimeControl_Journey` AS SELECT 
+/*!50001 CREATE VIEW `workerTimeControl_Journey__` AS SELECT 
  1 AS `userFk`,
  1 AS `dated`,
  1 AS `Journey`,
@@ -32100,9 +32525,9 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
@@ -32731,11 +33156,11 @@ BEGIN
 			JOIN itemType it ON it.categoryFk = k.id
 			JOIN item i ON i.typeFk = it.id
 		WHERE i.id = vItemFk;
-        
+
 	IF vIsMerchandise THEN
-		REPLACE bi.rotacion	SET
-			Id_Article = vItemFk,
-			warehouse_id = vWarehouse,
+		REPLACE itemCost	SET
+			itemFk = vItemFk,
+			warehouseFk = vWarehouse,
 			cm3 = buy_getUnitVolume(vSelf);
 	END IF;
 
@@ -32750,7 +33175,7 @@ BEGIN
 					JOIN edi.supplier es ON es.supplier_id = be.pro
 				WHERE b.id = vSelf;
                 
-		IF vn2008.has_notify_passport(vItemFk, vSelf) THEN
+		IF buy_hasNotifyPassport(vSelf, vItemFk) THEN
 			CALL vn.buy_notifyPassport(vSelf, vItemFk, vStickers, vPacking);
 		END IF;
 	END IF;
@@ -33356,9 +33781,9 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
@@ -33378,7 +33803,6 @@ proc: BEGIN
  *		packing, grouping, groupingMode, buyFk, typeFk)
  * @return tmp.ticketComponentPrice (warehouseFk, itemFk, rate, grouping, price)
  */
- 
 	DECLARE vClientFk INT;
     DECLARE vGeneralInflationCoefficient INT DEFAULT 1;
     DECLARE vMinimumDensityWeight INT DEFAULT 167;
@@ -33471,17 +33895,17 @@ proc: BEGIN
 			GROUP BY tc.itemFk, warehouseFk;
 
 	INSERT INTO tmp.ticketComponent
-		SELECT tcb.warehouseFk, tcb.itemFk, vRecoveryComponent, ROUND(tcb.base * LEAST(cr.recobro, 0.25), 3)
+		SELECT tcb.warehouseFk, tcb.itemFk, vRecoveryComponent, ROUND(tcb.base * LEAST(cr.priceIncreasing, 0.25), 3)
 			FROM tmp.ticketComponentBase tcb
-			JOIN bi.claims_ratio cr ON cr.Id_Cliente = vClientFk
-				WHERE cr.recobro > 0.009;
+			JOIN claimRatio cr ON cr.clientFk = vClientFk
+				WHERE cr.priceIncreasing > 0.009;
             
     INSERT INTO tmp.ticketComponent
-		SELECT tcb.warehouseFk, tcb.itemFk, vManaAutoComponent, ROUND(base * (0.01 + prices_modifier_rate), 3) as manaAuto
+		SELECT tcb.warehouseFk, tcb.itemFk, vManaAutoComponent, ROUND(base * (0.01 + wm.pricesModifierRate), 3) as manaAuto
 			FROM tmp.ticketComponentBase tcb
 				JOIN `client` c on c.id = vClientFk
-				JOIN bs.mana_spellers ms ON c.salesPersonFk = ms.Id_Trabajador 
-			WHERE ms.prices_modifier_activated
+				JOIN workerMana wm ON c.salesPersonFk = wm.workerFk 
+			WHERE wm.isPricesModifierActivated
 			HAVING manaAuto <> 0;
 	
 	INSERT INTO tmp.ticketComponent
@@ -33490,7 +33914,7 @@ proc: BEGIN
                 c.id, 
                 GREATEST(IFNULL(ROUND(tcb.base * c.tax, 4), 0), tcc.minPrice - tcc.rate3)
 			FROM tmp.ticketComponentBase tcb
-				JOIN `component` c
+				JOIN component c
 				JOIN tmp.ticketComponentCalculate tcc ON tcc.itemFk = tcb.itemFk AND tcc.warehouseFk = tcb.warehouseFk 
 				LEFT JOIN specialPrice sp ON sp.clientFk = vClientFk AND sp.itemFk = tcc.itemFk
 			WHERE c.id = vDiscountLastItemComponent AND c.tax <> 0 AND tcc.minPrice < tcc.rate3 AND sp.value IS NULL;
@@ -33509,7 +33933,7 @@ proc: BEGIN
 				vGeneralInflationCoefficient
 				* ROUND((
 					i.compression
-					* r.cm3 
+					* ic.cm3 
 					* IF(am.deliveryMethodFk = 1, (GREATEST(i.density, vMinimumDensityWeight) / vMinimumDensityWeight), 1)
 					* IFNULL((z.price - z.bonus)
 					* 1/*amz.inflation*/ , 50)) / vBoxVolume, 4
@@ -33518,8 +33942,8 @@ proc: BEGIN
 			JOIN item i ON i.id = tcc.itemFk
             JOIN zone z ON z.id = vZoneFk
 			JOIN agencyMode am ON am.id = z.agencyModeFk
-			LEFT JOIN bi.rotacion r ON r.warehouse_id = tcc.warehouseFk 
-				AND r.Id_Article = tcc.itemFk
+			LEFT JOIN itemCost ic ON ic.warehouseFk = tcc.warehouseFk 
+				AND ic.itemFk = tcc.itemFk
 			HAVING cost <> 0; 
             
     IF (SELECT COUNT(*) FROM vn.addressForPackaging WHERE addressFk = vAddressFk) THEN
@@ -33540,7 +33964,7 @@ proc: BEGIN
 				vSpecialPriceComponent, 
 				sp.value - SUM(tcc.cost) sumCost
 			FROM tmp.ticketComponentCopy tcc
-				JOIN `component` c ON c.id = tcc.componentFk
+				JOIN component c ON c.id = tcc.componentFk
 				JOIN specialPrice sp ON sp.clientFk = vClientFK AND sp.itemFk = tcc.itemFk
 			WHERE c.classRate IS NULL
 			GROUP BY tcc.itemFk, tcc.warehouseFk
@@ -33552,7 +33976,7 @@ proc: BEGIN
 		ENGINE = MEMORY
 		SELECT SUM(cost) sumCost, tc.itemFk, tc.warehouseFk, c.classRate
 			FROM tmp.ticketComponent tc
-				JOIN `component` c ON c.id = tc.componentFk
+				JOIN component c ON c.id = tc.componentFk
 			GROUP BY tc.itemFk, tc.warehouseFk, c.classRate;
 
 	DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentRate;
@@ -34569,6 +34993,34 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `clientRisk_update` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `clientRisk_update`(vClientId INT, vCompanyId INT, vAmount DECIMAL(10,2))
+BEGIN
+	IF vAmount IS NOT NULL
+	THEN
+		INSERT INTO clientRisk
+			SET
+				clientFk = vClientId,
+				companyFk = vCompanyId,
+				amount = vAmount
+			ON DUPLICATE KEY UPDATE
+				amount = amount + VALUES(amount);
+	END IF;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `clonTravelComplete` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -34786,18 +35238,20 @@ BEGIN
 			sh.code COLLATE utf8_general_ci as shelving,
 			ish.created,
 			ish.visible,
-			IFNULL(p.pickingOrder,0) as `order`,
+			IFNULL(cpd.id,0) as `order`,
             IF(sc.isPreviousPreparedByPacking, ish.packing, g.`grouping`) as `grouping`
 		FROM vn.ticketCollection tc
 			JOIN vn.sale s ON s.ticketFk = tc.ticketFk
             JOIN vn.itemShelving ish ON ish.itemFk = s.itemFk
             JOIN vn.shelving sh ON sh.code = ish.shelvingFk
             JOIN vn.parking p ON p.id = sh.parkingFk
+            LEFT JOIN vn.coolerPathDetail cpd ON CAST(cpd.hallway AS DECIMAL(3,0)) = p.column
             JOIN vn.sector sc ON sc.id = p.sectorFk
             JOIN vn.warehouse w ON w.id = sc.warehouseFk
             JOIN tmp.`grouping` g ON g.itemFk = s.itemFk
 		WHERE tc.collectionFk = vCollectionFk
 			AND w.aliasFk = vWarehouseAliasFk
+            AND ish.visible > 0
 	UNION ALL
 	SELECT	s.id as saleFk, s.itemFk,
 			ip.code COLLATE utf8_general_ci as placement,
@@ -34814,8 +35268,241 @@ BEGIN
             JOIN cache.visible v ON v.item_id = s.itemFk AND v.calc_id = vCalcFk
             LEFT JOIN tmp.grouping2 g ON g.itemFk = s.itemFk
 		WHERE tc.collectionFk = vCollectionFk
-			-- HAVING visible > 0
-            ;
+			AND v.visible - p.quantity > 0
+            AND IFNULL(cpd.id,0);
+        
+	DROP TEMPORARY TABLE
+		tmp.parked,
+        tmp.`grouping`,
+        tmp.grouping2;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `collectionPlacement_get_beta` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `collectionPlacement_get_beta`(vCollectionFk INT)
+BEGIN
+
+	DECLARE vCalcFk INT;
+    DECLARE vWarehouseFk INT;
+    DECLARE vWarehouseAliasFk INT;
+    
+    SELECT t.warehouseFk, w.aliasFk
+		INTO vWarehouseFk, vWarehouseAliasFk
+        FROM vn.ticket t
+			JOIN vn.ticketCollection tc ON tc.ticketFk = t.id
+            JOIN vn.warehouse w ON w.id = t.warehouseFk
+            WHERE tc.collectionFk = vCollectionFk
+        LIMIT 1;
+        
+	CALL cache.visible_refresh(vCalcFk,FALSE,vWarehouseFk);
+    
+    DROP TEMPORARY TABLE IF EXISTS tmp.parked;
+    CREATE TEMPORARY TABLE tmp.parked
+    ENGINE MEMORY
+    SELECT 	s.itemFk, 0 as quantity
+		FROM vn.ticketCollection tc
+			JOIN vn.sale s ON s.ticketFk = tc.ticketFk
+		WHERE tc.collectionFk = vCollectionFk;
+    
+	UPDATE tmp.parked pk
+		JOIN ( SELECT itemFk, sum(visible) as visible
+				FROM vn.itemShelvingStock iss 
+					JOIN vn.warehouse w ON w.id = iss.warehouseFk
+				WHERE  w.aliasFk = vWarehouseAliasFk
+				GROUP BY iss.itemFk ) iss ON iss.itemFk = pk.itemFk
+		SET pk.quantity = iss.visible;
+    
+	DROP TEMPORARY TABLE IF EXISTS tmp.`grouping`;
+    CREATE TEMPORARY TABLE tmp.`grouping`
+		ENGINE MEMORY
+		SELECT itemFk, `grouping`
+			FROM (
+				SELECT itemFk,
+					CASE groupingMode 
+					   WHEN 0 THEN 1 
+					   WHEN 2 THEN packing
+					   ELSE `grouping`
+					END	AS `grouping`
+				FROM buy b
+					JOIN entry e ON e.id = b.entryFk
+					JOIN travel tr ON tr.id = e.travelFk
+				WHERE tr.warehouseInFk = vWarehouseFk
+					AND landed BETWEEN (SELECT FechaInventario FROM vn2008.tblContadores LIMIT 1) AND CURDATE()
+					AND b.isIgnored = FALSE
+				ORDER BY tr.landed DESC
+			) sub
+			GROUP BY sub.itemFk ;
+                            
+	DROP TEMPORARY TABLE IF EXISTS tmp.grouping2;
+	CREATE TEMPORARY TABLE tmp.grouping2
+		ENGINE MEMORY
+		SELECT * FROM tmp.`grouping`;
+
+	SELECT 	s.id as saleFk, s.itemFk,
+			p.code COLLATE utf8_general_ci as placement ,
+			sh.code COLLATE utf8_general_ci as shelving,
+			ish.created,
+			ish.visible,
+			IFNULL(cpd.id,0) as `order`,
+            IF(sc.isPreviousPreparedByPacking, ish.packing, g.`grouping`) as `grouping`
+		FROM vn.ticketCollection tc
+			JOIN vn.sale s ON s.ticketFk = tc.ticketFk
+            JOIN vn.itemShelving ish ON ish.itemFk = s.itemFk
+            JOIN vn.shelving sh ON sh.code = ish.shelvingFk
+            JOIN vn.parking p ON p.id = sh.parkingFk
+            LEFT JOIN vn.coolerPathDetail cpd ON CAST(cpd.hallway AS DECIMAL(3,0)) = p.column
+            JOIN vn.sector sc ON sc.id = p.sectorFk
+            JOIN vn.warehouse w ON w.id = sc.warehouseFk
+            JOIN tmp.`grouping` g ON g.itemFk = s.itemFk
+		WHERE tc.collectionFk = vCollectionFk
+			AND w.aliasFk = vWarehouseAliasFk
+            AND ish.visible > 0
+	UNION ALL
+	SELECT	s.id as saleFk, s.itemFk,
+			ip.code COLLATE utf8_general_ci as placement,
+            '' COLLATE utf8_general_ci as shelving,
+            modificationDate as created,
+            v.visible - p.quantity as visible,
+            IFNULL(cpd.id,0) as `order`,
+            g.`grouping`
+		FROM vn.ticketCollection tc
+			JOIN vn.sale s ON s.ticketFk = tc.ticketFk
+            JOIN vn.itemPlacement ip ON ip.itemFk = s.itemFk AND ip.warehouseFk = vWarehouseFk
+            LEFT JOIN vn.coolerPathDetail cpd ON cpd.hallway = LEFT(ip.`code`,3)
+            JOIN tmp.parked p ON p.itemFk = s.itemFk
+            JOIN cache.visible v ON v.item_id = s.itemFk AND v.calc_id = vCalcFk
+            LEFT JOIN tmp.grouping2 g ON g.itemFk = s.itemFk
+		WHERE tc.collectionFk = vCollectionFk
+			AND v.visible - p.quantity > 0
+            AND IFNULL(cpd.id,0);
+        
+	DROP TEMPORARY TABLE
+		tmp.parked,
+        tmp.`grouping`,
+        tmp.grouping2;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `collectionPlacement_get__` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `collectionPlacement_get__`(vCollectionFk INT)
+BEGIN
+
+	DECLARE vCalcFk INT;
+    DECLARE vWarehouseFk INT;
+    DECLARE vWarehouseAliasFk INT;
+    
+    SELECT t.warehouseFk, w.aliasFk
+		INTO vWarehouseFk, vWarehouseAliasFk
+        FROM vn.ticket t
+			JOIN vn.ticketCollection tc ON tc.ticketFk = t.id
+            JOIN vn.warehouse w ON w.id = t.warehouseFk
+            WHERE tc.collectionFk = vCollectionFk
+        LIMIT 1;
+        
+	CALL cache.visible_refresh(vCalcFk,FALSE,vWarehouseFk);
+    
+    DROP TEMPORARY TABLE IF EXISTS tmp.parked;
+    CREATE TEMPORARY TABLE tmp.parked
+    ENGINE MEMORY
+    SELECT 	s.itemFk, 0 as quantity
+		FROM vn.ticketCollection tc
+			JOIN vn.sale s ON s.ticketFk = tc.ticketFk
+		WHERE tc.collectionFk = vCollectionFk;
+    
+	UPDATE tmp.parked pk
+		JOIN ( SELECT itemFk, sum(visible) as visible
+				FROM vn.itemShelvingStock iss 
+					JOIN vn.warehouse w ON w.id = iss.warehouseFk
+				WHERE  w.aliasFk = vWarehouseAliasFk
+				GROUP BY iss.itemFk ) iss ON iss.itemFk = pk.itemFk
+		SET pk.quantity = iss.visible;
+    
+	DROP TEMPORARY TABLE IF EXISTS tmp.`grouping`;
+    CREATE TEMPORARY TABLE tmp.`grouping`
+		ENGINE MEMORY
+		SELECT itemFk, `grouping`
+			FROM (
+				SELECT itemFk,
+					CASE groupingMode 
+					   WHEN 0 THEN 1 
+					   WHEN 2 THEN packing
+					   ELSE `grouping`
+					END	AS `grouping`
+				FROM buy b
+					JOIN entry e ON e.id = b.entryFk
+					JOIN travel tr ON tr.id = e.travelFk
+				WHERE tr.warehouseInFk = vWarehouseFk
+					AND landed BETWEEN (SELECT FechaInventario FROM vn2008.tblContadores LIMIT 1) AND CURDATE()
+					AND b.isIgnored = FALSE
+				ORDER BY tr.landed DESC
+			) sub
+			GROUP BY sub.itemFk ;
+                            
+	DROP TEMPORARY TABLE IF EXISTS tmp.grouping2;
+	CREATE TEMPORARY TABLE tmp.grouping2
+		ENGINE MEMORY
+		SELECT * FROM tmp.`grouping`;
+
+	SELECT 	s.id as saleFk, s.itemFk,
+			p.code COLLATE utf8_general_ci as placement ,
+			sh.code COLLATE utf8_general_ci as shelving,
+			ish.created,
+			ish.visible,
+			IFNULL(p.pickingOrder,0) as `order`,
+            IF(sc.isPreviousPreparedByPacking, ish.packing, g.`grouping`) as `grouping`
+		FROM vn.ticketCollection tc
+			JOIN vn.sale s ON s.ticketFk = tc.ticketFk
+            JOIN vn.itemShelving ish ON ish.itemFk = s.itemFk
+            JOIN vn.shelving sh ON sh.code = ish.shelvingFk
+            JOIN vn.parking p ON p.id = sh.parkingFk
+            JOIN vn.sector sc ON sc.id = p.sectorFk
+            JOIN vn.warehouse w ON w.id = sc.warehouseFk
+            JOIN tmp.`grouping` g ON g.itemFk = s.itemFk
+		WHERE tc.collectionFk = vCollectionFk
+			AND w.aliasFk = vWarehouseAliasFk
+            AND ish.visible > 0
+	UNION ALL
+	SELECT	s.id as saleFk, s.itemFk,
+			ip.code COLLATE utf8_general_ci as placement,
+            '' COLLATE utf8_general_ci as shelving,
+            modificationDate as created,
+            v.visible - p.quantity as visible,
+            IFNULL(cpd.hallway * 100,0) as `order`,
+            g.`grouping`
+		FROM vn.ticketCollection tc
+			JOIN vn.sale s ON s.ticketFk = tc.ticketFk
+            JOIN vn.itemPlacement ip ON ip.itemFk = s.itemFk AND ip.warehouseFk = vWarehouseFk
+            LEFT JOIN vn.coolerPathDetail cpd ON cpd.hallway = LEFT(ip.`code`,3)
+            JOIN tmp.parked p ON p.itemFk = s.itemFk
+            JOIN cache.visible v ON v.item_id = s.itemFk AND v.calc_id = vCalcFk
+            LEFT JOIN tmp.grouping2 g ON g.itemFk = s.itemFk
+		WHERE tc.collectionFk = vCollectionFk
+			AND v.visible - p.quantity > 0
+            AND IFNULL(cpd.id,0);
         
 	DROP TEMPORARY TABLE
 		tmp.parked,
@@ -35035,6 +35722,238 @@ DELIMITER ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `collection_new`(vSectorFk INT)
+proc:BEGIN
+
+	DECLARE vIsPreviousPrepared BOOLEAN;
+    DECLARE vCollectionFk INT;
+    DECLARE vWarehouseFk INT;
+    DECLARE vMaxTickets INT DEFAULT 4;
+    DECLARE vStateFk INT;
+    DECLARE vFirstTicketFk INT;
+    DECLARE vWorkerCode VARCHAR(3);
+    DECLARE vShelve INT;
+    DECLARE vTicket INT;
+    
+    -- Establecemos el almacén y si es un sector de preparación previa, así como el estado para los tickets que se vayan preparando
+    SELECT isPreviousPrepared, warehouseFk
+		INTO vIsPreviousPrepared, vWarehouseFk
+		FROM vn.sector
+        WHERE id = vSectorFk;
+   
+	IF vIsPreviousPrepared THEN
+    
+		SELECT id INTO vStateFk
+			FROM vn.state
+            WHERE `code` = 'PREVIOUS_PREPARATION';
+    ELSE
+    
+		SELECT id INTO vStateFk
+			FROM vn.state
+            WHERE `code` = 'ON_PREPARATION';
+            
+    END IF;
+   
+    -- Obtenemos el código del usuario
+	SELECT w.code 
+		INTO vWorkerCode
+		FROM vn.worker w
+        WHERE w.id = account.myUserGetId();
+     
+    -- Se obtiene nº de colección y el buffer con los pedidos preparables 
+	INSERT INTO vn.collection
+			SET workerFk = account.myUserGetId();
+		
+	SELECT LAST_INSERT_ID() INTO vCollectionFk;
+	
+    CALL vn2008.production_control_source(vWarehouseFk, 0);
+    
+    -- Se seleccionan los primeros tickets, asignando colección para dejarlos bloqueados a otros sacadores.
+    INSERT IGNORE INTO vn.ticketCollection(ticketFk, collectionFk)
+		SELECT 	pb.Id_Ticket,
+				vCollectionFk
+			FROM tmp.production_buffer pb
+				JOIN vn.state s ON s.id = pb.state
+			WHERE pb.collectionFk IS NULL
+				AND (s.isPreparable OR (s.code = 'PICKER_DESIGNED' AND pb.CodigoTrabajador = vWorkerCode))
+			ORDER BY (s.code = 'PICKER_DESIGNED' AND pb.CodigoTrabajador = vWorkerCode) DESC, pb.Hora, pb.Minuto
+			LIMIT vMaxTickets;
+    
+    -- Creamos una tabla temporal con los datos que necesitamos para depurar la colección
+    DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
+    CREATE TEMPORARY TABLE tmp.ticket
+		SELECT pb.Id_Ticket ticketFk,
+			   pb.lines,
+			   pb.m3 * 1000 liters,
+               0 as height,
+               0 as shelve
+			FROM tmp.production_buffer pb
+				JOIN vn.ticketCollection tc ON tc.ticketFk = pb.Id_Ticket
+                WHERE tc.collectionFk = vCollectionFk;
+	
+    /* El criterio para formar la colección es el siguiente:
+    *
+    *	1º.- Los tickets asignados son prioritarios, y por ello ya vienen ordenados en las primeras posiciones.
+    *	2º.- Las recogidas en Silla tienen que ir en carros independientes.
+    *
+    *	Por tanto, si el primer pedido es recogida, nos olvidamos del resto.
+    *	Si el primer pedido no es recogida, eliminamos las recogidas posteriores.
+    */
+    
+    SELECT ticketFk 
+		INTO vFirstTicketFk 
+		FROM tmp.ticket 
+        LIMIT 1;
+    
+    IF (SELECT pb.Agencia FROM tmp.production_buffer pb WHERE Id_Ticket = vFirstTicketFk) = 'REC_SILLA' THEN
+    
+		DELETE FROM tmp.ticket WHERE ticketFk != vFirstTicketFk;
+        
+        UPDATE tmp.ticket SET shelve = 1;
+		-- Como sólo hay un ticket, se le asigna el nivel 1 y acabamos
+    
+	ELSE
+    
+		-- Eliminamos los de recogida, puesto que el primero sabemos que no es de rec_silla
+		DELETE t.* 
+			FROM tmp.ticket t 
+            JOIN tmp.production_buffer pb ON pb.Id_Ticket = t.ticketFk
+            WHERE pb.Agencia = 'REC_SILLA';
+            
+	   -- Establece altura máxima por pedido, porque las plantas no se pueden recostar.
+		UPDATE tmp.ticket t
+			JOIN
+				( SELECT MAX(i.size) maxHeigth, 
+						tc.ticketFk
+					FROM vn.ticketCollection tc
+						JOIN vn.sale s ON s.ticketFk = tc.ticketFk
+						JOIN vn.item i ON i.id = s.itemFk
+						JOIN vn.itemType it ON it.id = i.typeFk
+						JOIN vn.itemCategory ic ON ic.id = it.categoryFk
+						WHERE ic.isReclining = FALSE
+							AND tc.collectionFk = vCollectionFk
+						GROUP BY tc.ticketFk) sub ON sub.ticketFk = t.ticketFk
+			SET t.height = sub.maxHeigth;
+            
+		-- Vamos a generar una tabla con todas las posibilidades de asignacion de pedido
+        DROP TEMPORARY TABLE IF EXISTS tmp.ticketShelve;
+        CREATE TEMPORARY TABLE tmp.ticketShelve
+			SELECT ticketFk, shelve 
+				FROM (
+					SELECT 	t.ticketFk,
+							cv.`level` shelve, 
+							CAST(cv.lines AS SIGNED) - t.lines as linesDif, 
+							CAST(cv.liters AS SIGNED) - t.liters as litersDif, 
+							CAST(cv.height AS SIGNED) - t.height as heightDif
+							FROM vn.collectionVolumetry cv
+								JOIN tmp.ticket t
+                            ORDER BY (t.ticketFk = vFirstTicketFk) DESC, linesDif
+					) sub
+				WHERE linesDif >= 0
+					AND litersDif >= 0
+					AND heightDif >= 0
+				ORDER BY linesDif;
+                
+		-- Asignamos la primera balda util al primer pedido
+        SELECT IFNULL(shelve,0) INTO vShelve
+			FROM tmp.ticketShelve
+            WHERE  ticketFk = vFirstTicketFk
+            LIMIT 1;
+        
+        IF vShelve THEN
+        
+			UPDATE tmp.ticket 
+				SET shelve = vShelve
+				WHERE ticketFk = vFirstTicketFk;
+				
+			DELETE FROM tmp.ticketShelve
+				WHERE ticketFk = vFirstTicketFk
+				OR shelve = vShelve;
+				
+			WHILE (SELECT COUNT(*) FROM tmp.ticketShelve) DO
+			
+				SELECT ticketFk, shelve 
+					INTO vTicket, vShelve
+					FROM tmp.ticketShelve
+					LIMIT 1;
+			
+				UPDATE tmp.ticket 
+					SET shelve = vShelve
+					WHERE ticketFk = vTicket;
+				
+				DELETE FROM tmp.ticketShelve
+					WHERE ticketFk = vTicket
+						OR shelve = vShelve;
+						
+			END WHILE;
+       
+        ELSE    
+        
+			UPDATE tmp.ticket 
+				SET shelve = 1
+				WHERE ticketFk = vFirstTicketFk;
+                
+		END IF;
+           
+	END IF;
+    
+     -- Eliminamos los que se han quedado sin balda
+	DELETE FROM tmp.ticket WHERE shelve = 0 ;
+
+    -- Elimina los tickets bloqueados que no se van a preparar
+	DELETE tc.* 
+		FROM vn.ticketCollection tc
+        LEFT JOIN tmp.ticket t ON t.ticketFk = tc.ticketFk
+        WHERE tc.collectionFk = vCollectionFk
+			AND t.ticketFk IS NULL;
+            
+    -- Actualiza el estado de la colección
+    UPDATE vn.collection c
+		JOIN vn.state st ON st.code = 'ON_PREPARATION'
+        SET c.stateFk = st.id
+        WHERE c.id = vCollectionFk;  
+        
+	-- Asigna las bandejas
+    UPDATE vn.ticketCollection tc
+		JOIN tmp.ticket t ON t.ticketFk = tc.ticketFk
+        SET tc.level = t.shelve;
+
+	-- Actualiza el estado de los tickets
+	INSERT INTO vncontrol.inter(state_id, Id_Ticket, Id_Trabajador)
+		SELECT vStateFk, ticketFk, account.myUserGetId()
+			FROM vn.ticketCollection tc 
+            WHERE tc.collectionFk = vCollectionFk;
+			
+    -- Avisa los preparados previos que hay que bajar del altillo imprimiendo etiqueta
+	INSERT IGNORE INTO vn.ticketDown(ticketFk)
+		SELECT DISTINCT tc.ticketFk
+        FROM vn.ticketCollection tc
+			JOIN vncontrol.inter vi ON vi.Id_Ticket = tc.ticketFk
+            JOIN vn.state st ON st.id = vi.state_id
+            JOIN vn.ticket t ON t.id = tc.ticketFk
+            JOIN vn.warehouse w ON w.id = t.warehouseFk
+            WHERE tc.collectionFk = vCollectionFk
+				AND w.name = 'Silla FV'
+                AND st.code = 'PREVIOUS_PREPARATION';
+
+    SELECT vCollectionFk;    
+    
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `collection_new__` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `collection_new__`(vSectorFk INT)
 proc:BEGIN
 
 	DECLARE vIsPreviousPrepared BOOLEAN;
@@ -35078,6 +35997,14 @@ proc:BEGIN
     
     DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
     
+    -- Reenvio a la version beta si el sector es el de pruebas
+    IF vSectorFk IN (17,18) THEN
+    
+		CALL vn.collection_new_beta(vSectorFk);
+		LEAVE proc;
+        
+    END IF;
+    
     SELECT isPreviousPrepared, warehouseFk
 		INTO vIsPreviousPrepared, vWarehouseFk
 		FROM vn.sector
@@ -35130,6 +36057,7 @@ proc:BEGIN
 				JOIN vn.state s ON s.id = pb.state
                 LEFT JOIN vn.ticketCollection tc ON tc.ticketFk = pb.Id_Ticket
 			WHERE pb.problems = 0
+				AND pb.Agencia = 'REC_SILLA'
 				AND tc.ticketFk IS NULL
 				AND (s.isPreparable OR (s.code = 'PICKER_DESIGNED' AND pb.CodigoTrabajador = vWorkerCode))
 			ORDER BY (s.code = 'PICKER_DESIGNED' AND pb.CodigoTrabajador = vWorkerCode) DESC, pb.Hora, pb.Minuto, m3 DESC, pb.lines DESC
@@ -35316,510 +36244,39 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `collection_new_beta` */;
+/*!50003 DROP PROCEDURE IF EXISTS `collection_update` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `collection_new_beta`(vSectorFk INT)
-proc:BEGIN
+CREATE DEFINER=`root`@`%` PROCEDURE `collection_update`(vTicketFk INT)
+BEGIN
+        
+    DECLARE vNumChecked INT;
+	DECLARE vCollectionFk INT;
 
-	DECLARE vIsPreviousPrepared BOOLEAN;
-    DECLARE vCollectionFk INT;
-    DECLARE vWarehouseFk INT;
-    
-    DECLARE vTicketLiters INT;
-    DECLARE vTicketLines INT;
-    DECLARE vTicketFk INT;
-    DECLARE vTicketHeight INT;
-	DECLARE vTicketHeightTop INT;
-	DECLARE vTicketHeightFloor INT;
-    DECLARE vIsTicketCollected BOOLEAN;
-    DECLARE vMaxTickets INT;
-    DECLARE vStateFk INT;
-    DECLARE vTopTicketFk INT;
-    DECLARE vFloorTicketFk INT;
-    
-	DECLARE vVolumetryLiters INT;
-    DECLARE vVolumetryLines INT;
-    DECLARE vVolumetryFk INT;
-    DECLARE vVolumetryLevel INT;
-	DECLARE vVolumetryHeight INT;
-    DECLARE vVolumetryLitersMax INT;
-    DECLARE vVolumetryLinesMax INT;
-    DECLARE vVolumetryHeightTop INT;
-    DECLARE vVolumetryHeightFloor INT;
-    
-    DECLARE vDone BOOLEAN DEFAULT FALSE;
-    DECLARE vWorkerCode VARCHAR(3);
-   
-    DECLARE cVolumetry CURSOR FOR
-		SELECT level, liters, `lines`, height
-			FROM vn.collectionVolumetry
-            ORDER BY `level`;
-    
-    DECLARE cTicket CURSOR FOR
-		SELECT *
-			FROM tmp.ticket
-            ORDER BY height DESC;
-    
-    DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-    
-    SELECT isPreviousPrepared, warehouseFk
-		INTO vIsPreviousPrepared, vWarehouseFk
-		FROM vn.sector
-        WHERE id = vSectorFk;
-        
-	SELECT w.code 
-		INTO vWorkerCode
-		FROM vn.worker w
-        WHERE w.id = account.myUserGetId();
-        
-	IF vIsPreviousPrepared THEN
-    
-		SELECT id INTO vStateFk
-			FROM vn.state
-            WHERE `code` = 'PREVIOUS_PREPARATION';
-    ELSE
-    
-		SELECT id INTO vStateFk
-			FROM vn.state
-            WHERE `code` = 'ON_PREPARATION';
-            
-    END IF;
-        
-	SELECT COUNT(*), sum(liters), sum(`lines`)
-		INTO vMaxTickets, vVolumetryLitersMax, vVolumetryLinesMax
-		FROM vn.collectionVolumetry;
-	
-    CALL vn2008.production_control_source(vWarehouseFk, 0);
-    
-    DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
-    
-    -- Recogida Silla requiere carros individuales
-    
-    IF (SELECT pb.Agencia 
-			FROM tmp.production_buffer pb
-				JOIN vn.state s ON s.id = pb.state
-                LEFT JOIN vn.ticketCollection tc ON tc.ticketFk = pb.Id_Ticket
-            WHERE pb.problems = 0
-				AND tc.ticketFk IS NULL
-				AND (s.isPreparable OR (s.code = 'PICKER_DESIGNED' AND pb.CodigoTrabajador = vWorkerCode))
-            ORDER BY (s.code = 'PICKER_DESIGNED' AND pb.CodigoTrabajador = vWorkerCode) DESC, pb.Hora, pb.Minuto, m3 DESC, pb.lines DESC
-            LIMIT 1) = 'REC_SILLA' THEN
-	
-		CREATE TEMPORARY TABLE tmp.ticket
-		SELECT pb.Id_Ticket ticketFk,
-			   pb.lines,
-			   pb.m3 * 1000 liters,
-               0 as height
-			FROM tmp.production_buffer pb
-				JOIN vn.state s ON s.id = pb.state
-                LEFT JOIN vn.ticketCollection tc ON tc.ticketFk = pb.Id_Ticket
-			WHERE pb.problems = 0
-				AND tc.ticketFk IS NULL
-				AND (s.isPreparable OR (s.code = 'PICKER_DESIGNED' AND pb.CodigoTrabajador = vWorkerCode))
-			ORDER BY (s.code = 'PICKER_DESIGNED' AND pb.CodigoTrabajador = vWorkerCode) DESC, pb.Hora, pb.Minuto, m3 DESC, pb.lines DESC
-			LIMIT 1;
-    
-    ELSE
-    
-		CREATE TEMPORARY TABLE tmp.ticket
-			SELECT pb.Id_Ticket ticketFk,
-				   pb.lines,
-				   pb.m3 * 1000 liters,
-                   0 as height
-				FROM tmp.production_buffer pb
-					JOIN vn.state s ON s.id = pb.state
-					LEFT JOIN vn.ticketCollection tc ON tc.ticketFk = pb.Id_Ticket
-				WHERE pb.problems = 0
-					AND pb.Agencia != 'REC_SILLA'
-					AND tc.ticketFk IS NULL
-					AND (s.isPreparable OR (s.code = 'PICKER_DESIGNED' AND pb.CodigoTrabajador = vWorkerCode))
-				ORDER BY (s.code = 'PICKER_DESIGNED' AND pb.CodigoTrabajador = vWorkerCode) DESC, pb.Hora, pb.Minuto, m3 DESC, pb.lines DESC
-				LIMIT vMaxTickets;
-                
-		-- Establece altura máxima por pedido, porque las plantas no se pueden recostar.
-        
-		DROP TEMPORARY TABLE IF EXISTS tmp.ticket2;
-        CREATE TEMPORARY TABLE tmp.ticket2
-        SELECT MAX(i.size) maxHeigth, t.ticketFk
-				FROM tmp.ticket t
-				JOIN vn.sale s ON s.ticketFk = t.ticketFk
-				JOIN vn.item i ON i.id = s.itemFk
-				JOIN vn.itemType it ON it.id = i.typeFk
-				JOIN vn.itemCategory ic ON ic.id = it.categoryFk
-				WHERE ic.isReclining = FALSE
-				GROUP BY t.ticketFk;
-                
-        UPDATE tmp.ticket t
-			JOIN tmp.ticket2 t2 ON t2.ticketFk = t.ticketFk
-            SET t.height = t2.maxHeigth;
-        
-        DROP TEMPORARY TABLE IF EXISTS tmp.ticket2;
-		-- Si hay un ticket con una planta que supera la máxima altura para la bandeja superior, el pedido ha de ser único. Por tanto, eliminamos el resto.
-	    -- Si hay dos tickets con plantas que superen la medida inferior, el carro llevará una bandeja. Hay que eliminar los otros dos.
-  
-		SELECT height, ticketFk 
-			INTO vTicketHeightTop, vTopTicketFk 
-			FROM tmp.ticket
-            ORDER BY height DESC
-            LIMIT 1;
-            
-		SELECT max(height) 
-			INTO vVolumetryHeightTop
-            FROM vn.collectionVolumetry;
-            
-		SELECT height, ticketFk 
-			INTO vTicketHeightFloor, vFloorTicketFk 
-			FROM tmp.ticket
-            WHERE ticketFk != vTopTicketFk
-            ORDER BY height DESC
-            LIMIT 1;
-            
-		SELECT height 
-			INTO vVolumetryHeightFloor
-            FROM vn.collectionVolumetry
-            WHERE level = 1;
-            
-		IF vTicketHeightTop > vVolumetryHeightTop 
-			OR vTicketHeightFloor > vVolumetryHeightFloor THEN
-        
-			DELETE FROM tmp.ticket WHERE ticketFk != vTopTicketFk;
-            
-		ELSEIF vTicketHeightFloor <= vVolumetryHeightFloor THEN
-        
-			DELETE FROM tmp.ticket WHERE ticketFk NOT IN (vTopTicketFk, vFloorTicketFk);
-		
-        END IF;
-           
-      
-            
+	/*SI TODAS LOS TICKETS DE UNA COLECCIÓN ESTAN REVISADOS CAMBIADOS ESTADO COLECCIÓN*/
+	SELECT collectionFk
+	INTO vCollectionFk
+	FROM vn.ticketCollection
+	WHERE ticketFk = vTicketFk;
+
+	IF (SELECT COUNT(*)
+		FROM vn.ticketCollection tc
+		JOIN vn.ticketLastState tls ON tls.ticketFk = tc.ticketFk
+		WHERE tc.collectionFk = vCollectionFk
+		AND (name = 'Preparación' OR name = 'En Revisión' OR name = 'Impreso' OR name = 'Preparado') ) = 0 THEN
+
+		UPDATE vn.collection
+		SET stateFk = (SELECT id FROM vn.state WHERE code = 'PREPARED')
+		WHERE id = vCollectionFk;
 	END IF;
-      
-    
-    -- Empieza el bucle
-    OPEN cVolumetry;
-    OPEN cTicket;
-
-	FETCH cTicket INTO vTicketFk, vTicketLines, vTicketLiters, vTicketHeight;
-	FETCH cVolumetry INTO vVolumetryLevel, vVolumetryLiters, vVolumetryLines, vVolumetryHeight;
- 
-	IF NOT vDone THEN
-    
-		INSERT INTO vn.collection
-			SET workerFk = account.myUserGetId();
-		
-		SELECT LAST_INSERT_ID() INTO vCollectionFk;
-    
-    END IF;
- 
-	bucle:WHILE NOT vDone DO
-    
-		IF (vVolumetryLitersMax < vTicketLiters OR vVolumetryLinesMax < vTicketLines) AND vVolumetryLevel > 1 THEN
-			
-            LEAVE bucle;
-            
-		END IF;
-    
-		SELECT COUNT(*) INTO vIsTicketCollected
-			FROM vn.ticketCollection
-			WHERE ticketFk = vTicketFk
-				AND collectionFk = vCollectionFk;
-		
-		IF vIsTicketCollected THEN
-        
-			UPDATE vn.ticketCollection
-				SET level = CONCAT(level, vVolumetryLevel)
-                WHERE ticketFk = vTicketFk
-				AND collectionFk = vCollectionFk;
-        
-        ELSE
-        
-			INSERT INTO vn.ticketCollection
-					SET collectionFk = vCollectionFk,
-						ticketFk = vTicketFk,
-						level = vVolumetryLevel;
-                        
-			INSERT INTO vncontrol.inter
-					SET state_id = vStateFk,
-                    Id_Ticket = vTicketFk,
-                    Id_Trabajador = account.myUserGetId();
-		
-        END IF;
-
-        SET vVolumetryLitersMax = GREATEST(0,vVolumetryLitersMax - vVolumetryLiters);
-        SET vVolumetryLinesMax = GREATEST(0,vVolumetryLinesMax - vVolumetryLines);
-        SET vTicketLiters = GREATEST(0,vTicketLiters - vVolumetryLiters);
-        SET vTicketLines = GREATEST(0,vTicketLines - vVolumetryLines);
-        
-		IF vVolumetryLitersMax = 0 OR vVolumetryLinesMax = 0 THEN
-                
-			LEAVE bucle;
-            
-        END IF;
-        
-        IF vTicketLiters > 0 OR vTicketLines > 0 THEN
-        
-			FETCH cVolumetry INTO vVolumetryLevel, vVolumetryLiters, vVolumetryLines, vVolumetryHeight;
-            
-        ELSE
-        
-			FETCH cTicket INTO vTicketFk, vTicketLines, vTicketLiters, vTicketHeight;
-			FETCH cVolumetry INTO vVolumetryLevel, vVolumetryLiters, vVolumetryLines, vVolumetryHeight;
-            
-        END IF;
-	
-	END WHILE;
-	
-    
-    UPDATE vn.collection c
-		JOIN vn.state st ON st.code = 'ON_PREPARATION'
-        SET c.stateFk = st.id
-        WHERE c.id = vCollectionFk;
-        
-	INSERT IGNORE INTO vn.ticketDown(ticketFk)
-		SELECT DISTINCT tc.ticketFk
-        FROM vn.ticketCollection tc
-			JOIN vncontrol.inter vi ON vi.Id_Ticket = tc.ticketFk
-            JOIN vn.state st ON st.id = vi.state_id
-            JOIN vn.ticket t ON t.id = tc.ticketFk
-            JOIN vn.warehouse w ON w.id = t.warehouseFk
-            WHERE tc.collectionFk = vCollectionFk
-				AND w.name = 'Silla FV'
-                AND st.code = 'PREVIOUS_PREPARATION';
-
-        
-    SELECT vCollectionFk;    
-    
-    CLOSE cVolumetry;
-    CLOSE cTicket;
-    -- DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
-	-- DROP TEMPORARY TABLE IF EXISTS tmp.ticket2;
-    
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `collection_new__` */;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `collection_new__`(vSectorFk INT)
-proc:BEGIN
-
-	DECLARE vIsPreviousPrepared BOOLEAN;
-    DECLARE vCollectionFk INT;
-    DECLARE vWarehouseFk INT;
-    DECLARE vTicketLiters INT;
-    DECLARE vTicketLines INT;
-    DECLARE vTicketFk INT;
-    DECLARE vIsTicketCollected BOOLEAN;
-    DECLARE vMaxTickets INT;
-    DECLARE vStateFk INT;
-	DECLARE vVolumetryLiters INT;
-    DECLARE vVolumetryLines INT;
-    DECLARE vVolumetryFk INT;
-    DECLARE vVolumetryLevel INT;
-    DECLARE vVolumetryLitersMax INT;
-    DECLARE vVolumetryLinesMax INT;
-    DECLARE vDone BOOLEAN DEFAULT FALSE;
-    DECLARE vWorkerCode VARCHAR(3);
-    
-    DECLARE cVolumetry CURSOR FOR
-		SELECT level, liters, `lines`
-			FROM vn.collectionVolumetry
-            ORDER BY `level`;
-    
-    DECLARE cTicket CURSOR FOR
-		SELECT *
-			FROM tmp.ticket;
-    
-    DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-    
-    SELECT isPreviousPrepared, warehouseFk
-		INTO vIsPreviousPrepared, vWarehouseFk
-		FROM vn.sector
-        WHERE id = vSectorFk;
-        
-	SELECT w.code 
-		INTO vWorkerCode
-		FROM vn.worker w
-        WHERE w.id = account.myUserGetId();
-        
-	IF vIsPreviousPrepared THEN
-    
-		SELECT id INTO vStateFk
-			FROM vn.state
-            WHERE `code` = 'PREVIOUS_PREPARATION';
-    ELSE
-    
-		SELECT id INTO vStateFk
-			FROM vn.state
-            WHERE `code` = 'ON_PREPARATION';
-            
-    END IF;
-        
-	SELECT COUNT(*), sum(liters), sum(`lines`)
-		INTO vMaxTickets, vVolumetryLitersMax, vVolumetryLinesMax
-		FROM vn.collectionVolumetry;
-	
-    CALL vn2008.production_control_source(vWarehouseFk, 0);
-    
-    DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
-    
-    IF (SELECT pb.Agencia 
-			FROM tmp.production_buffer pb
-				JOIN vn.state s ON s.id = pb.state
-                LEFT JOIN vn.ticketCollection tc ON tc.ticketFk = pb.Id_Ticket
-            WHERE pb.problems = 0
-				AND tc.ticketFk IS NULL
-				AND (s.isPreparable OR (s.code = 'PICKER_DESIGNED' AND pb.CodigoTrabajador = vWorkerCode))
-            ORDER BY (s.code = 'PICKER_DESIGNED' AND pb.CodigoTrabajador = vWorkerCode) DESC, pb.Hora, pb.Minuto, m3 DESC, pb.lines DESC
-            LIMIT 1) = 'REC_SILLA' THEN
-	
-		CREATE TEMPORARY TABLE tmp.ticket
-		SELECT pb.Id_Ticket ticketFk,
-			   pb.lines,
-			   pb.m3 * 1000 liters
-			FROM tmp.production_buffer pb
-				JOIN vn.state s ON s.id = pb.state
-                LEFT JOIN vn.ticketCollection tc ON tc.ticketFk = pb.Id_Ticket
-			WHERE pb.problems = 0
-				AND tc.ticketFk IS NULL
-				AND (s.isPreparable OR (s.code = 'PICKER_DESIGNED' AND pb.CodigoTrabajador = vWorkerCode))
-			ORDER BY (s.code = 'PICKER_DESIGNED' AND pb.CodigoTrabajador = vWorkerCode) DESC, pb.Hora, pb.Minuto, m3 DESC, pb.lines DESC
-			LIMIT 1;
-    
-    ELSE
-    
-		CREATE TEMPORARY TABLE tmp.ticket
-			SELECT pb.Id_Ticket ticketFk,
-				   pb.lines,
-				   pb.m3 * 1000 liters
-				FROM tmp.production_buffer pb
-					JOIN vn.state s ON s.id = pb.state
-					LEFT JOIN vn.ticketCollection tc ON tc.ticketFk = pb.Id_Ticket
-				WHERE pb.problems = 0
-					AND pb.Agencia != 'REC_SILLA'
-					AND tc.ticketFk IS NULL
-					AND (s.isPreparable OR (s.code = 'PICKER_DESIGNED' AND pb.CodigoTrabajador = vWorkerCode))
-				ORDER BY (s.code = 'PICKER_DESIGNED' AND pb.CodigoTrabajador = vWorkerCode) DESC, pb.Hora, pb.Minuto, m3 DESC, pb.lines DESC
-				LIMIT vMaxTickets;
-            
-	END IF;
-    
-    -- Empieza el bucle
-    OPEN cVolumetry;
-    OPEN cTicket;
-
-	FETCH cTicket INTO vTicketFk, vTicketLines, vTicketLiters;
-	FETCH cVolumetry INTO vVolumetryLevel, vVolumetryLiters, vVolumetryLines;
- 
-	IF NOT vDone THEN
-    
-		INSERT INTO vn.collection
-			SET workerFk = account.myUserGetId();
-		
-		SELECT LAST_INSERT_ID() INTO vCollectionFk;
-    
-    END IF;
- 
-	bucle:WHILE NOT vDone DO
-    
-		IF (vVolumetryLitersMax < vTicketLiters OR vVolumetryLinesMax < vTicketLines) AND vVolumetryLevel > 1 THEN
-			
-            LEAVE bucle;
-            
-		END IF;
-    
-		SELECT COUNT(*) INTO vIsTicketCollected
-			FROM vn.ticketCollection
-			WHERE ticketFk = vTicketFk
-				AND collectionFk = vCollectionFk;
-		
-		IF vIsTicketCollected THEN
-        
-			UPDATE vn.ticketCollection
-				SET level = CONCAT(level, vVolumetryLevel)
-                WHERE ticketFk = vTicketFk
-				AND collectionFk = vCollectionFk;
-        
-        ELSE
-        
-			INSERT INTO vn.ticketCollection
-					SET collectionFk = vCollectionFk,
-						ticketFk = vTicketFk,
-						level = vVolumetryLevel;
-                        
-			INSERT INTO vncontrol.inter
-					SET state_id = vStateFk,
-                    Id_Ticket = vTicketFk,
-                    Id_Trabajador = account.myUserGetId();
-		
-        END IF;
-
-        SET vVolumetryLitersMax = GREATEST(0,vVolumetryLitersMax - vVolumetryLiters);
-        SET vVolumetryLinesMax = GREATEST(0,vVolumetryLinesMax - vVolumetryLines);
-        SET vTicketLiters = GREATEST(0,vTicketLiters - vVolumetryLiters);
-        SET vTicketLines = GREATEST(0,vTicketLines - vVolumetryLines);
-        
-		IF vVolumetryLitersMax = 0 OR vVolumetryLinesMax = 0 THEN
-                
-			LEAVE bucle;
-            
-        END IF;
-        
-        IF vTicketLiters > 0 OR vTicketLines > 0 THEN
-        
-			FETCH cVolumetry INTO vVolumetryLevel, vVolumetryLiters, vVolumetryLines;
-            
-        ELSE
-        
-			FETCH cTicket INTO vTicketFk, vTicketLines, vTicketLiters;
-			FETCH cVolumetry INTO vVolumetryLevel, vVolumetryLiters, vVolumetryLines;
-            
-        END IF;
-	
-	END WHILE;
-	
-    
-    UPDATE vn.collection c
-		JOIN vn.state st ON st.code = 'ON_PREPARATION'
-        SET c.stateFk = st.id
-        WHERE c.id = vCollectionFk;
-        
-	INSERT IGNORE INTO vn.ticketDown(ticketFk)
-		SELECT DISTINCT tc.ticketFk
-        FROM vn.ticketCollection tc
-			JOIN vncontrol.inter vi ON vi.Id_Ticket = tc.ticketFk
-            JOIN vn.state st ON st.id = vi.state_id
-            JOIN vn.ticket t ON t.id = tc.ticketFk
-            JOIN vn.warehouse w ON w.id = t.warehouseFk
-            WHERE tc.collectionFk = vCollectionFk
-				AND w.name = 'Silla FV'
-                AND st.code = 'PREVIOUS_PREPARATION';
-
-        
-    SELECT vCollectionFk;    
-    
-    CLOSE cVolumetry;
-    CLOSE cTicket;
-    DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
-    
+	  
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -37815,7 +38272,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `getItemUbication`(vItemFk INT)
+CREATE DEFINER=`root`@`%` PROCEDURE `getItemUbication`(vItemFk VARCHAR(22))
 BEGIN
 	SELECT vn.barcodeToItem(vItemFk) INTO vItemFk;
 
@@ -41882,28 +42339,22 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingMake`(IN `vShelvingFk` VARCHAR(8), IN `vBarcode` VARCHAR(22), IN `vShelve` VARCHAR(2), IN `vDeep` INT, IN `vQuantity` INT, IN `vPackagingFk` VARCHAR(10), IN `vGrouping` INT, IN `vPacking` INT, IN `vWarehouseFk` INT, IN `vLevel` INT)
 BEGIN
 	
-    
-    
     DECLARE vItemFk INT;
-    
-    
-    
+
     SELECT vn.barcodeToItem(vBarcode) INTO vItemFk;
     
-
-	SELECT itemFk INTO vItemFk
+	/*SELECT itemFk INTO vItemFk
 		FROM vn.buy b
-        WHERE b.id = vItemFk;
-        
+        WHERE b.id = vItemFk;*/
         
 	IF (SELECT COUNT(*) FROM vn.shelving WHERE code = vShelvingFk COLLATE utf8_unicode_ci) = 0 THEN
     
@@ -41915,8 +42366,6 @@ BEGIN
     
     END IF;
     
-	
-    
     IF (SELECT COUNT(*) FROM vn.itemShelving 
 			WHERE shelvingFk COLLATE utf8_unicode_ci  = vShelvingFk 
 				AND itemFk  = vItemFk 
@@ -42474,9 +42923,9 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
@@ -42497,12 +42946,10 @@ BEGIN
     LIMIT 1;
 
     UPDATE vn.itemShelving
-    SET quantity = quantity - ( vPacking * vQuantity ),
-			visible = visible - ( vPacking * vQuantity ),
-			available = available - ( vPacking * vQuantity )
+    SET shelvingFk = shelvingFkD
 	 WHERE shelvingFk = shelvingFkO COLLATE utf8_unicode_ci AND itemFk = vItemFk;
      
-	CALL vn.itemShelvingMakeFromDate(shelvingFkD,vItemFk,'A',0,( vPacking * vQuantity ),'',0,vPacking,1,1,vDate); 
+	/*CALL vn.itemShelvingMakeFromDate(shelvingFkD,vItemFk,'A',0,( vPacking * vQuantity ),'',0,vPacking,1,1,vDate); */
 
 	SELECT true;
 
@@ -43547,9 +43994,25 @@ BEGIN
 	DECLARE vWorkerIsExcluded BOOLEAN;
 	DECLARE vFromDated DATE;
     DECLARE vToDated DATE DEFAULT TIMESTAMPADD(DAY,1,CURDATE());
-
-	SELECT COUNT(*) INTO vWorkerIsExcluded
-		FROM bs.manaSpellersExcluded
+	DECLARE vMana INT;
+    DECLARE vAutoMana INT;
+    DECLARE vManaBank INT;
+    DECLARE vManaGreugeType INT;
+    
+    SELECT id INTO vMana 
+		FROM `component` WHERE code = 'mana';
+    
+    SELECT id INTO vAutoMana 
+		FROM `component` WHERE code = 'autoMana';
+	
+	SELECT id INTO vManaBank 
+		FROM `bank` WHERE code = 'mana';
+	
+	SELECT id INTO vManaGreugeType 
+		FROM `greugeType` WHERE code = 'mana';
+        
+    SELECT COUNT(*) INTO vWorkerIsExcluded
+		FROM workerManaExcluded
 		WHERE workerFk = vWorkerFk;
     
 	IF NOT vWorkerIsExcluded THEN
@@ -43557,7 +44020,7 @@ BEGIN
 		SELECT max(dated) INTO vFromDated 
 			FROM clientManaCache;
             
-        REPLACE bs.workerMana (workerFk, amount)
+        REPLACE workerMana (workerFk, amount)
 			SELECT vWorkerFk, sum(mana) FROM 
 			(
 				SELECT s.quantity * sc.value as mana
@@ -43566,28 +44029,22 @@ BEGIN
 						JOIN client c ON c.id = a.clientFk
 						JOIN sale s ON s.ticketFk = t.id
 						JOIN saleComponent sc ON sc.saleFk = s.id
-					WHERE c.salesPersonFk =  vWorkerFk AND componentFk IN (39, 37) -- maná auto y maná
+					WHERE c.salesPersonFk =  vWorkerFk AND sc.componentFk IN (vMana, vAutoMana)
 						AND t.shipped > vFromDated AND t.shipped < vToDated
-
 				UNION ALL
-
 				SELECT  - r.amountPaid
 					FROM receipt r
 						JOIN client c ON c.id = r.clientFk
-					WHERE c.salesPersonFk = vWorkerFk AND bankFk = 66
+					WHERE c.salesPersonFk = vWorkerFk AND bankFk = vManaBank
 						AND payed > vFromDated
-				
 				UNION ALL
-				
 				SELECT g.amount
 					FROM greuge g
 						JOIN client c ON c.id = g.clientFk
-					WHERE c.salesPersonFk = vWorkerFk AND g.greugeTypeFk = 3 -- Maná
-						AND g.shipped > vFromDated and g.shipped < CURDATE()
-				
-				UNION ALL
-				
-				SELECT mana
+					WHERE c.salesPersonFk = vWorkerFk AND g.greugeTypeFk = vManaGreugeType
+						AND g.shipped > vFromDated and g.shipped < CURDATE()				
+				UNION ALL				
+				SELECT cc.mana
 					FROM clientManaCache cc
 						JOIN client c ON c.id = cc.clientFk
 					WHERE c.salesPersonFk = vWorkerFk AND cc.dated = vFromDated
@@ -44462,7 +44919,7 @@ BEGIN
 		WHILE vRow <= vToRow DO
     
 			INSERT IGNORE INTO vn.parking(`column`, `row`, sectorFk, `code`, pickingOrder)
-				VALUES (vColumn, vRow, vSectorFk, vCode, vColumn )
+				VALUES (vColumn, vRow, vSectorFk, vCode, vColumn * 100 + vRow )
                 ON DUPLICATE KEY UPDATE `code` = vCode;
 			
 			SET vRow = vRow + 1;
@@ -44623,7 +45080,6 @@ BEGIN
 
 	SELECT 0,999999,0 INTO @sameTicket, @ticket, @litrosTicket;
     
-
 	SELECT  @litrosTicket := IF(sub.ticketFk = @ticket, @litrosTicket + Litros, Litros) as LitrosTicket,
 			@sameTicket := IF(sub.ticketFk = @ticket, @sameTicket, IF(@sameTicket, 0 , 1)) as sameTicket, 
 			sub.*, 
@@ -44641,7 +45097,7 @@ BEGIN
 							CAST(isa.physicalVolume * 1000 AS DECIMAL(10,0)) as Litros
 						FROM vn.itemShelvingAvailable isa
 						JOIN vn.item i ON i.id = isa.itemFk
-						JOIN vn.sector s ON s.id = isa.sectorFk
+						JOIN vn.sector s ON s.id = isa.sectorFk AND s.warehouseFk = isa.warehouseFk
 						WHERE IF(s.isPreviousPreparedByPacking, (MOD(TRUNCATE(isa.quantity,0), isa.packing)= 0 ), TRUE)
 							AND isa.isPreviousPreparable = TRUE
 							AND isa.sectorFk = vSectorFk
@@ -46151,7 +46607,7 @@ DELIMITER ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `shelvingPark`(IN `vShelvingFk` VARCHAR(8), IN `vParkingCode` VARCHAR(8))
-BEGIN
+proc: BEGIN
 
 	DECLARE vParkingFk INT DEFAULT 0;
     DECLARE idParking INT;
@@ -46162,22 +46618,23 @@ BEGIN
     /*ELIMINAR ESPACIOS*/
     SET vParkingCode = replace(vParkingCode,' ','')  ;
      
-	/*SINO EXISTE EL PARKING LO CREAMOS*/
+	/*SINO EXISTE EL PARKING ABORTAMOS*/
 	SELECT id INTO idParking
 	FROM vn.parking
 	WHERE code = vParkingCode COLLATE utf8_unicode_ci;
-
+	
 	IF idParking IS NULL THEN      
-		IF LOCATE('-',vParkingCode) = 4 THEN
+    
+		LEAVE proc;
+		/*IF LOCATE('-',vParkingCode) = 4 THEN
 			SELECT SUBSTRING_INDEX(vParkingCode,'-',1) INTO vColumn;
 			SELECT SUBSTRING_INDEX(vParkingCode,'-',-1) INTO vRow;
 			INSERT INTO vn.parking(`column`,`row`,code,sectorFk)
 			VALUES(vColumn,vRow,vParkingCode,1);
 		END IF;
+        */
 	END IF;
-	/*FIN INSERTAR PARKING*/
-
-
+	
 	SELECT id INTO vParkingFk
 		FROM vn.parking
 		WHERE `code` = vParkingCode COLLATE utf8_unicode_ci;
@@ -46321,77 +46778,6 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `sinComponentes` */;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `sinComponentes`()
-BEGIN
-  DECLARE v_done BOOL DEFAULT FALSE;
-  DECLARE vSaleFk INTEGER;
-  DECLARE vCur CURSOR FOR
-SELECT s.id
-	FROM vn.ticket t
-    JOIN vn.client clt ON clt.id = t.clientFk
-    JOIN vn.sale s ON s.ticketFk = t.id
-    JOIN vn.item i ON i.id = s.itemFk
-    JOIN vn.itemType tp ON tp.id = i.typeFk
-    JOIN vn.itemCategory ic ON ic.id = tp.categoryFk
-    LEFT JOIN tmp.coste c ON c.id = s.id
-	WHERE t.shipped  >= '2019-10-01' AND  t.shipped  <= '2019-10-30'
-    AND c.id IS NULL
-    AND clt.isActive != 0
-    AND ic.merchandise != 0
-    GROUP BY s.id;
-   
-  DECLARE CONTINUE HANDLER FOR NOT FOUND
-    SET v_done = TRUE; 
-
-DROP TEMPORARY TABLE IF EXISTS tmp.coste;
-
-DROP TEMPORARY TABLE IF EXISTS tmp.coste;
-CREATE TEMPORARY TABLE tmp.coste
-     (primary key (id)) ENGINE = MEMORY
-    SELECT s.id
-	FROM vn.ticket t
-		JOIN vn.client clt ON clt.id = t.clientFk
-		JOIN vn.sale s ON s.ticketFk = t.id
-		JOIN vn.item i ON i.id = s.itemFk
-		JOIN vn.itemType tp ON tp.id = i.typeFk
-		JOIN vn.itemCategory ic ON ic.id = tp.categoryFk
-		JOIN vn.saleComponent sc ON sc.saleFk = s.id
-		JOIN vn.component c ON c.id = sc.componentFk
-		JOIN vn.componentType ct ON ct.id = c.typeFk AND ct.id = 1
-	WHERE t.shipped  >= '2019-10-01'
-		AND ic.merchandise != 0;
-	
-        
-  OPEN vCur;
-
-  l: LOOP
-   SET v_done = FALSE;
-   FETCH vCur INTO vSaleFk;
-
-   IF v_done THEN
-    LEAVE l;
-   END IF;
-
-   CALL vn.ticketCalculateSaleForcePrice2(vSaleFk);
-  END LOOP;
-
-  CLOSE vCur; 
- END ;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `solunionRiskRequest` */;
 ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_general_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
@@ -47455,9 +47841,9 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
@@ -47478,6 +47864,7 @@ BEGIN
 	DECLARE vNewInvoiceId INT;
 	DECLARE vHasDailyInvoice BOOL;
 	DECLARE vWithPackage BOOL;
+    DECLARE vHasToInvoice BOOL;
 
 	DECLARE cur CURSOR FOR
 		SELECT ticketFk FROM tmp.ticketClosure;
@@ -47511,13 +47898,15 @@ BEGIN
 				t.companyFk,
 				t.shipped,
 				co.hasDailyInvoice,
-				w.isManaged
+				w.isManaged,
+                c.hasToInvoice
 			INTO vClientFk,
 				vIsTaxDataChecked,
 				vCompanyFk, 
 				vShipped,
 				vHasDailyInvoice,
-				vWithPackage
+				vWithPackage,
+                vHasToInvoice
 			FROM ticket t 
 				JOIN `client` c ON c.id = t.clientFk
 				JOIN province p ON p.id = c.provinceFk
@@ -47543,7 +47932,7 @@ BEGIN
 					AND getSpecialPrice(e.itemFk, vClientFk) > 0
 				GROUP BY e.itemFk);
 			
-		IF(vHasDailyInvoice) THEN
+		IF(vHasDailyInvoice) AND vHasToInvoice THEN
 
 			-- Facturacion rapida
 			CALL ticketTrackingAdd(vTicketFk, 'DELIVERED', NULL);
@@ -47827,6 +48216,30 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `ticketCollection_get` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `ticketCollection_get`(vTicketFk INT)
+BEGIN
+
+	SELECT collectionFk 
+    FROM vn.collectionReportSource 
+    WHERE ticketFk = vTicketFk
+    GROUP BY collectionFk;
+        
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `ticketComponentCalculate__` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -48526,7 +48939,7 @@ BEGIN
 				FROM saleComponent sc
 					JOIN tmp.sale tmps ON tmps.saleFk = sc.saleFk
 					JOIN `component` c ON c.id = sc.componentFk
-					JOIN componentType ct on ct.id = c.typeFk AND ct.base
+					JOIN componentType ct on ct.id = c.typeFk AND ct.isBase
 				GROUP BY sc.saleFk) sc ON sc.saleFk = s.id
 		SET s.priceFixed = sumValue, s.isPriceFixed = 1;
 
@@ -50433,7 +50846,7 @@ BEGIN
     DECLARE vWarehouseFk INT;
 	DECLARE vCursor CURSOR FOR 
 		SELECT id, landed, addressFk, agencyModeFk, warehouseFk
-        FROM vn.ticket WHERE shipped >= '2019-07-01';
+        FROM vn.ticket WHERE shipped BETWEEN '2019-01-01' and '2019-02-01' AND zoneFk is null;
 	DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET vDone = 1;
     
     OPEN vCursor;
@@ -50442,7 +50855,7 @@ BEGIN
         CALL zoneGetShippedWarehouse(vLanded, vAddressFk, vAgencyModeFk);
         UPDATE vn.ticket t
 			JOIN tmp.zoneGetShipped zgs ON zgs.warehouseFk = vWarehouseFk
-			SET zoneFk = zgs.id
+			SET t.zoneFk = zgs.zoneFk
 		WHERE t.id = vFechedTicket;
         
      UNTIL vDone END REPEAT;
@@ -50683,6 +51096,76 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `ticket_withoutComponents` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `ticket_withoutComponents`(vDatedFrom DATETIME, vDatedTo DATETIME)
+BEGIN
+  DECLARE v_done BOOL DEFAULT FALSE;
+  DECLARE vSaleFk INTEGER;
+  DECLARE vCur CURSOR FOR
+	SELECT s.id
+		FROM vn.ticket t
+			JOIN vn.client clt ON clt.id = t.clientFk
+			JOIN vn.sale s ON s.ticketFk = t.id
+			JOIN vn.item i ON i.id = s.itemFk
+			JOIN vn.itemType tp ON tp.id = i.typeFk
+			JOIN vn.itemCategory ic ON ic.id = tp.categoryFk
+			LEFT JOIN tmp.coste c ON c.id = s.id
+		WHERE t.shipped  >= vDatedFrom AND  t.shipped  <= vDatedTo
+			AND c.id IS NULL
+			AND clt.isActive != 0
+			AND ic.merchandise != 0
+		GROUP BY s.id;
+	   
+	  DECLARE CONTINUE HANDLER FOR NOT FOUND
+		SET v_done = TRUE; 
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.coste;
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.coste;
+	CREATE TEMPORARY TABLE tmp.coste
+		 (primary key (id)) ENGINE = MEMORY
+		SELECT s.id
+		FROM vn.ticket t
+			JOIN vn.client clt ON clt.id = t.clientFk
+			JOIN vn.sale s ON s.ticketFk = t.id
+			JOIN vn.item i ON i.id = s.itemFk
+			JOIN vn.itemType tp ON tp.id = i.typeFk
+			JOIN vn.itemCategory ic ON ic.id = tp.categoryFk
+			JOIN vn.saleComponent sc ON sc.saleFk = s.id
+			JOIN vn.component c ON c.id = sc.componentFk
+			JOIN vn.componentType ct ON ct.id = c.typeFk AND ct.id = 1
+		WHERE t.shipped  >= vDatedFrom
+			AND ic.merchandise != 0;
+		
+	  OPEN vCur;
+
+	  l: LOOP
+	   SET v_done = FALSE;
+	   FETCH vCur INTO vSaleFk;
+
+	   IF v_done THEN
+		LEAVE l;
+	   END IF;
+
+	   CALL vn.ticketCalculateSaleForcePrice2(vSaleFk);
+	  END LOOP;
+
+	  CLOSE vCur; 
+ END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `timeBusiness_calculate` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -50944,9 +51427,9 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
@@ -50976,10 +51459,14 @@ BEGIN
 								 wtc.userFk,
 								 wtc.timed timed,
 								 direction
-							FROM workerTimeControl wtc
-								JOIN tmp.`user` w ON w.userFk = wtc.userFk
+							FROM (SELECT wtc.* 
+										FROM workerTimeControl wtc
+											JOIN tmp.`user` w ON w.userFk = wtc.userFk
+                                        WHERE wtc.timed BETWEEN vDatedFrom AND vDatedTo     
+                                        ORDER BY userFk, timed ASC
+								  ) wtc
 							WHERE wtc.timed BETWEEN vDatedFrom AND vDatedTo 
-							ORDER BY userFk, timed
+							ORDER BY userFk, timed ASC
 						 ) sub
 					GROUP BY userFk, dated
 					ORDER BY userFk, dated
@@ -51138,6 +51625,57 @@ BEGIN
   
   DROP TEMPORARY TABLE tmp.`user`;
 
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `timeControl_calculate__` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `timeControl_calculate__`(vDatedFrom DATETIME, vDatedTo DATETIME)
+BEGIN
+	SET @vIsOdd := TRUE;
+	SET @vUser := NULL;
+	SET @vDated := NULL;	
+ 
+	DROP TEMPORARY TABLE IF EXISTS tmp.timeControlCalculate;
+	
+	CREATE TEMPORARY TABLE tmp.timeControlCalculate
+	  SELECT  userFk,
+			  dated,
+			  IF( timeWork >= 18000, @timeWork:=timeWork + 1200, @timeWork:=timeWork) timeWorkSeconds,
+			  SEC_TO_TIME(@timeWork ) timeWorkSexagesimal,    
+			  @timeWork / 3600 timeWorkDecimal 
+			FROM (SELECT SUM(timeWork) timeWork, 
+						 userFk, 
+                         dated 
+					FROM (SELECT IF(@vUser = wtc.userFk, @vUser :=@vUser, @vUser := wtc.userFk ),
+								 IF(@vIsOdd, @vIsOdd := FALSE, @vIsOdd := TRUE ),
+								 IF(direction='in', @vIsOdd := TRUE, @vIsOdd := @vIsOdd ),
+								 IF(@vIsOdd, @vLastTimed:=UNIX_TIMESTAMP(timed),@vLastTimed:=@vLastTimed), 
+								 IF(@vIsOdd, 0, UNIX_TIMESTAMP(timed)-@vLastTimed) timeWork,
+								 IF(direction='in', @vDated := DATE(wtc.timed), @vDated :=@vDated) dated,
+								 wtc.userFk,
+								 wtc.timed timed,
+								 direction
+							FROM (SELECT * FROM workerTimeControl ORDER BY userFk, timed ASC) wtc
+								JOIN tmp.`user` w ON w.userFk = wtc.userFk
+							WHERE wtc.timed BETWEEN vDatedFrom AND vDatedTo 
+							ORDER BY userFk, timed ASC
+						 ) sub
+					GROUP BY userFk, dated
+					ORDER BY userFk, dated
+				 )sub2;
+
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -54073,6 +54611,9 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `zone_getAvailable`(vAddress INT, vLanded DATE)
 BEGIN
+
+/* JGF esta trabajando en este archivo, si se modifica avisadme 2020-02-12*/
+
     CALL zone_getFromGeo(address_getGeo(vAddress));
     CALL zone_getOptionsForLanding(vLanded);
 
@@ -54364,14 +54905,86 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `zone_getOptionsForLanding`(vLanded DATE)
 BEGIN
+/**
+ * Gets computed options for the passed zones and delivery date.
+ *
+ * @table tmp.zones(id) The zones ids
+ * @param vLanded The delivery date
+ * @return tmp.zoneOption The computed options
+ */	
+	DROP TEMPORARY TABLE IF EXISTS tmp.zoneOption;
+	CREATE TEMPORARY TABLE tmp.zoneOption
+		ENGINE = MEMORY
+		SELECT
+				zoneFk,
+				`hour`,
+				travelingDays,
+				price,
+				bonus,
+				TIMESTAMPADD(DAY, -travelingDays, vLanded) shipped
+			FROM (
+				SELECT t.id zoneFk,
+						TIME(IFNULL(e.`hour`, z.`hour`)) `hour`,
+						IFNULL(e.travelingDays, z.travelingDays) travelingDays,
+						IFNULL(e.price, z.price) price,
+						IFNULL(e.bonus, z.bonus) bonus
+					FROM tmp.zone t
+						JOIN zone z ON z.id = t.id
+						JOIN zoneEvent e ON e.zoneFk = t.id
+					WHERE (
+							e.`type` = 'day'
+							AND e.dated = vLanded
+						) OR (
+							e.`type` != 'day'
+							AND e.weekDays & (1 << WEEKDAY(vLanded))
+							AND (e.`started` IS NULL OR vLanded >= e.`started`)
+							AND (e.`ended` IS NULL OR vLanded <= e.`ended`)
+						)
+					ORDER BY
+						zoneFk,
+						CASE
+							WHEN e.`type` = 'day'
+								THEN 1
+							WHEN e.`type` = 'range'
+								THEN 2
+								ELSE 3
+						END
+			) t
+			GROUP BY zoneFk;
+
+	DELETE t FROM tmp.zoneOption t
+		JOIN zoneExclusion e
+			ON e.zoneFk = t.zoneFk AND e.`dated` = vLanded;
+
+	DELETE FROM tmp.zoneOption
+		WHERE shipped < CURDATE()
+			OR (shipped = CURDATE() AND CURTIME() > `hour`);
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `zone_getOptionsForLanding__` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `zone_getOptionsForLanding__`(vLanded DATE)
+BEGIN
 /**
  * Gets computed options for the passed zones and delivery date.
  *
@@ -54438,14 +55051,99 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `zone_getOptionsForShipment`(vShipped DATE, vShowExpiredZones BOOLEAN)
 BEGIN
+/**
+ * Gets computed options for the passed zones and shipping date.
+ *
+ * @table tmp.zones(id) The zones ids
+ * @param vShipped The shipping date
+ * @return tmp.zoneOption(zoneFk, hour, travelingDays, price, bonus, specificity) The computed options
+ */
+	DECLARE vHour TIME DEFAULT TIME(NOW());
+		
+	DROP TEMPORARY TABLE IF EXISTS tLandings;
+	CREATE TEMPORARY TABLE tLandings
+		(INDEX (eventFk))
+		ENGINE = MEMORY
+		SELECT e.id eventFk,
+				@travelingDays := IFNULL(e.travelingDays, z.travelingDays) travelingDays,
+				TIMESTAMPADD(DAY, @travelingDays, vShipped) landed
+			FROM tmp.zone t
+				JOIN zone z ON z.id = t.id
+				JOIN zoneEvent e ON e.zoneFk = t.id;
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.zoneOption;
+	CREATE TEMPORARY TABLE tmp.zoneOption
+		ENGINE = MEMORY
+		SELECT *
+			FROM (
+				SELECT t.id zoneFk,
+						TIME(IFNULL(e.`hour`, z.`hour`)) `hour`,
+						l.travelingDays,
+						IFNULL(e.price, z.price) price,
+						IFNULL(e.bonus, z.bonus) bonus,
+						l.landed
+					FROM tmp.zone t
+						JOIN zone z ON z.id = t.id
+						JOIN zoneEvent e ON e.zoneFk = t.id
+						JOIN tLandings l ON l.eventFk = e.id
+					WHERE (
+							e.`type` = 'day'
+							AND e.`dated` = l.landed
+						) OR (
+							e.`type` != 'day'
+							AND e.weekDays & (1 << WEEKDAY(l.landed))
+							AND (e.`started` IS NULL OR l.landed >= e.`started`)
+							AND (e.`ended` IS NULL OR l.landed <= e.`ended`)
+						)
+					ORDER BY
+						zoneFk,
+						CASE
+							WHEN e.`type` = 'day'
+								THEN 1
+							WHEN e.`type` = 'range'
+								THEN 2
+								ELSE 3
+						END
+			) t
+			GROUP BY zoneFk;
+
+	DROP TEMPORARY TABLE tLandings;
+
+	DELETE t FROM tmp.zoneOption t
+		JOIN zoneExclusion e
+			ON e.zoneFk = t.zoneFk AND e.`dated` = t.landed;
+
+	IF NOT vShowExpiredZones THEN
+		DELETE FROM tmp.zoneOption
+			WHERE vShipped < CURDATE()
+				OR (vShipped = CURDATE() AND CURTIME() > `hour`);
+	END IF;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `zone_getOptionsForShipment__` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `zone_getOptionsForShipment__`(vShipped DATE, vShowExpiredZones BOOLEAN)
+BEGIN
 /**
  * Gets computed options for the passed zones and shipping date.
  *
@@ -54585,6 +55283,9 @@ DELIMITER ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `zone_getWarehouse`(vAddress INT, vLanded DATE, vWarehouse INT)
 BEGIN
+
+/* JGF esta trabajando en este archivo, si se modifica avisadme 2020-02-12*/
+
 /**
  * Devuelve el listado de agencias disponibles para la fecha,
  * dirección y almacén pasados.
@@ -54735,10 +55436,14 @@ DELIMITER ;;
 	AFTER INSERT ON `inter`
 	FOR EACH ROW
 BEGIN
+
+    
 	REPLACE vn.ticketLastState(ticketFk, ticketTrackingFk, name)
 		SELECT NEW.Id_Ticket, NEW.inter_id, `name`
 			FROM vn.state
 			WHERE id = NEW.state_id;
+    
+  
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -56284,25 +56989,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `itemPlacementSupplyList` AS select `ips`.`id` AS `id`,`ips`.`itemFk` AS `itemFk`,`ips`.`quantity` AS `quantity`,`ips`.`priority` AS `priority`,ifnull(`isps`.`created`,`ips`.`created`) AS `created`,`ips`.`userFk` AS `userFk`,`ips`.`repoUserFk` AS `repoUserFk`,(`ips`.`quantity` - sum(ifnull(`isps`.`quantity`,0))) AS `saldo`,concat(`i`.`longName`,' ',`i`.`size`) AS `longName`,`i`.`subName` AS `subName`,`i`.`size` AS `size`,`w`.`code` AS `workerCode`,`rw`.`code` AS `repoCode`,max(`p`.`code`) AS `parking`,`ips`.`sectorFk` AS `sectorFk` from (((((((`itemPlacementSupply` `ips` join `item` `i` on((`i`.`id` = `ips`.`itemFk`))) left join `worker` `w` on((`w`.`userFk` = `ips`.`userFk`))) left join `worker` `rw` on((`rw`.`userFk` = `ips`.`repoUserFk`))) left join `itemShelvingPlacementSupply` `isps` on((`isps`.`itemPlacementSupplyFk` = `ips`.`id`))) left join `itemShelving` `ish` on((`ish`.`id` = `isps`.`itemShelvingFk`))) left join `shelving` `s` on((`ish`.`shelvingFk` = `s`.`code`))) left join `parking` `p` on((`s`.`parkingFk` = `p`.`id`))) where (`ips`.`created` >= curdate()) group by `ips`.`priority`,`ips`.`id`,`p`.`sectorFk` */;
-/*!50001 SET character_set_client      = @saved_cs_client */;
-/*!50001 SET character_set_results     = @saved_cs_results */;
-/*!50001 SET collation_connection      = @saved_col_connection */;
-
---
--- Final view structure for view `itemPlacementSupplyList__`
---
-
-/*!50001 DROP VIEW IF EXISTS `itemPlacementSupplyList__`*/;
-/*!50001 SET @saved_cs_client          = @@character_set_client */;
-/*!50001 SET @saved_cs_results         = @@character_set_results */;
-/*!50001 SET @saved_col_connection     = @@collation_connection */;
-/*!50001 SET character_set_client      = utf8 */;
-/*!50001 SET character_set_results     = utf8 */;
-/*!50001 SET collation_connection      = utf8_general_ci */;
-/*!50001 CREATE ALGORITHM=UNDEFINED */
-/*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `itemPlacementSupplyList__` AS select `ips`.`id` AS `id`,`ips`.`itemFk` AS `itemFk`,`ips`.`quantity` AS `quantity`,`ips`.`priority` AS `priority`,`ips`.`created` AS `created`,`ips`.`userFk` AS `userFk`,`ips`.`repoUserFk` AS `repoUserFk`,(`ips`.`quantity` - sum(ifnull(`isps`.`quantity`,0))) AS `saldo`,concat(`i`.`longName`,' ',`i`.`size`) AS `longName`,`i`.`subName` AS `subName`,`i`.`size` AS `size`,`w`.`code` AS `workerCode`,`rw`.`code` AS `repoCode`,max(`p`.`code`) AS `parking`,max(`p`.`sectorFk`) AS `sectorFk` from (((((((`itemPlacementSupply` `ips` join `itemShelving` `ish` on((`ish`.`itemFk` = `ips`.`itemFk`))) join `item` `i` on((`i`.`id` = `ish`.`itemFk`))) left join `worker` `w` on((`w`.`userFk` = `ips`.`userFk`))) left join `worker` `rw` on((`rw`.`userFk` = `ips`.`repoUserFk`))) left join `itemShelvingPlacementSupply` `isps` on((`isps`.`itemPlacementSupplyFk` = `ips`.`id`))) left join `shelving` `s` on((`ish`.`shelvingFk` = `s`.`code`))) left join `parking` `p` on((`s`.`parkingFk` = `p`.`id`))) where (`ips`.`created` >= curdate()) group by `ips`.`priority`,`ips`.`id`,`p`.`sectorFk` */;
+/*!50001 VIEW `itemPlacementSupplyList` AS select `ips`.`id` AS `id`,`ips`.`itemFk` AS `itemFk`,`ips`.`quantity` AS `quantity`,`ips`.`priority` AS `priority`,ifnull(`isps`.`created`,`ips`.`created`) AS `created`,`ips`.`userFk` AS `userFk`,`ips`.`repoUserFk` AS `repoUserFk`,(`ips`.`quantity` - sum(ifnull(`isps`.`quantity`,0))) AS `saldo`,concat(`i`.`longName`,' ',`i`.`size`) AS `longName`,`i`.`subName` AS `subName`,`i`.`size` AS `size`,`w`.`code` AS `workerCode`,`rw`.`code` AS `repoCode`,`ips`.`sectorFk` AS `sectorFk` from ((((`itemPlacementSupply` `ips` join `item` `i` on((`i`.`id` = `ips`.`itemFk`))) left join `worker` `w` on((`w`.`userFk` = `ips`.`userFk`))) left join `worker` `rw` on((`rw`.`userFk` = `ips`.`repoUserFk`))) left join `itemShelvingPlacementSupply` `isps` on((`isps`.`itemPlacementSupplyFk` = `ips`.`id`))) where (`ips`.`created` >= curdate()) group by `ips`.`priority`,`ips`.`id`,`ips`.`sectorFk` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -56338,7 +57025,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `itemShelvingAvailable` AS select `s`.`id` AS `saleFk`,`tst`.`updated` AS `Modificado`,`s`.`ticketFk` AS `ticketFk`,0 AS `isPicked`,`s`.`itemFk` AS `itemFk`,`s`.`quantity` AS `quantity`,`s`.`concept` AS `concept`,`i`.`size` AS `size`,`st`.`name` AS `Estado`,`st`.`sectorProdPriority` AS `sectorProdPriority`,`stock`.`visible` AS `available`,`stock`.`sectorFk` AS `sectorFk`,`stock`.`shelvingFk` AS `matricula`,`stock`.`parkingFk` AS `parking`,`stock`.`itemShelvingFk` AS `itemShelving`,`am`.`name` AS `Agency`,`t`.`shipped` AS `shipped`,`stock`.`grouping` AS `grouping`,`stock`.`packing` AS `packing`,`z`.`hour` AS `hour`,`st`.`isPreviousPreparable` AS `isPreviousPreparable`,`sv`.`physicalVolume` AS `physicalVolume` from (((((((((`vn`.`sale` `s` join `vn`.`ticket` `t` on((`t`.`id` = `s`.`ticketFk`))) join `vn`.`agencyMode` `am` on((`am`.`id` = `t`.`agencyModeFk`))) join `vn`.`ticketStateToday` `tst` on((`tst`.`ticket` = `t`.`id`))) join `vn`.`state` `st` on((`st`.`id` = `tst`.`state`))) join `vn`.`item` `i` on((`i`.`id` = `s`.`itemFk`))) join `vn`.`itemShelvingStock` `stock` on((`stock`.`itemFk` = `i`.`id`))) left join `vn`.`saleTracking` `stk` on((`stk`.`saleFk` = `s`.`id`))) left join `vn`.`zone` `z` on((`z`.`id` = `t`.`zoneFk`))) left join `vn`.`saleVolume` `sv` on((`sv`.`saleFk` = `s`.`id`))) where ((`t`.`shipped` between `util`.`yesterday`() and `util`.`dayend`(curdate())) and isnull(`stk`.`id`) and (`stock`.`visible` > 0) and isnull(`stk`.`saleFk`) and `st`.`sectorProdPriority`) */;
+/*!50001 VIEW `itemShelvingAvailable` AS select `s`.`id` AS `saleFk`,`tst`.`updated` AS `Modificado`,`s`.`ticketFk` AS `ticketFk`,0 AS `isPicked`,`s`.`itemFk` AS `itemFk`,`s`.`quantity` AS `quantity`,`s`.`concept` AS `concept`,`i`.`size` AS `size`,`st`.`name` AS `Estado`,`st`.`sectorProdPriority` AS `sectorProdPriority`,`stock`.`visible` AS `available`,`stock`.`sectorFk` AS `sectorFk`,`stock`.`shelvingFk` AS `matricula`,`stock`.`parkingFk` AS `parking`,`stock`.`itemShelvingFk` AS `itemShelving`,`am`.`name` AS `Agency`,`t`.`shipped` AS `shipped`,`stock`.`grouping` AS `grouping`,`stock`.`packing` AS `packing`,`z`.`hour` AS `hour`,`st`.`isPreviousPreparable` AS `isPreviousPreparable`,`sv`.`physicalVolume` AS `physicalVolume`,`t`.`warehouseFk` AS `warehouseFk` from (((((((((`vn`.`sale` `s` join `vn`.`ticket` `t` on((`t`.`id` = `s`.`ticketFk`))) join `vn`.`agencyMode` `am` on((`am`.`id` = `t`.`agencyModeFk`))) join `vn`.`ticketStateToday` `tst` on((`tst`.`ticket` = `t`.`id`))) join `vn`.`state` `st` on((`st`.`id` = `tst`.`state`))) join `vn`.`item` `i` on((`i`.`id` = `s`.`itemFk`))) join `vn`.`itemShelvingStock` `stock` on((`stock`.`itemFk` = `i`.`id`))) left join `vn`.`saleTracking` `stk` on((`stk`.`saleFk` = `s`.`id`))) left join `vn`.`zone` `z` on((`z`.`id` = `t`.`zoneFk`))) left join `vn`.`saleVolume` `sv` on((`sv`.`saleFk` = `s`.`id`))) where ((`t`.`shipped` between `util`.`yesterday`() and `util`.`dayend`(curdate())) and isnull(`stk`.`id`) and (`stock`.`visible` > 0) and isnull(`stk`.`saleFk`) and `st`.`sectorProdPriority`) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -56531,12 +57218,12 @@ USE `vn`;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
 /*!50001 SET @saved_col_connection     = @@collation_connection */;
-/*!50001 SET character_set_client      = utf8 */;
-/*!50001 SET character_set_results     = utf8 */;
-/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 SET character_set_client      = utf8mb4 */;
+/*!50001 SET character_set_results     = utf8mb4 */;
+/*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `lastTopClaims` AS select `s`.`itemFk` AS `itemFk`,`i`.`longName` AS `itemName`,`it`.`name` AS `itemTypeName`,count(0) AS `claimsNumber`,round(sum(((((`cb`.`quantity` * `s`.`price`) * (1 - ((`c`.`responsibility` - 1) / 4))) * (100 - `s`.`discount`)) / 100)),2) AS `claimedAmount`,round(sum((((`cb`.`quantity` * `s`.`price`) * (100 - `s`.`discount`)) / 100)),2) AS `totalAmount` from ((((`claim` `c` join `claimBeginning` `cb` on((`cb`.`claimFk` = `c`.`id`))) join `sale` `s` on((`s`.`id` = `cb`.`saleFk`))) join `item` `i` on((`i`.`id` = `s`.`itemFk`))) join `itemType` `it` on((`it`.`id` = `i`.`typeFk`))) where (`c`.`created` >= (curdate() + interval -(1) week)) group by `s`.`itemFk` having (((`claimedAmount` > 100) and (`claimsNumber` > 2)) or (`claimsNumber` > 4)) order by `claimedAmount` desc */;
+/*!50001 VIEW `lastTopClaims` AS select `s`.`itemFk` AS `itemFk`,`i`.`longName` AS `itemName`,`it`.`name` AS `itemTypeName`,count(0) AS `claimsNumber`,round(sum(((((`cb`.`quantity` * `s`.`price`) * (1 - ((`c`.`responsibility` - 1) / 4))) * (100 - `s`.`discount`)) / 100)),2) AS `claimedAmount`,round(sum((((`cb`.`quantity` * `s`.`price`) * (100 - `s`.`discount`)) / 100)),2) AS `totalAmount` from ((((`claim` `c` join `claimBeginning` `cb` on((`cb`.`claimFk` = `c`.`id`))) join `sale` `s` on((`s`.`id` = `cb`.`saleFk`))) join `item` `i` on((`i`.`id` = `s`.`itemFk`))) join `itemType` `it` on((`it`.`id` = `i`.`typeFk`))) where (`c`.`created` >= (curdate() + interval -(1) week)) group by `s`.`itemFk` having (((`claimedAmount` > 100) and (`claimsNumber` > 2)) or (`claimsNumber` > 4)) order by `claimsNumber` desc */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -56974,19 +57661,19 @@ USE `vn`;
 /*!50001 SET collation_connection      = @saved_col_connection */;
 
 --
--- Final view structure for view `workerTimeControl_Journey`
+-- Final view structure for view `workerTimeControl_Journey__`
 --
 
-/*!50001 DROP VIEW IF EXISTS `workerTimeControl_Journey`*/;
+/*!50001 DROP VIEW IF EXISTS `workerTimeControl_Journey__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
 /*!50001 SET @saved_col_connection     = @@collation_connection */;
-/*!50001 SET character_set_client      = utf8 */;
-/*!50001 SET character_set_results     = utf8 */;
-/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 SET character_set_client      = utf8mb4 */;
+/*!50001 SET character_set_results     = utf8mb4 */;
+/*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `workerTimeControl_Journey` AS select `wtc`.`userFk` AS `userFk`,cast(`wtc`.`timed` as date) AS `dated`,cast(sum((if((`wtc`.`order` % 2),-(1),1) * (hour(`wtc`.`timed`) + (minute(`wtc`.`timed`) / 60)))) as decimal(10,2)) AS `Journey`,dayname(`wtc`.`timed`) AS `dayName`,`w`.`lastName` AS `name`,`w`.`firstName` AS `firstname` from (`workerTimeControl` `wtc` join `worker` `w` on((`w`.`userFk` = `wtc`.`userFk`))) group by cast(`wtc`.`timed` as date),`wtc`.`userFk` */;
+/*!50001 VIEW `workerTimeControl_Journey__` AS select `wtc`.`userFk` AS `userFk`,cast(`wtc`.`timed` as date) AS `dated`,cast(sum((if((`wtc`.`order` % 2),-(1),1) * (hour(`wtc`.`timed`) + (minute(`wtc`.`timed`) / 60)))) as decimal(10,2)) AS `Journey`,dayname(`wtc`.`timed`) AS `dayName`,`w`.`lastName` AS `name`,`w`.`firstName` AS `firstname` from (`workerTimeControl` `wtc` join `worker` `w` on((`w`.`userFk` = `wtc`.`userFk`))) group by cast(`wtc`.`timed` as date),`wtc`.`userFk` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -57024,4 +57711,4 @@ USE `vncontrol`;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-01-24 12:08:27
+-- Dump completed on 2020-02-12 13:30:31
diff --git a/modules/client/back/methods/client/specs/activeWorkersWithRole.spec.js b/modules/client/back/methods/client/specs/activeWorkersWithRole.spec.js
index b9b28fe09..0004b2156 100644
--- a/modules/client/back/methods/client/specs/activeWorkersWithRole.spec.js
+++ b/modules/client/back/methods/client/specs/activeWorkersWithRole.spec.js
@@ -17,7 +17,7 @@ describe('Client activeWorkersWithRole', () => {
 
         let isBuyer = await app.models.Account.hasRole(result[0].id, 'buyer');
 
-        expect(result.length).toEqual(10);
+        expect(result.length).toEqual(11);
         expect(isBuyer).toBeTruthy();
     });
 });
diff --git a/modules/client/back/methods/client/specs/listWorkers.spec.js b/modules/client/back/methods/client/specs/listWorkers.spec.js
index 728268457..97f4b591d 100644
--- a/modules/client/back/methods/client/specs/listWorkers.spec.js
+++ b/modules/client/back/methods/client/specs/listWorkers.spec.js
@@ -6,7 +6,7 @@ describe('Client listWorkers', () => {
             .then(result => {
                 let amountOfEmployees = Object.keys(result).length;
 
-                expect(amountOfEmployees).toEqual(49);
+                expect(amountOfEmployees).toEqual(50);
                 done();
             })
             .catch(done.fail);

From 4b48a89eaa4d8b0b07812e96b4b825591f86b4fc Mon Sep 17 00:00:00 2001
From: Bernat Exposito Domenech <bernat.verdnatura@gmail.com>
Date: Thu, 13 Feb 2020 08:31:29 +0100
Subject: [PATCH 09/11] ticket descriptor update acl

---
 db/changes/10150-entry/00-acl.sql        | 3 +++
 e2e/paths/05-ticket/09_weekly.spec.js    | 2 +-
 modules/ticket/front/descriptor/index.js | 6 +++++-
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 db/changes/10150-entry/00-acl.sql

diff --git a/db/changes/10150-entry/00-acl.sql b/db/changes/10150-entry/00-acl.sql
new file mode 100644
index 000000000..59934a266
--- /dev/null
+++ b/db/changes/10150-entry/00-acl.sql
@@ -0,0 +1,3 @@
+INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId) 
+    VALUES ('TicketWeekly', '*', 'WRITE', 'ALLOW', 'ROLE', 'buyer');
+UPDATE salix.ACL SET accessType = 'READ' WHERE (id = '91');
\ No newline at end of file
diff --git a/e2e/paths/05-ticket/09_weekly.spec.js b/e2e/paths/05-ticket/09_weekly.spec.js
index c732a4b87..3e791dc18 100644
--- a/e2e/paths/05-ticket/09_weekly.spec.js
+++ b/e2e/paths/05-ticket/09_weekly.spec.js
@@ -8,7 +8,7 @@ describe('Ticket descriptor path', () => {
     beforeAll(async() => {
         browser = await getBrowser();
         page = browser.page;
-        await page.loginAndModule('employee', 'ticket');
+        await page.loginAndModule('buyer', 'ticket');
         await page.accessToSection('ticket.weekly.index');
     });
 
diff --git a/modules/ticket/front/descriptor/index.js b/modules/ticket/front/descriptor/index.js
index ef64bf84e..10da4cca9 100644
--- a/modules/ticket/front/descriptor/index.js
+++ b/modules/ticket/front/descriptor/index.js
@@ -7,7 +7,11 @@ class Controller extends Component {
         this.aclService = aclService;
         this.$httpParamSerializer = $httpParamSerializer;
         this.moreOptions = [
-            {name: 'Add turn', callback: this.showAddTurnDialog},
+            {
+                name: 'Add turn',
+                acl: 'buyer',
+                callback: this.showAddTurnDialog
+            },
             {name: 'Show Delivery Note', callback: this.showDeliveryNote},
             {name: 'Send Delivery Note', callback: this.confirmDeliveryNote},
             {name: 'Delete ticket', callback: this.showDeleteTicketDialog},

From b78858eb7c59f61b22b4a9c6cf8439141fbdd721 Mon Sep 17 00:00:00 2001
From: Bernat Exposito Domenech <bernat.verdnatura@gmail.com>
Date: Thu, 13 Feb 2020 09:30:18 +0100
Subject: [PATCH 10/11] export structure db

---
 db/changes/10150-entry/00-acl.sql |  3 --
 db/dump/dumpedFixtures.sql        | 14 +++++-----
 db/dump/structure.sql             | 46 +++++++++++++++++--------------
 3 files changed, 32 insertions(+), 31 deletions(-)
 delete mode 100644 db/changes/10150-entry/00-acl.sql

diff --git a/db/changes/10150-entry/00-acl.sql b/db/changes/10150-entry/00-acl.sql
deleted file mode 100644
index 59934a266..000000000
--- a/db/changes/10150-entry/00-acl.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId) 
-    VALUES ('TicketWeekly', '*', 'WRITE', 'ALLOW', 'ROLE', 'buyer');
-UPDATE salix.ACL SET accessType = 'READ' WHERE (id = '91');
\ No newline at end of file
diff --git a/db/dump/dumpedFixtures.sql b/db/dump/dumpedFixtures.sql
index 47bfd9b53..74290b451 100644
--- a/db/dump/dumpedFixtures.sql
+++ b/db/dump/dumpedFixtures.sql
@@ -36,7 +36,7 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-02-12 13:30:39
+-- Dump completed on 2020-02-13  9:07:05
 USE `account`;
 -- MySQL dump 10.13  Distrib 5.7.28, for osx10.15 (x86_64)
 --
@@ -94,7 +94,7 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-02-12 13:30:39
+-- Dump completed on 2020-02-13  9:07:05
 USE `salix`;
 -- MySQL dump 10.13  Distrib 5.7.28, for osx10.15 (x86_64)
 --
@@ -142,7 +142,7 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-02-12 13:30:39
+-- Dump completed on 2020-02-13  9:07:05
 USE `vn`;
 -- MySQL dump 10.13  Distrib 5.7.28, for osx10.15 (x86_64)
 --
@@ -340,7 +340,7 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-02-12 13:30:40
+-- Dump completed on 2020-02-13  9:07:05
 USE `cache`;
 -- MySQL dump 10.13  Distrib 5.7.28, for osx10.15 (x86_64)
 --
@@ -378,7 +378,7 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-02-12 13:30:40
+-- Dump completed on 2020-02-13  9:07:05
 USE `hedera`;
 -- MySQL dump 10.13  Distrib 5.7.28, for osx10.15 (x86_64)
 --
@@ -436,7 +436,7 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-02-12 13:30:40
+-- Dump completed on 2020-02-13  9:07:06
 USE `postgresql`;
 -- MySQL dump 10.13  Distrib 5.7.28, for osx10.15 (x86_64)
 --
@@ -524,4 +524,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-02-12 13:30:40
+-- Dump completed on 2020-02-13  9:07:06
diff --git a/db/dump/structure.sql b/db/dump/structure.sql
index 76756c9be..35cb82fd4 100644
--- a/db/dump/structure.sql
+++ b/db/dump/structure.sql
@@ -17509,24 +17509,24 @@ BEGIN
 	SELECT * FROM
 	( 
 		SELECT
-				`db`,
-				`name`,
-				`type`,
-				`body`,
+				`routine_schema` `schema`,
+				`routine_name` `name`,
+				`routine_type` `type`,
+				`routine_definition` `definition`,
 				`created`,
-				`modified`
-			FROM `mysql`.`proc`
-			WHERE `body` LIKE vChain COLLATE utf8_general_ci
+				`last_altered`
+			FROM `information_schema`.`routines`
+			WHERE `routine_definition` LIKE vChain COLLATE utf8_general_ci
 		UNION ALL
 		SELECT
-				`db`,
-				`name`,
+				`event_schema`,
+				`event_name`,
 				'EVENT',
-				`body_utf8`,
+				`event_definition`,
 				`created`,
-				`modified`
-			FROM `mysql`.`event`
-			WHERE `body_utf8` LIKE vChain COLLATE utf8_general_ci
+				`last_altered`
+			FROM `information_schema`.`events`
+			WHERE `event_definition` LIKE vChain COLLATE utf8_general_ci
 		UNION ALL
 		SELECT
 				`EVENT_OBJECT_SCHEMA`,
@@ -17548,8 +17548,7 @@ BEGIN
 			FROM `information_schema`.`VIEWS`
 			WHERE `VIEW_DEFINITION` LIKE vChain COLLATE utf8_general_ci
 	) t
-	ORDER BY `db`, `name`;
-    
+	ORDER BY `schema`, `name`;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -26562,6 +26561,10 @@ BEGIN
 		SET NEW.landed = DATE_FORMAT(NEW.landed, '2000-%m-%d %T');
 		SET NEW.routeFk = NULL;
 	END IF;
+    
+    IF NEW.routeFk  AND NEW.isDeleted   THEN 
+		CALL util.throw ('This ticket is deleted');
+	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -27930,7 +27933,6 @@ CREATE TABLE `worker` (
   `birthed` date NOT NULL,
   `maritalStatus` enum('soltero/a','casado/a') COLLATE utf8_unicode_ci NOT NULL,
   `phone` varchar(9) COLLATE utf8_unicode_ci NOT NULL,
-  `companyFk` smallint(5) unsigned DEFAULT NULL,
   `clientFk` int(11) DEFAULT NULL,
   `userFk` int(10) unsigned DEFAULT NULL,
   `bossFk` int(11) NOT NULL DEFAULT '2',
@@ -27943,7 +27945,6 @@ CREATE TABLE `worker` (
   UNIQUE KEY `Id_Cliente_Interno` (`clientFk`),
   KEY `sub` (`sub`),
   KEY `boss_idx` (`bossFk`),
-  KEY `empresa_id` (`companyFk`),
   CONSTRAINT `Clientes` FOREIGN KEY (`clientFk`) REFERENCES `client` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `worker_ibfk_1` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -29651,14 +29652,15 @@ BEGIN
 				LIMIT 1;	     
                 
    -- Margen
-	INSERT INTO tmp.catalog_component (warehouseFk, itemFk, componentFk, cost)
+   -- No se aplica margen, cau 12589
+/*	INSERT INTO tmp.catalog_component (warehouseFk, itemFk, componentFk, cost)
 		SELECT vWarehouse, vItem, vComponentMargin, (vCost / ((100 - rate2) / 100)) - vCost 
 			FROM vn.rate
 				WHERE dated <= CURDATE()
 					AND warehouseFk = vWarehouse
 				ORDER BY dated DESC
 				LIMIT 1;	     
-        
+        */
    -- Recobro
 	INSERT INTO tmp.catalog_component (warehouseFk, itemFk, componentFk, cost)
 		SELECT vWarehouse, vItem, vComponentRecovery, ROUND(LEAST(recobro,0.25), 3) 
@@ -42947,7 +42949,9 @@ BEGIN
 
     UPDATE vn.itemShelving
     SET shelvingFk = shelvingFkD
-	 WHERE shelvingFk = shelvingFkO COLLATE utf8_unicode_ci AND itemFk = vItemFk;
+	WHERE shelvingFk = shelvingFkO COLLATE utf8_unicode_ci 
+		AND itemFk = vItemFk 
+		AND visible = ( vPacking * vQuantity );
      
 	/*CALL vn.itemShelvingMakeFromDate(shelvingFkD,vItemFk,'A',0,( vPacking * vQuantity ),'',0,vPacking,1,1,vDate); */
 
@@ -57711,4 +57715,4 @@ USE `vncontrol`;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-02-12 13:30:31
+-- Dump completed on 2020-02-13  9:07:01

From f7dc279489e0dffe5dd25ac33edfd383c3a78847 Mon Sep 17 00:00:00 2001
From: Carlos Jimenez Ruiz <jacarlosjimenezruiz@gmail.com>
Date: Thu, 13 Feb 2020 09:47:05 +0100
Subject: [PATCH 11/11] #2002 e2e client.summary

---
 e2e/helpers/selectors.js               | 11 ++++
 e2e/paths/02-client/19_summary.spec.js | 80 ++++++++++++++++++++++++++
 2 files changed, 91 insertions(+)
 create mode 100644 e2e/paths/02-client/19_summary.spec.js

diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index 564745752..63d40f9d5 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -27,6 +27,17 @@ export default {
         createClientButton: `vn-float-button`,
         othersButton: 'vn-left-menu li[name="Others"] > a'
     },
+    clientSummary: {
+        header: 'vn-client-summary > vn-card > h5',
+        email: 'vn-client-summary vn-label-value[label="Email"]',
+        street: 'vn-client-summary vn-label-value[label="Street"]',
+        verifiedData: 'vn-client-summary > vn-card > vn-horizontal vn-check[ng-model="$ctrl.summary.isTaxDataChecked"]',
+        payMethod: 'vn-client-summary vn-label-value[label="Pay method"]',
+        defaultAdressName: 'vn-client-summary vn-label-value[label="Name"]',
+        userName: 'vn-client-summary vn-label-value[label="User"]',
+        rate: 'vn-client-summary vn-label-value[label="Rate"]',
+        credit: 'vn-client-summary vn-label-value[label="Credit"]',
+    },
     createClientView: {
         name: 'vn-client-create vn-textfield[ng-model="$ctrl.client.name"]',
         taxNumber: 'vn-client-create vn-textfield[ng-model="$ctrl.client.fi"]',
diff --git a/e2e/paths/02-client/19_summary.spec.js b/e2e/paths/02-client/19_summary.spec.js
new file mode 100644
index 000000000..11b5a298e
--- /dev/null
+++ b/e2e/paths/02-client/19_summary.spec.js
@@ -0,0 +1,80 @@
+import selectors from '../../helpers/selectors.js';
+import getBrowser from '../../helpers/puppeteer';
+
+describe('Client summary path', () => {
+    let browser;
+    let page;
+
+    beforeAll(async() => {
+        browser = await getBrowser();
+        page = browser.page;
+        await page.loginAndModule('employee', 'client');
+        await page.accessToSearchResult('Petter Parker');
+    });
+
+    afterAll(async() => {
+        await browser.close();
+    });
+
+    it('should reach the first route summary section', async() => {
+        let url = await page.expectURL('#!/client/102/summary');
+
+        expect(url).toBe(true);
+    });
+
+    it('should display details from the client on the header', async() => {
+        await page.waitForTextInElement(selectors.clientSummary.header, 'Petter Parker');
+        const result = await page.waitToGetProperty(selectors.clientSummary.header, 'innerText');
+
+        expect(result).toContain('Petter Parker');
+    });
+
+    it('should display some basic data', async() => {
+        const result = await page.waitToGetProperty(selectors.clientSummary.email, 'innerText');
+
+        expect(result).toContain('PetterParker@mydomain.com');
+    });
+
+    it('should display fiscal address details', async() => {
+        const result = await page.waitToGetProperty(selectors.clientSummary.street, 'innerText');
+
+        expect(result).toContain('20 Ingram Street');
+    });
+
+    it('should display some fiscal data', async() => {
+        await page.waitForClassPresent(selectors.clientSummary.verifiedData, 'checked');
+        const result = await page.waitToGetProperty(selectors.clientSummary.verifiedData, 'innerText');
+
+        expect(result).toContain('Verified data');
+    });
+
+    it('should display pay method details', async() => {
+        const result = await page.waitToGetProperty(selectors.clientSummary.payMethod, 'innerText');
+
+        expect(result).toContain('PayMethod five');
+    });
+
+    it('should display default address details', async() => {
+        const result = await page.waitToGetProperty(selectors.clientSummary.defaultAdressName, 'innerText');
+
+        expect(result).toContain('Petter Parker');
+    });
+
+    it('should display web access details', async() => {
+        const result = await page.waitToGetProperty(selectors.clientSummary.userName, 'innerText');
+
+        expect(result).toContain('PetterParker');
+    });
+
+    it('should display business data', async() => {
+        const result = await page.waitToGetProperty(selectors.clientSummary.rate, 'innerText');
+
+        expect(result).toContain('%');
+    });
+
+    it('should display financial information', async() => {
+        const result = await page.waitToGetProperty(selectors.clientSummary.credit, 'innerText');
+
+        expect(result).toContain('€300.00');
+    });
+});