Merge branch 'dev' into 5255-revisar-ticketBoxing

2023-04-27 08:42:21 +00:00 · 2023-04-27 08:42:21 +00:00 · 3bd5582794
parent 1219cfcc5c 099ed2578c
commit 3bd5582794
48 changed files with 206 additions and 455 deletions
--- a/db/changes/231601/00-User.sql
+++ b/db/changes/231601/00-User.sql
@ -1,21 +0,0 @@
-create or replace definer = root@localhost view User as
-select `account`.`user`.`id`                AS `id`,
-       `account`.`user`.`realm`             AS `realm`,
-       `account`.`user`.`name`              AS `name`,
-       `account`.`user`.`nickname`          AS `nickname`,
-       `account`.`user`.`bcryptPassword`    AS `password`,
-       `account`.`user`.`role`              AS `role`,
-       `account`.`user`.`active`            AS `active`,
-       `account`.`user`.`email`             AS `email`,
-       `account`.`user`.`emailVerified`     AS `emailVerified`,
-       `account`.`user`.`verificationToken` AS `verificationToken`,
-       `account`.`user`.`lang`              AS `lang`,
-       `account`.`user`.`lastPassChange`    AS `lastPassChange`,
-       `account`.`user`.`created`           AS `created`,
-       `account`.`user`.`updated`           AS `updated`,
-       `account`.`user`.`image`             AS `image`,
-       `account`.`user`.`recoverPass`       AS `recoverPass`,
-       `account`.`user`.`sync`              AS `sync`,
-       `account`.`user`.`hasGrant`          AS `hasGrant`
-from `account`.`user`;
-
--- a/db/changes/231601/00-deleteProcs_refund.sql
+++ b/db/changes/231601/00-deleteProcs_refund.sql
@ -0,0 +1,2 @@
+DROP PROCEDURE `vn`.`refund`;
+DROP PROCEDURE `vn`.`ticket_doRefund`;
--- a/db/changes/231601/00-newCompanyI18n.sql
+++ b/db/changes/231601/00-newCompanyI18n.sql
@ -0,0 +1,9 @@
+-- vn.companyI18n definition
+CREATE TABLE `vn`.`companyI18n` (
+  `companyFk` smallint(5) unsigned NOT NULL,
+  `lang` char(2) CHARACTER SET utf8mb3 NOT NULL,
+  `footnotes` longtext COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`companyFk`,`lang`),
+  CONSTRAINT `companyI18n_FK` FOREIGN KEY (`companyFk`) REFERENCES `company` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
--- a/db/changes/231601/00-newTableWeb.sql
+++ b/db/changes/231601/00-newTableWeb.sql
@ -0,0 +1 @@
+ALTER TABLE `vn`.`company` ADD `web` varchar(100) NULL;
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@ -546,7 +546,8 @@ INSERT INTO `vn`.`supplier`(`id`, `name`, `nickname`,`account`,`countryFk`,`nif`
    VALUES
        (1,   'Plants SL',             'Plants nick',   4100000001, 1, '06089160W', 0, util.VN_CURDATE(), 1, 'supplier address 1', 'PONTEVEDRA', 1, 15214, 1, 1, 15, 4,  1, 1, 18, 'flowerPlants',  1, '400664487V'),
        (2,   'Farmer King',           'The farmer',    4000020002, 1, '87945234L', 0, util.VN_CURDATE(), 1, 'supplier address 2', 'GOTHAM',      2, 43022, 1, 2, 10, 93, 2, 8, 18, 'animals',       1, '400664487V'),
-        (442, 'Verdnatura Levante SL', 'Verdnatura',    5115000442, 1, '06815934E', 0, util.VN_CURDATE(), 1, 'supplier address 3', 'GOTHAM',      1, 43022, 1, 2, 15, 6,  9, 3, 18, 'complements',   1, '400664487V');
+        (442, 'Verdnatura Levante SL', 'Verdnatura',    5115000442, 1, '06815934E', 0, util.VN_CURDATE(), 1, 'supplier address 3', 'GOTHAM',      1, 43022, 1, 2, 15, 6,  9, 3, 18, 'complements',   1, '400664487V'),
+        (1381, 'Ornamentales',         'Ornamentales',  7185000440, 1, '03815934E', 0, util.VN_CURDATE(), 1, 'supplier address 4', 'GOTHAM',      1, 43022, 1, 2, 15, 6,  9, 3, 18, 'complements',   1, '400664487V');

 INSERT INTO `vn`.`supplierContact`(`id`, `supplierFk`, `phone`, `mobile`, `email`, `observation`, `name`)
    VALUES
@ -2789,7 +2790,7 @@ INSERT INTO `vn`.`profileType` (`id`, `name`)

 INSERT INTO `salix`.`url` (`appName`, `environment`, `url`)
    VALUES
-        ('lilium', 'dev', 'http://localhost:8080/#/'),
+        ('lilium', 'dev', 'http://localhost:9000/#/'),
        ('salix', 'dev', 'http://localhost:5000/#!/');

 INSERT INTO `vn`.`report` (`id`, `name`, `paperSizeFk`, `method`)
--- a/db/export-data.sh
+++ b/db/export-data.sh
@ -68,6 +68,7 @@ TABLES=(
    time
    volumeConfig
    workCenter
+    companyI18n
 )
 dump_tables ${TABLES[@]}

--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@ -755,6 +755,7 @@ export default {
        anyDocument: 'vn-ticket-dms-index > vn-data-viewer vn-tbody vn-tr'
    },
    ticketFuture: {
+        searchResult: 'vn-ticket-future tbody tr',
        openAdvancedSearchButton: 'vn-searchbar .append vn-icon[icon="arrow_drop_down"]',
        originDated: 'vn-date-picker[label="Origin date"]',
        futureDated: 'vn-date-picker[label="Destination date"]',
@ -770,7 +771,6 @@ export default {
        problems: 'vn-check[label="With problems"]',
        tableButtonSearch: 'vn-button[vn-tooltip="Search"]',
        moveButton: 'vn-button[vn-tooltip="Future tickets"]',
-        acceptButton: '.vn-confirm.shown button[response="accept"]',
        firstCheck: 'tbody > tr:nth-child(1) > td > vn-check',
        multiCheck: 'vn-multi-check',
        tableId: 'vn-textfield[name="id"]',
--- a/e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js
+++ b/e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js
@ -81,9 +81,7 @@ describe('SmartTable SearchBar integration', () => {
            await page.accessToSection('item.fixedPrice');
            await page.keyboard.press('Enter');

-            const result = await page.waitToGetProperty(selectors.itemFixedPrice.firstItemID, 'value');
-
-            expect(result).toEqual('1');
+            await page.waitForTextInField(selectors.itemFixedPrice.firstItemID, '1');
        });

        it('should order by last id, reload page and have same order', async() => {
@ -91,9 +89,7 @@ describe('SmartTable SearchBar integration', () => {
            await page.reload({
                waitUntil: 'networkidle2'
            });
-            const result = await page.waitToGetProperty(selectors.itemFixedPrice.firstItemID, 'value');
-
-            expect(result).toEqual('13');
+            await page.waitForTextInField(selectors.itemFixedPrice.firstItemID, '13');
        });
    });
 });
--- a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js
+++ b/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js
@ -246,6 +246,7 @@ describe('Ticket Edit sale path', () => {
    it('should select the third sale and create a claim of it', async() => {
        await page.accessToSearchResult('16');
        await page.accessToSection('ticket.card.sale');
+        await page.waitToClick(selectors.ticketSales.firstSaleCheckbox);
        await page.waitToClick(selectors.ticketSales.thirdSaleCheckbox);
        await page.waitToClick(selectors.ticketSales.moreMenu);
        await page.waitToClick(selectors.ticketSales.moreMenuCreateClaim);
--- a/e2e/paths/05-ticket/21_future.spec.js
+++ b/e2e/paths/05-ticket/21_future.spec.js
@ -126,10 +126,11 @@ describe('Ticket Future path', () => {
    });

    it('should check the three last tickets and move to the future', async() => {
+        await page.waitForNumberOfElements(selectors.ticketFuture.searchResult, 4);
        await page.waitToClick(selectors.ticketFuture.multiCheck);
        await page.waitToClick(selectors.ticketFuture.firstCheck);
        await page.waitToClick(selectors.ticketFuture.moveButton);
-        await page.waitToClick(selectors.ticketFuture.acceptButton);
+        await page.waitToClick(selectors.globalItems.acceptButton);
        const message = await page.waitForSnackbar();

        expect(message.text).toContain('Tickets moved successfully!');
--- a/e2e/paths/09-invoice-in/05_serial.spec.js
+++ b/e2e/paths/09-invoice-in/05_serial.spec.js
@ -35,7 +35,7 @@ describe('InvoiceIn serial path', () => {
    });

    it('should go to index and check if the search-panel has the correct params', async() => {
-        await page.click(selectors.invoiceInSerial.goToIndex);
+        await page.waitToClick(selectors.invoiceInSerial.goToIndex);
        const params = await page.$$(selectors.invoiceInIndex.topbarSearchParams);
        const serial = await params[0].getProperty('title');
        const isBooked = await params[1].getProperty('title');
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@ -156,18 +156,19 @@
 	"Component cost not set": "Componente coste no está estabecido",
 	"Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 2": "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 2",
 	"Description cannot be blank": "Description cannot be blank",
-    "company": "Company",
-    "country": "Country",
-    "clientId": "Id client",
-    "clientSocialName": "Client",
-    "amount": "Amount",
-    "taxableBase": "Taxable base",
-    "ticketFk": "Id ticket",
-    "isActive": "Active",
-    "hasToInvoice": "Invoice",
-    "isTaxDataChecked": "Data checked",
-    "comercialId": "Id Comercial",
-    "comercialName": "Comercial",
+	"company": "Company",
+	"country": "Country",
+	"clientId": "Id client",
+	"clientSocialName": "Client",
+	"amount": "Amount",
+	"taxableBase": "Taxable base",
+	"ticketFk": "Id ticket",
+	"isActive": "Active",
+	"hasToInvoice": "Invoice",
+	"isTaxDataChecked": "Data checked",
+	"comercialId": "Id Comercial",
+	"comercialName": "Comercial",
 	"Added observation": "Added observation",
-	"Comment added to client": "Comment added to client"
-}
+	"Comment added to client": "Comment added to client",
+	"This ticket is already a refund": "This ticket is already a refund"
+}
--- a/modules/account/front/main/index.html
+++ b/modules/account/front/main/index.html
@ -6,6 +6,7 @@
 </vn-crud-model>
 <vn-portal slot="topbar">
    <vn-searchbar
+        vn-focus
        panel="vn-user-search-panel"
        info="Search user by id, name or nickname"
        model="model"
@ -15,4 +16,4 @@
 <vn-portal slot="menu">
    <vn-left-menu></vn-left-menu>
 </vn-portal>
-<ui-view></ui-view>
+<ui-view></ui-view>
--- a/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js
+++ b/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js
@ -109,6 +109,11 @@ module.exports = Self => {
                zoneFk: zone.id
            }, myOptions);

+            await models.TicketRefund.create({
+                refundTicketFk: newRefundTicket.id,
+                originalTicketFk: claim.ticket().id
+            }, myOptions);
+
            await saveObservation({
                description: `Reclama ticket: ${claim.ticketFk}`,
                ticketFk: newRefundTicket.id,
--- a/modules/claim/front/action/index.html
+++ b/modules/claim/front/action/index.html
@ -16,7 +16,7 @@
        value="{{$ctrl.claimedTotal | currency: 'EUR':2}}">
    </vn-label-value>
 </vn-card>
-<vn-card class="vn-pa-lg vn-w-lg">
+<vn-card class="vn-pa-md vn-w-lg">
    <smart-table
        model="model"
        options="$ctrl.smartTableOptions"
@ -31,10 +31,10 @@
                        translate-attr="{title: 'Imports claim details'}">
                    </vn-button>
                    <vn-button
-                    label="Change destination"
-                    disabled="$ctrl.checked.length == 0"
-                    ng-click="changeDestination.show()">
-                </vn-button>
+                        label="Change destination"
+                        disabled="$ctrl.checked.length == 0"
+                        ng-click="changeDestination.show()">
+                    </vn-button>
                    <vn-range
                        label="Responsability"
                        min-label="Company"
@ -45,15 +45,15 @@
                        step="1"
                        on-change="$ctrl.save({responsibility: value})">
                    </vn-range>
+                    <vn-check class="right"
+                        vn-one
+                        label="Is paid with mana"
+                        ng-model="$ctrl.claim.isChargedToMana"
+                        on-change="$ctrl.save({isChargedToMana: value})">
+                    </vn-check>
                </vn-tool-bar>
-                <vn-check class="right"
-                    vn-one
-                    label="Is paid with mana"
-                    ng-model="$ctrl.claim.isChargedToMana"
-                    on-change="$ctrl.save({isChargedToMana: value})">
-                </vn-check>
            </section>
-        </slot-actions>
+    </slot-actions>
    <slot-table>
        <table model="model">
            <thead>
--- a/modules/claim/front/photos/index.html
+++ b/modules/claim/front/photos/index.html
@ -1,48 +1 @@
-<vn-crud-model
-    vn-id="model"
-    auto-load="true"
-    filter="::$ctrl.filter"
-    url="ClaimDms"
-    link="{claimFk: $ctrl.$params.id}"
-    limit="20"
-    data="$ctrl.photos">
-</vn-crud-model>
-<vn-horizontal class="photo-list drop-zone" vn-droppable="$ctrl.onDrop($event)">
-    <section class="empty-rows" ng-if="!$ctrl.photos.length">
-        <section><vn-icon icon="image"></vn-icon></section>
-        <section translate>Drag & Drop photos here...</section>
-    </section>
-    <section class="photo" ng-repeat="photo in $ctrl.photos">
-        <section class="image vn-shadow" on-error-src 
-            ng-style="{'background': 'url(' + $ctrl.getImagePath(photo.dmsFk) + ')'}"
-            zoom-image="{{$ctrl.getImagePath(photo.dmsFk)}}"
-            ng-if="photo.dms.contentType != 'video/mp4'">
-        </section>
-        <video id="videobcg" muted="muted" controls ng-if="photo.dms.contentType == 'video/mp4'"
-            class="video">
-            <source src="{{$ctrl.getImagePath(photo.dmsFk)}}" type="video/mp4">
-        </video>
-        <section class="actions">
-            <vn-button
-                class="round"
-                ng-click="confirm.show($index)"
-                title="{{'Remove file' | translate}}"
-                tabindex="-1"
-                icon="delete">
-            </vn-button>
-        </section>
-    </section>
-</vn-horizontal>
-<vn-confirm 
-    vn-id="confirm"
-    message="This file will be deleted"
-    question="Are you sure you want to continue?"
-    on-accept="$ctrl.deleteDms($data)">
-</vn-confirm>
-<vn-float-button
-    icon="add"
-    vn-tooltip="Select file" 
-    vn-bind="+"
-    ng-click="$ctrl.openUploadDialog()"
-    fixed-bottom-right>
-</vn-float-button>
+
--- a/modules/claim/front/photos/index.js
+++ b/modules/claim/front/photos/index.js
@ -1,105 +1,17 @@
 import ngModule from '../module';
 import Section from 'salix/components/section';
-import './style.scss';

 class Controller extends Section {
-    constructor($element, $, vnFile) {
+    constructor($element, $) {
        super($element, $);
-        this.vnFile = vnFile;
-        this.filter = {
-            include: [
-                {
-                    relation: 'dms'
-                }
-            ]
-        };
    }

-    deleteDms(index) {
-        const dmsFk = this.photos[index].dmsFk;
-        return this.$http.post(`ClaimDms/${dmsFk}/removeFile`)
-            .then(() => {
-                this.$.model.remove(index);
-                this.vnApp.showSuccess(this.$t('File deleted'));
-            });
-    }
-
-    onDrop($event) {
-        const files = $event.dataTransfer.files;
-        this.setDefaultParams().then(() => {
-            this.dms.files = files;
-            this.create();
-        });
-    }
-
-    setDefaultParams() {
-        const filter = {
-            where: {code: 'claim'}
-        };
-        return this.$http.get('DmsTypes/findOne', {filter}).then(res => {
-            const dmsTypeId = res.data && res.data.id;
-            const companyId = this.vnConfig.companyFk;
-            const warehouseId = this.vnConfig.warehouseFk;
-            this.dms = {
-                hasFile: false,
-                hasFileAttached: false,
-                reference: this.claim.id,
-                warehouseId: warehouseId,
-                companyId: companyId,
-                dmsTypeId: dmsTypeId,
-                description: this.$t('FileDescription', {
-                    claimId: this.claim.id,
-                    clientId: this.claim.client.id,
-                    clientName: this.claim.client.name
-                }).toUpperCase()
-            };
-        });
-    }
-
-    openUploadDialog() {
-        const element = document.createElement('input');
-        element.setAttribute('type', 'file');
-        element.setAttribute('multiple', true);
-        element.click();
-
-        element.addEventListener('change', () =>
-            this.setDefaultParams().then(() => {
-                this.dms.files = element.files;
-                this.create();
-            })
-        );
-    }
-
-    create() {
-        const query = `claims/${this.claim.id}/uploadFile`;
-        const options = {
-            method: 'POST',
-            url: query,
-            params: this.dms,
-            headers: {'Content-Type': undefined},
-            transformRequest: files => {
-                const formData = new FormData();
-
-                for (let i = 0; i < files.length; i++)
-                    formData.append(files[i].name, files[i]);
-
-                return formData;
-            },
-            data: this.dms.files
-        };
-        this.$http(options).then(() => {
-            this.vnApp.showSuccess(this.$t('File uploaded!'));
-            this.$.model.refresh();
-        });
-    }
-
-    getImagePath(dmsId) {
-        return this.vnFile.getPath(`/api/Claims/${dmsId}/downloadFile`);
+    async $onInit() {
+        const url = await this.vnApp.getUrl(`claim/${this.$params.id}/photos`);
+        window.location.href = url;
    }
 }

-Controller.$inject = ['$element', '$scope', 'vnFile'];
-
 ngModule.vnComponent('vnClaimPhotos', {
    template: require('./index.html'),
    controller: Controller,
--- a/modules/claim/front/photos/index.spec.js
+++ b/modules/claim/front/photos/index.spec.js
@ -1,70 +0,0 @@
-import './index';
-import crudModel from 'core/mocks/crud-model';
-
-describe('Claim', () => {
-    describe('Component vnClaimPhotos', () => {
-        let $scope;
-        let $httpBackend;
-        let controller;
-
-        beforeEach(ngModule('claim'));
-
-        beforeEach(inject(($componentController, $rootScope, _$httpBackend_) => {
-            $httpBackend = _$httpBackend_;
-            $scope = $rootScope.$new();
-            controller = $componentController('vnClaimPhotos', {$element: null, $scope});
-            controller.$.model = crudModel;
-            controller.claim = {
-                id: 1,
-                client: {id: 1101, name: 'Bruce Wayne'}
-            };
-        }));
-
-        describe('deleteDms()', () => {
-            it('should make an HTTP Post query', () => {
-                jest.spyOn(controller.vnApp, 'showSuccess');
-                jest.spyOn(controller.$.model, 'remove');
-
-                const dmsId = 1;
-                const dmsIndex = 0;
-                controller.photos = [{dmsFk: 1}];
-
-                $httpBackend.expectPOST(`ClaimDms/${dmsId}/removeFile`).respond();
-                controller.deleteDms(dmsIndex);
-                $httpBackend.flush();
-
-                expect(controller.$.model.remove).toHaveBeenCalledWith(dmsIndex);
-                expect(controller.vnApp.showSuccess).toHaveBeenCalled();
-            });
-        });
-
-        describe('setDefaultParams()', () => {
-            it('should make an HTTP GET query, then set all dms properties', () => {
-                $httpBackend.expectRoute('GET', `DmsTypes/findOne`).respond({});
-                controller.setDefaultParams();
-                $httpBackend.flush();
-
-                expect(controller.dms).toBeDefined();
-            });
-        });
-
-        describe('create()', () => {
-            it('should make an HTTP Post query, then refresh the model data', () => {
-                const claimId = 1;
-                const dmsIndex = 0;
-                jest.spyOn(controller.vnApp, 'showSuccess');
-                jest.spyOn(controller.$.model, 'refresh');
-                controller.photos = [{dmsFk: 1}];
-                controller.dmsIndex = dmsIndex;
-                controller.dms = {files: []};
-
-                $httpBackend.expectPOST(`claims/${claimId}/uploadFile`).respond({});
-                controller.create();
-                $httpBackend.flush();
-
-                expect(controller.$.model.refresh).toHaveBeenCalled();
-                expect(controller.vnApp.showSuccess).toHaveBeenCalled();
-            });
-        });
-    });
-});
--- a/modules/claim/front/photos/locale/es.yml
+++ b/modules/claim/front/photos/locale/es.yml
@ -1,5 +0,0 @@
-Are you sure you want to continue?: ¿Seguro que quieres continuar?
-Drag & Drop photos here...: Arrastra y suelta fotos aquí...
-File deleted: Archivo eliminado
-File uploaded!: Archivo subido!
-Select file: Seleccionar fichero
--- a/modules/claim/front/photos/style.scss
+++ b/modules/claim/front/photos/style.scss
@ -1,47 +0,0 @@
-@import "./variables";
-
-vn-claim-photos {
-    height: 100%;
-
-    .drop-zone {
-        color: $color-font-secondary;
-        box-sizing: border-box;
-        border-radius: 8px;
-        text-align: center;
-        min-height: 100%;
-        
-        .empty-rows {
-            padding: 80px $spacing-md;
-            font-size: 1.375rem
-        }
-
-        vn-icon {
-            font-size: 3rem
-        }
-    }
-
-    .photo-list {
-        padding: $spacing-md;
-        min-height: 100%;
-
-        .photo {
-            width: 512px;
-            height: 288px;
-        }
-    }
-    
-    .video {
-        width: 100%;
-        height: 100%;
-        object-fit: cover;
-        cursor: pointer;
-        box-shadow: 0 2px 2px 0 rgba(0,0,0,.14),
-        0 3px 1px -2px rgba(0,0,0,.2),
-        0 1px 5px 0 rgba(0,0,0,.12);
-        border: 2px solid transparent;
-
-    }
-    .video:hover {
-        border: 2px solid $color-primary
-    }
-}
--- a/modules/invoiceOut/back/methods/invoiceOut/refund.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/refund.js
@ -35,7 +35,7 @@ module.exports = Self => {
            const tickets = await models.Ticket.find(filter, myOptions);

            const ticketsIds = tickets.map(ticket => ticket.id);
-            const refundedTickets = await models.Ticket.refund(ticketsIds, true, myOptions);
+            const refundedTickets = await models.Ticket.refund(ticketsIds, myOptions);

            if (tx) await tx.commit();

--- a/modules/invoiceOut/back/methods/invoiceOut/specs/refund.spec.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/specs/refund.spec.js
@ -17,7 +17,7 @@ describe('InvoiceOut refund()', () => {
        try {
            const result = await models.InvoiceOut.refund('T1111111', options);

-            expect(result.length).toEqual(1);
+            expect(result).toBeDefined();

            await tx.rollback();
        } catch (e) {
--- a/modules/invoiceOut/front/descriptor-menu/index.js
+++ b/modules/invoiceOut/front/descriptor-menu/index.js
@ -118,8 +118,11 @@ class Controller extends Section {
        const query = 'InvoiceOuts/refund';
        const params = {ref: this.invoiceOut.ref};
        this.$http.post(query, params).then(res => {
-            const ticketIds = res.data.map(ticket => ticket.id).join(', ');
-            this.vnApp.showSuccess(this.$t('The following refund tickets have been created', {ticketIds}));
+            const refundTicket = res.data;
+            this.vnApp.showSuccess(this.$t('The following refund ticket have been created', {
+                ticketId: refundTicket.id
+            }));
+            this.$state.go('ticket.card.sale', {id: refundTicket.id});
        });
    }
 }
--- a/modules/supplier/back/methods/supplier/specs/filter.spec.js
+++ b/modules/supplier/back/methods/supplier/specs/filter.spec.js
@ -23,6 +23,6 @@ describe('Supplier filter()', () => {

        let result = await app.models.Supplier.filter(ctx);

-        expect(result.length).toEqual(2);
+        expect(result.length).toEqual(3);
    });
 });
--- a/modules/ticket/back/methods/sale/refund.js
+++ b/modules/ticket/back/methods/sale/refund.js
@ -11,11 +11,6 @@ module.exports = Self => {
            {
                arg: 'servicesIds',
                type: ['number']
-            },
-            {
-                arg: 'createSingleTicket',
-                type: 'boolean',
-                required: false
            }
        ],
        returns: {
@ -28,7 +23,7 @@ module.exports = Self => {
        }
    });

-    Self.refund = async(salesIds, servicesIds, createSingleTicket = false, options) => {
+    Self.refund = async(salesIds, servicesIds, options) => {
        const models = Self.app.models;
        const myOptions = {};
        let tx;
@ -67,40 +62,14 @@ module.exports = Self => {
            const sales = await models.Sale.find(salesFilter, myOptions);
            const ticketsIds = [...new Set(sales.map(sale => sale.ticketFk))];

-            const refundTickets = [];
-            const mappedTickets = new Map();
            const now = Date.vnNew();
-
            const [firstTicketId] = ticketsIds;
-            if (createSingleTicket) {
-                await createTicketRefund(
-                    firstTicketId,
-                    refundTickets,
-                    mappedTickets,
-                    now,
-                    refundAgencyMode,
-                    refoundZoneId,
-                    myOptions
-                );
-            } else {
-                for (let ticketId of ticketsIds) {
-                    await createTicketRefund(
-                        ticketId,
-                        refundTickets,
-                        mappedTickets,
-                        now,
-                        refundAgencyMode,
-                        refoundZoneId,
-                        myOptions
-                    );
-                }
-            }
+
+            const refundTicket = await createTicketRefund(firstTicketId, now, refundAgencyMode, refoundZoneId, myOptions);

            for (const sale of sales) {
-                const refundTicketId = await getTicketRefundId(createSingleTicket, sale.ticketFk, refundTickets, mappedTickets);
-
                const createdSale = await models.Sale.create({
-                    ticketFk: refundTicketId,
+                    ticketFk: refundTicket.id,
                    itemFk: sale.itemFk,
                    quantity: - sale.quantity,
                    concept: sale.concept,
@ -120,16 +89,13 @@ module.exports = Self => {
                    where: {id: {inq: servicesIds}}
                };
                const services = await models.TicketService.find(servicesFilter, myOptions);
-
                for (const service of services) {
-                    const refundTicketId = await getTicketRefundId(createSingleTicket, service.ticketFk, refundTickets, mappedTickets);
-
                    await models.TicketService.create({
                        description: service.description,
                        quantity: - service.quantity,
                        price: service.price,
                        taxClassFk: service.taxClassFk,
-                        ticketFk: refundTicketId,
+                        ticketFk: refundTicket.id,
                        ticketServiceTypeFk: service.ticketServiceTypeFk,
                    }, myOptions);
                }
@ -137,22 +103,14 @@ module.exports = Self => {

            if (tx) await tx.commit();

-            return refundTickets;
+            return refundTicket;
        } catch (e) {
            if (tx) await tx.rollback();
            throw e;
        }
    };

-    async function createTicketRefund(
-        ticketId,
-        refundTickets,
-        mappedTickets,
-        now,
-        refundAgencyMode,
-        refoundZoneId,
-        myOptions
-    ) {
+    async function createTicketRefund(ticketId, now, refundAgencyMode, refoundZoneId, myOptions) {
        const models = Self.app.models;

        const filter = {include: {relation: 'address'}};
@ -170,20 +128,11 @@ module.exports = Self => {
            zoneFk: refoundZoneId
        }, myOptions);

-        refundTickets.push(refundTicket);
-
-        mappedTickets.set(ticketId, refundTicket.id);
-
        await models.TicketRefund.create({
            refundTicketFk: refundTicket.id,
            originalTicketFk: ticket.id,
        }, myOptions);
-    }

-    async function getTicketRefundId(createSingleTicket, ticketId, refundTickets, mappedTickets) {
-        if (createSingleTicket) {
-            const [firstRefundTicket] = refundTickets;
-            return firstRefundTicket.id;
-        } else return mappedTickets.get(ticketId);
+        return refundTicket;
    }
 };
--- a/modules/ticket/back/methods/sale/specs/refund.spec.js
+++ b/modules/ticket/back/methods/sale/specs/refund.spec.js
@ -22,9 +22,9 @@ describe('Sale refund()', () => {
        try {
            const options = {transaction: tx};

-            const response = await models.Sale.refund(salesIds, servicesIds, false, options);
+            const refundedTicket = await models.Sale.refund(salesIds, servicesIds, options);

-            expect(response.length).toBeGreaterThanOrEqual(1);
+            expect(refundedTicket).toBeDefined();

            await tx.rollback();
        } catch (e) {
@ -33,23 +33,18 @@ describe('Sale refund()', () => {
        }
    });

-    it('should create a ticket for each unique ticketFk in the sales', async() => {
+    it('should create one ticket for each unique ticketFk in the sales', async() => {
        const tx = await models.Sale.beginTransaction({});
        const salesIds = [6, 7];

        try {
            const options = {transaction: tx};

-            const createSingleTicket = false;
-            const tickets = await models.Sale.refund(salesIds, servicesIds, createSingleTicket, options);
+            const ticket = await models.Sale.refund(salesIds, servicesIds, options);

-            const ticketsIds = tickets.map(ticket => ticket.id);
-
-            const refundedTickets = await models.Ticket.find({
+            const refundedTicket = await models.Ticket.findOne({
                where: {
-                    id: {
-                        inq: ticketsIds
-                    }
+                    id: ticket.id
                },
                include: [
                    {
@ -66,16 +61,12 @@ describe('Sale refund()', () => {
                ]
            }, options);

-            const firstRefoundedTicket = refundedTickets[0];
-            const secondRefoundedTicket = refundedTickets[1];
-            const salesLength = firstRefoundedTicket.ticketSales().length;
-            const componentsLength = firstRefoundedTicket.ticketSales()[0].components().length;
-            const servicesLength = secondRefoundedTicket.ticketServices().length;
+            const salesLength = refundedTicket.ticketSales().length;
+            const componentsLength = refundedTicket.ticketSales()[0].components().length;

-            expect(refundedTickets.length).toEqual(2);
-            expect(salesLength).toEqual(1);
+            expect(refundedTicket).toBeDefined();
+            expect(salesLength).toEqual(2);
            expect(componentsLength).toEqual(4);
-            expect(servicesLength).toBeGreaterThanOrEqual(1);

            await tx.rollback();
        } catch (e) {
--- a/modules/ticket/back/methods/ticket/refund.js
+++ b/modules/ticket/back/methods/ticket/refund.js
@ -7,11 +7,6 @@ module.exports = Self => {
                arg: 'ticketsIds',
                type: ['number'],
                required: true
-            },
-            {
-                arg: 'createSingleTicket',
-                type: 'boolean',
-                required: false
            }
        ],
        returns: {
@ -24,7 +19,7 @@ module.exports = Self => {
        }
    });

-    Self.refund = async(ticketsIds, createSingleTicket = false, options) => {
+    Self.refund = async(ticketsIds, options) => {
        const models = Self.app.models;
        const myOptions = {};
        let tx;
@ -46,7 +41,7 @@ module.exports = Self => {
            const services = await models.TicketService.find(filter, myOptions);
            const servicesIds = services.map(service => service.id);

-            const refundedTickets = await models.Sale.refund(salesIds, servicesIds, createSingleTicket, myOptions);
+            const refundedTickets = await models.Sale.refund(salesIds, servicesIds, myOptions);

            if (tx) await tx.commit();

--- a/modules/ticket/front/descriptor-menu/index.js
+++ b/modules/ticket/front/descriptor-menu/index.js
@ -300,7 +300,7 @@ class Controller extends Section {
        const params = {ticketsIds: [this.id]};
        const query = 'Tickets/refund';
        return this.$http.post(query, params).then(res => {
-            const [refundTicket] = res.data;
+            const refundTicket = res.data;
            this.vnApp.showSuccess(this.$t('The following refund ticket have been created', {
                ticketId: refundTicket.id
            }));
--- a/modules/ticket/front/descriptor-menu/index.spec.js
+++ b/modules/ticket/front/descriptor-menu/index.spec.js
@ -250,7 +250,7 @@ describe('Ticket Component vnTicketDescriptorMenu', () => {
            const params = {
                ticketsIds: [16]
            };
-            $httpBackend.expectPOST('Tickets/refund', params).respond([{id: 99}]);
+            $httpBackend.expectPOST('Tickets/refund', params).respond({id: 99});
            controller.refund();
            $httpBackend.flush();

--- a/modules/ticket/front/sale/index.js
+++ b/modules/ticket/front/sale/index.js
@ -516,7 +516,7 @@ class Controller extends Section {
        const params = {salesIds: salesIds};
        const query = 'Sales/refund';
        this.$http.post(query, params).then(res => {
-            const [refundTicket] = res.data;
+            const refundTicket = res.data;
            this.vnApp.showSuccess(this.$t('The following refund ticket have been created', {
                ticketId: refundTicket.id
            }));
--- a/modules/ticket/front/sale/index.spec.js
+++ b/modules/ticket/front/sale/index.spec.js
@ -726,8 +726,7 @@ describe('Ticket', () => {
                    salesIds: [1, 4],
                };
                const refundTicket = {id: 99};
-                const createdTickets = [refundTicket];
-                $httpBackend.expect('POST', 'Sales/refund', params).respond(200, createdTickets);
+                $httpBackend.expect('POST', 'Sales/refund', params).respond(200, refundTicket);
                controller.createRefund();
                $httpBackend.flush();

--- a/print/core/components/report-footer/assets/css/style.css
+++ b/print/core/components/report-footer/assets/css/style.css
@ -4,6 +4,7 @@
    margin-right: 2cm;
    font-size: 10px;
    color: #555;
+    width: 100%;
    zoom: 0.65
 }

--- a/print/core/components/report-footer/locale/en.yml
+++ b/print/core/components/report-footer/locale/en.yml
@ -1,8 +1 @@
-numPages: Page <span class="pageNumber"></span> of <span class="totalPages"></span>
-law:
-  privacy: 'In compliance with the provisions of Organic Law 15/1999, on the 
-    Protection of Personal Data, we inform you that the personal data you provide 
-    will be included in automated files of VERDNATURA LEVANTE SL, being able at all 
-    times to exercise the rights of access, rectification, cancellation and opposition, 
-    communicating it in writing to the registered office of the entity. 
-    The purpose of the file is administrative management, accounting, and billing.'
+numPages: Page <span class="pageNumber"></span> of <span class="totalPages"></span>
--- a/print/core/components/report-footer/locale/es.yml
+++ b/print/core/components/report-footer/locale/es.yml
@ -1,8 +1 @@
-numPages: Página <span class="pageNumber"></span> de <span class="totalPages"></span>
-law:
-  privacy: En cumplimiento de lo dispuesto en la Ley Orgánica 15/1999, de Protección
-    de Datos de Carácter Personal, le comunicamos que los datos personales que facilite
-    se incluirán en ficheros automatizados de VERDNATURA LEVANTE S.L., pudiendo en
-    todo momento ejercitar los derechos de acceso, rectificación, cancelación y oposición,
-    comunicándolo por escrito al domicilio social de la entidad. La finalidad del
-    fichero es la gestión administrativa, contabilidad, y facturación.
+numPages: Página <span class="pageNumber"></span> de <span class="totalPages"></span>
--- a/print/core/components/report-footer/locale/fr.yml
+++ b/print/core/components/report-footer/locale/fr.yml
@ -1,8 +1 @@
 numPages: Page <span class="pageNumber"></span> de <span class="totalPages"></span>
-law:
-  privacy: Conformément aux dispositions de la loi organique 15/1999 sur la protection
-    des données personnelles, nous vous informons que les données personnelles que
-    vous fournissez seront incluses dans des dossiers. VERDNATURA LEVANTE S.L., vous
-    pouvez à tout moment, exercer les droits d'accès, de rectification, d'annulation
-    et d'opposition, en communiquant par écrit au siège social de la société. Le dossier
-    a pour objet la gestion administrative, la comptabilité et la facturation.
--- a/print/core/components/report-footer/locale/pt.yml
+++ b/print/core/components/report-footer/locale/pt.yml
@ -1,8 +1 @@
 numPages: Página <span class="pageNumber"></span> de <span class="totalPages"></span>
-law:
-  privacy: Em cumprimento do disposto na lei Orgânica 15/1999, de Protecção de Dados
-    de Carácter Pessoal, comunicamos que os dados pessoais que facilite se incluirão
-    nos ficheiros automatizados de VERDNATURA LEVANTE S.L., podendo em todo momento
-    exercer os direitos de acesso, rectificação, cancelação e oposição, comunicando
-    por escrito ao domicílio social da entidade. A finalidade do ficheiro é a gestão
-    administrativa, contabilidade e facturação.
--- a/print/core/components/report-footer/report-footer.html
+++ b/print/core/components/report-footer/report-footer.html
@ -5,6 +5,11 @@
            <div class="centerText" v-if="centerText" class="uppercase">{{centerText}}</div>
            <div class="pageCount" v-html="$t('numPages')"></div>
        </div>
-        <p class="privacy" v-html="$t('law.privacy')"></p>
+        <p  
+            v-if="company?.footnotes"
+            v-html="company.footnotes">
+        </p>
    </div>
 </div>
+
+
--- a/print/core/components/report-footer/report-footer.js
+++ b/print/core/components/report-footer/report-footer.js
@ -1,4 +1,17 @@
+/* eslint-disable no-tabs */
+const db = require('../../database');
+
 module.exports = {
    name: 'report-footer',
-    props: ['leftText', 'centerText']
+    async serverPrefetch() {
+        this.company = await db.findOne(
+            `SELECT 
+	            ci.footnotes
+	          FROM companyI18n ci
+            JOIN company c ON c.id = ci.companyFk 
+	          WHERE c.code = ? AND ci.lang = (SELECT lang FROM account.user WHERE id = ?)`,
+            [this.companyCode, this.recipientId]);
+    },
+
+    props: ['leftText', 'companyCode', 'recipientId', 'centerText']
 };
--- a/print/core/components/report-header/report-header.html
+++ b/print/core/components/report-header/report-header.html
@ -8,7 +8,7 @@
        {{companyName}}. {{company.street}}. 
        {{company.postCode}} {{company.city}}.
        &#9742; {{companyPhone}} 
-        · {{$t('company.contactData')}}
+        · {{company.web}} - {{company.email}}
    </section>
    <section>CIF: {{fiscalAddress.nif}} {{fiscalAddress.register}}</section>
 </header>
--- a/print/core/components/report-header/report-header.js
+++ b/print/core/components/report-header/report-header.js
@ -43,7 +43,9 @@ module.exports = {
                        s.postCode, 
                        s.city,
                        s.phone,
-                        cg.code AS groupName
+                        cg.code AS groupName,
+                        c.email,
+                        c.web
                    FROM company c
                        JOIN companyGroup cg ON cg.id = c.companyGroupFk
                        JOIN supplier s ON s.id = c.id
--- a/print/templates/email/greuge-wrong/assets/css/import.js
+++ b/print/templates/email/greuge-wrong/assets/css/import.js
@ -0,0 +1,11 @@
+const Stylesheet = require(`vn-print/core/stylesheet`);
+
+const path = require('path');
+const vnPrintPath = path.resolve('print');
+
+module.exports = new Stylesheet([
+    `${vnPrintPath}/common/css/spacing.css`,
+    `${vnPrintPath}/common/css/misc.css`,
+    `${vnPrintPath}/common/css/layout.css`,
+    `${vnPrintPath}/common/css/email.css`])
+    .mergeStyles();
--- a/print/templates/email/greuge-wrong/greuge-wrong.html
+++ b/print/templates/email/greuge-wrong/greuge-wrong.html
@ -0,0 +1,15 @@
+<email-body v-bind="$props">
+    <div class="grid-row">
+        <div class="grid-block vn-px-ml centered">
+            <h1>{{ $t('total') }}: {{tickets.length}}</h1>
+            <hr>
+        </div>
+        <div v-for="ticket in tickets" class="grid-block vn-px-ml">
+            <p v-if="ticket.ticketId"><b>{{ $t('ticketId') }}:</b> {{ticket.ticketId}}</p>
+            <p><b>{{ $t('clientId') }}:</b> <a :href="clientGreugeUrl(ticket.clientId)" target="_blank">{{ticket.clientId}}</a></p>
+            <p v-if="ticket.description"><b>{{ $t('description') }}:</b> {{ticket.description}}</p>
+            <p><b>{{ $t('amount') }}:</b> {{ticket.amount}} €</p>
+            <hr>
+        </div>
+    </div>
+</email-body>
--- a/print/templates/email/greuge-wrong/greuge-wrong.js
+++ b/print/templates/email/greuge-wrong/greuge-wrong.js
@ -0,0 +1,36 @@
+const Component = require(`vn-print/core/component`);
+const emailBody = new Component('email-body');
+const models = require('vn-loopback/server/server').models;
+
+module.exports = {
+    name: 'greuge-wrong',
+    async serverPrefetch() {
+        this.url = await this.salixUrl();
+
+        if (!this.url)
+            throw new Error('Something went wrong');
+    },
+    components: {
+        'email-body': emailBody.build(),
+    },
+    methods: {
+        async salixUrl() {
+            const salix = await models.Url.findOne({
+                where: {
+                    appName: 'salix',
+                    environment: process.env.NODE_ENV || 'dev'
+                }
+            });
+            return salix.url;
+        },
+        clientGreugeUrl(clientId) {
+            return `${this.url}client/${clientId}/greuge/index`
+        },
+    },
+    props: {
+        tickets: {
+            type: Array,
+            required: true
+        },
+    },
+};
--- a/print/templates/email/greuge-wrong/locale/en.yml
+++ b/print/templates/email/greuge-wrong/locale/en.yml
@ -0,0 +1,6 @@
+subject: Abnormal greuges have been created
+total: Total number of abnormal greuges
+ticketId: Ticket
+clientId: Client
+description: Description
+amount: Amount
--- a/print/templates/email/greuge-wrong/locale/es.yml
+++ b/print/templates/email/greuge-wrong/locale/es.yml
@ -0,0 +1,6 @@
+subject: Se han creado greuges anormales
+total: Número total de greuges anormales
+ticketId: Ticket
+clientId: Cliente
+description: Descipción
+amount: Importe
--- a/print/templates/reports/invoice/invoice.html
+++ b/print/templates/reports/invoice/invoice.html
@ -5,7 +5,7 @@
        </div>
        <report-header v-bind="$props" v-bind:company-code="invoice.companyCode"></report-header>
    </template>
-    <div class="grid-row">
+   <div class="grid-row">
        <div class="grid-block">
            <div class="columns vn-mb-lg">
                <div class="size50">
@ -242,7 +242,7 @@
                    </tfoot>
                </table>
            </div>
-            <div class="columns vn-mt-xl" v-if="invoice.payMethodCode == 'wireTransfer' || ticketObservations">
+            <div class="columns vn-mt-xl" v-if="invoice.payMethodCode == 'wireTransfer' && invoice.iban">
                <div class="size50 pull-left no-page-break">
                    <div class="panel">
                        <div class="header">{{$t('observations')}}</div>
@ -266,7 +266,9 @@
            v-bind:company-code="invoice.companyCode"
            v-bind:left-text="$t('invoiceRef', [invoice.ref])"
            v-bind:center-text="client.socialName"
+            v-bind:recipient-id="client.id"
            v-bind="$props"
+            
        >
        </report-footer>
    </template>
--- a/print/templates/reports/invoice/invoice.js
+++ b/print/templates/reports/invoice/invoice.js
@ -11,8 +11,12 @@ module.exports = {
        this.client = await this.findOneFromDef('client', [this.reference]);
        this.taxes = await this.rawSqlFromDef(`taxes`, [this.reference]);
        this.hasIntrastat = await this.findValueFromDef(`hasIntrastat`, [this.reference]);
-        this.intrastat = await this.rawSqlFromDef(`intrastat`,
-            [this.reference, this.reference, this.reference, this.reference]);
+        this.intrastat = await this.rawSqlFromDef(`intrastat`, [
+            this.reference,
+            this.reference,
+            this.reference,
+            this.reference
+        ]);
        this.rectified = await this.rawSqlFromDef(`rectified`, [this.reference]);
        this.hasIncoterms = await this.findValueFromDef(`hasIncoterms`, [this.reference]);

--- a/print/templates/reports/invoice/sql/invoice.sql
+++ b/print/templates/reports/invoice/sql/invoice.sql
@ -11,7 +11,7 @@ FROM invoiceOut io
    JOIN client c ON c.id = io.clientFk
    JOIN payMethod pm ON pm.id = c.payMethodFk
    JOIN company cny ON cny.id = io.companyFk
-    JOIN supplierAccount sa ON sa.id = cny.supplierAccountFk
+    LEFT JOIN supplierAccount sa ON sa.id = cny.supplierAccountFk
    LEFT JOIN invoiceOutSerial ios ON ios.code = io.serial
    LEFT JOIN ticket t ON t.refFk = io.ref
 WHERE t.refFk = ?
				`@ -0,0 +1 @@`
				ALTER TABLE `vn`.`company` ADD `web` varchar(100) NULL;