From 0ddfb28327a2723fe394eec50482f3669a6bf274 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 20 Nov 2023 07:56:15 +0100
Subject: [PATCH 01/11] refs #5914 fix: transferInvoice

---
 db/dump/dumpedFixtures.sql                    |  13 +-
 db/dump/structure.sql                         |   6 +-
 loopback/locale/es.json                       |  15 ++-
 .../invoiceOut/specs/transferinvoice.spec.js  |   4 +-
 .../methods/invoiceOut/transferInvoice.js     |  34 +++--
 .../back/models/invoice-correction.json       |   9 +-
 ...ype-477.json => sii-type-invoice-out.json} |   3 +
 .../front/descriptor-menu/index.html          | 120 +++++++++---------
 .../invoiceOut/front/descriptor-menu/index.js |  10 +-
 .../front/descriptor-menu/locale/es.yml       |   2 +-
 modules/ticket/back/methods/sale/refund.js    |   4 +-
 .../back/methods/ticket/invoiceTickets.js     |  19 ++-
 .../ticket/back/methods/ticket/makeInvoice.js |  18 ++-
 modules/ticket/back/methods/ticket/refund.js  |   2 +-
 14 files changed, 155 insertions(+), 104 deletions(-)
 rename modules/invoiceOut/back/models/{cplus-invoice-type-477.json => sii-type-invoice-out.json} (86%)

diff --git a/db/dump/dumpedFixtures.sql b/db/dump/dumpedFixtures.sql
index 43eba7f24..5e3438dbf 100644
--- a/db/dump/dumpedFixtures.sql
+++ b/db/dump/dumpedFixtures.sql
@@ -280,7 +280,18 @@ UNLOCK TABLES;
 
 LOCK TABLES `siiTypeInvoiceOut` WRITE;
 /*!40000 ALTER TABLE `siiTypeInvoiceOut` DISABLE KEYS */;
-INSERT INTO `siiTypeInvoiceOut` VALUES (1,'F1 - Factura'),(2,'F2 - Factura simplificada (ticket)'),(3,'F3 - Factura emitida en sustitución de facturas  simplificadas facturadas y declaradas'),(4,'F4 - Asiento resumen de facturas'),(5,'R1 - Factura rectificativa (Art. 80.1, 80.2  y error fundado en derecho)'),(6,'R2 - Factura rectificativa (Art. 80.3)'),(7,'R3 - Factura rectificativa (Art. 80.4)'),(8,'R4 - Factura rectificativa (Resto)'),(9,'R5 - Factura rectificativa en facturas simplificadas');
+
+INSERT INTO `siiTypeInvoiceOut` (id, code, description) VALUES
+    (1, 'F1', 'Factura'),
+    (2, 'F2', 'Factura simplificada (ticket)'),
+    (3, 'F3', 'Factura emitida en sustitución de facturas  simplificadas facturadas y declaradas'),
+    (4, 'F4', 'Asiento resumen de facturas'),
+    (5, 'R1', 'Factura rectificativa (Art. 80.1, 80.2  y error fundado en derecho)'),
+    (6, 'R2', 'Factura rectificativa (Art. 80.3)'),
+    (7, 'R3', 'Factura rectificativa (Art. 80.4)'),
+    (8, 'R4', 'Factura rectificativa (Resto)'),
+    (9, 'R5', 'Factura rectificativa en facturas simplificadas');
+
 /*!40000 ALTER TABLE `siiTypeInvoiceOut` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/db/dump/structure.sql b/db/dump/structure.sql
index 3dab0c5a4..2eecf6c30 100644
--- a/db/dump/structure.sql
+++ b/db/dump/structure.sql
@@ -26001,9 +26001,11 @@ DROP TABLE IF EXISTS `siiTypeInvoiceOut`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `siiTypeInvoiceOut` (
   `id` int(10) unsigned NOT NULL,
+  `code` varchar(2) NOT NULL,
   `description` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='(*18) TIPO FACTURA (Asientos)REPERCUTIDO - DEVENGADO (477)';
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `code_UNIQUE` (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Tipo de Factura Emitidas en el suministro de inmediato';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 239faff34..0dcbe0dc2 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -326,5 +326,16 @@
 	"The notification subscription of this worker cant be modified": "La subscripción a la notificación de este trabajador no puede ser modificada",
 	"User disabled": "Usuario desactivado",
 	"The amount cannot be less than the minimum": "La cantidad no puede ser menor que la cantidad mínima",
-	"quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mínima"
-}
+	"quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mínima",
+	"Base negativa para los tickets: 65": "Base negativa para los tickets: 65",
+	"Base negativa para los tickets: 67": "Base negativa para los tickets: 67",
+	"Base negativa para los tickets: 70": "Base negativa para los tickets: 70",
+	"Base negativa para los tickets: 72": "Base negativa para los tickets: 72",
+	"Base negativa para los tickets: 74": "Base negativa para los tickets: 74",
+	"Base negativa para los tickets: 33": "Base negativa para los tickets: 33",
+	"Base negativa para los tickets: 35": "Base negativa para los tickets: 35",
+	"Base negativa para los tickets: 37": "Base negativa para los tickets: 37",
+	"Base negativa para los tickets: 39": "Base negativa para los tickets: 39",
+	"Base negativa para los tickets: 41": "Base negativa para los tickets: 41",
+	"Base negativa para los tickets: 43": "Base negativa para los tickets: 43"
+}
\ No newline at end of file
diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/transferinvoice.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/transferinvoice.spec.js
index 800a4ea83..dea4b6d00 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/specs/transferinvoice.spec.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/specs/transferinvoice.spec.js
@@ -24,7 +24,7 @@ describe('InvoiceOut tranferInvoice()', () => {
         const options = {transaction: tx};
         const args = {
             id: '1',
-            ref: 'T4444444',
+            refFk: 'T4444444',
             newClientFk: 1,
             cplusRectificationId: 1,
             siiTypeInvoiceOutId: 1,
@@ -49,7 +49,7 @@ describe('InvoiceOut tranferInvoice()', () => {
         const options = {transaction: tx};
         const args = {
             id: '1',
-            ref: 'T1111111',
+            refFk: 'T1111111',
             newClientFk: 1101,
             cplusRectificationId: 1,
             siiTypeInvoiceOutId: 1,
diff --git a/modules/invoiceOut/back/methods/invoiceOut/transferInvoice.js b/modules/invoiceOut/back/methods/invoiceOut/transferInvoice.js
index dde535c99..dcdd9b9b1 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/transferInvoice.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/transferInvoice.js
@@ -12,7 +12,7 @@ module.exports = Self => {
                 description: 'Issued invoice id'
             },
             {
-                arg: 'ref',
+                arg: 'refFk',
                 type: 'string',
                 required: true
             },
@@ -22,17 +22,17 @@ module.exports = Self => {
                 required: true
             },
             {
-                arg: 'cplusRectificationId',
+                arg: 'cplusRectificationFk',
                 type: 'number',
                 required: true
             },
             {
-                arg: 'siiTypeInvoiceOutId',
+                arg: 'siiTypeInvoiceOutFk',
                 type: 'number',
                 required: true
             },
             {
-                arg: 'invoiceCorrectionTypeId',
+                arg: 'invoiceCorrectionTypeFk',
                 type: 'number',
                 required: true
             },
@@ -50,14 +50,14 @@ module.exports = Self => {
     Self.transferInvoice = async(ctx, options) => {
         const models = Self.app.models;
         const myOptions = {userId: ctx.req.accessToken.userId};
-        const args = ctx.args;
+        const {id, refFk, newClientFk, cplusRectificationFk, siiTypeInvoiceOutFk, invoiceCorrectionTypeFk} = ctx.args;
         let tx;
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        const {clientFk} = await models.InvoiceOut.findById(args.id);
+        const {clientFk} = await models.InvoiceOut.findById(id);
 
-        if (clientFk == args.newClientFk)
+        if (clientFk == newClientFk)
             throw new UserError(`Select a different client`);
 
         if (!myOptions.transaction) {
@@ -65,10 +65,10 @@ module.exports = Self => {
             myOptions.transaction = tx;
         }
         try {
-            const filterRef = {where: {refFk: args.ref}};
+            const filterRef = {where: {refFk: refFk}};
             const tickets = await models.Ticket.find(filterRef, myOptions);
             const ticketsIds = tickets.map(ticket => ticket.id);
-            await models.Ticket.refund(ctx, ticketsIds, null, myOptions);
+            const refundTickets = await models.Ticket.refund(ctx, ticketsIds, null, myOptions);
 
             const filterTicket = {where: {ticketFk: {inq: ticketsIds}}};
 
@@ -82,20 +82,16 @@ module.exports = Self => {
             const clonedTicketIds = [];
 
             for (const clonedTicket of clonedTickets) {
-                await clonedTicket.updateAttribute('clientFk', args.newClientFk, myOptions);
+                await clonedTicket.updateAttribute('clientFk', newClientFk, myOptions);
                 clonedTicketIds.push(clonedTicket.id);
             }
 
-            const invoiceIds = await models.Ticket.invoiceTickets(ctx, clonedTicketIds, myOptions);
-            const [invoiceId] = invoiceIds;
+            const invoiceCorrection =
+                {correctedFk: id, cplusRectificationFk, siiTypeInvoiceOutFk, invoiceCorrectionTypeFk};
+            const refundTicketIds = refundTickets.map(ticket => ticket.id);
 
-            await models.InvoiceCorrection.create({
-                correctingFk: invoiceId,
-                correctedFk: args.id,
-                cplusRectificationTypeFk: args.cplusRectificationId,
-                siiTypeInvoiceOutFk: args.siiTypeInvoiceOutId,
-                invoiceCorrectionTypeFk: args.invoiceCorrectionTypeId
-            }, myOptions);
+            await models.Ticket.invoiceTickets(ctx, refundTicketIds, invoiceCorrection, myOptions);
+            const [[invoiceId]] = await models.Ticket.invoiceTickets(ctx, clonedTicketIds, myOptions);
 
             if (tx) {
                 await tx.commit();
diff --git a/modules/invoiceOut/back/models/invoice-correction.json b/modules/invoiceOut/back/models/invoice-correction.json
index 43e4f07ef..5924c9232 100644
--- a/modules/invoiceOut/back/models/invoice-correction.json
+++ b/modules/invoiceOut/back/models/invoice-correction.json
@@ -16,13 +16,16 @@
             "type": "number"
         },
         "cplusRectificationTypeFk": {
-            "type": "number"
+            "type": "number",
+            "required": true
         },
         "siiTypeInvoiceOutFk": {
-            "type": "number"
+            "type": "number",
+            "required": true
         },
         "invoiceCorrectionTypeFk": {
-            "type": "number"
+            "type": "number",
+            "required": true
         }
     }
 }
diff --git a/modules/invoiceOut/back/models/cplus-invoice-type-477.json b/modules/invoiceOut/back/models/sii-type-invoice-out.json
similarity index 86%
rename from modules/invoiceOut/back/models/cplus-invoice-type-477.json
rename to modules/invoiceOut/back/models/sii-type-invoice-out.json
index 17b312617..58d50a12c 100644
--- a/modules/invoiceOut/back/models/cplus-invoice-type-477.json
+++ b/modules/invoiceOut/back/models/sii-type-invoice-out.json
@@ -12,6 +12,9 @@
             "type": "number",
             "description": "Identifier"
         },
+        "code": {
+            "type": "string"
+        },
         "description": {
             "type": "string"
         }
diff --git a/modules/invoiceOut/front/descriptor-menu/index.html b/modules/invoiceOut/front/descriptor-menu/index.html
index 0052f0c03..267aa0b15 100644
--- a/modules/invoiceOut/front/descriptor-menu/index.html
+++ b/modules/invoiceOut/front/descriptor-menu/index.html
@@ -7,7 +7,8 @@
 <vn-crud-model
     auto-load="true"
     url="SiiTypeInvoiceOuts"
-    data="siiTypeInvoiceOut">
+    data="siiTypeInvoiceOuts"
+    where="{code: {like: 'R%'}}">
 </vn-crud-model>
 <vn-crud-model
     auto-load="true"
@@ -185,64 +186,69 @@
     vn-id="transferInvoice"
     title="transferInvoice"
     on-accept="$ctrl.transferInvoice()">
+    <tpl-title translate>
+        transferInvoice
+    </tpl-title>
     <tpl-body>
         <section class="transferInvoice">
-        <vn-horizontal>
-            <vn-autocomplete
-                vn-one
-                vn-id="client"
-                required="true"
-                url="Clients"
-                label="Client"
-                show-field="name"
-                value-field="id"
-                search-function="{or: [{id: $search}, {name: {like: '%'+ $search +'%'}}]}"
-                ng-model="$ctrl.invoiceOut.client.id"
-                initial-data="$ctrl.invoiceOut.client.id"
-                order="id">
-                <tpl-item>
-                    #{{id}} - {{::name}}
-                </tpl-item>
-            </vn-autocomplete>
-            <vn-autocomplete
-                vn-one
-                vn-id="cplusRectificationType"
-                required="true"
-                data="cplusRectificationTypes"
-                show-field="description"
-                value-field="id"
-                ng-model="$ctrl.cplusRectificationType"
-                search-function="{or: [{id: $search}, {description: {like: '%'+ $search +'%'}}]}"
-                label="Cplus Type">
-                <tpl-item>
-                    {{::description}}
-                </tpl-item>
-            </vn-autocomplete>
-        </vn-horizontal>
-        <vn-horizontal>
-            <vn-autocomplete
-            vn-one
-            vn-id="cplusInvoiceType"
-            data="siiTypeInvoiceOut"
-            show-field="description"
-            value-field="id"
-            required="true"
-            ng-model="$ctrl.siiTypeInvoiceOut"
-            search-function="{or: [{id: $search}, {description: {like: '%'+ $search +'%'}}]}"
-            label="Class">
-            </vn-autocomplete>
-            <vn-autocomplete
-                vn-one
-                vn-id="invoiceCorrectionType"
-                data="invoiceCorrectionTypes"
-                ng-model="$ctrl.invoiceCorrectionType"
-                show-field="description"
-                value-field="id"
-                required="true"
-                label="Type">
-            </vn-autocomplete>
-        </vn-horizontal>
-    </section>
+            <vn-horizontal>
+                <vn-autocomplete
+                    vn-one
+                    vn-id="client"
+                    required="true"
+                    url="Clients"
+                    label="Client"
+                    show-field="name"
+                    value-field="id"
+                    search-function="{or: [{id: $search}, {name: {like: '%'+ $search +'%'}}]}"
+                    ng-model="$ctrl.clientId"
+                    order="id">
+                    <tpl-item>
+                        #{{id}} - {{::name}}
+                    </tpl-item>
+                </vn-autocomplete>
+                <vn-autocomplete
+                    vn-one
+                    vn-id="cplusRectificationType"
+                    required="true"
+                    data="cplusRectificationTypes"
+                    show-field="description"
+                    value-field="id"
+                    ng-model="$ctrl.cplusRectificationType"
+                    search-function="{or: [{id: $search}, {description: {like: '%'+ $search +'%'}}]}"
+                    label="Rectificative type">
+                    <tpl-item>
+                        {{::description}}
+                    </tpl-item>
+                </vn-autocomplete>
+            </vn-horizontal>
+            <vn-horizontal>
+                <vn-autocomplete
+                    vn-one
+                    vn-id="siiTypeInvoiceOut"
+                    data="siiTypeInvoiceOuts"
+                    show-field="code"
+                    value-field="id"
+                    fields="['id','code','description']"
+                    required="true"
+                    ng-model="$ctrl.siiTypeInvoiceOut"
+                    label="Class">
+                    <tpl-item>
+                        {{::code}} - {{::description}}
+                    </tpl-item>
+                </vn-autocomplete>
+                <vn-autocomplete
+                    vn-one
+                    vn-id="invoiceCorrectionType"
+                    data="invoiceCorrectionTypes"
+                    ng-model="$ctrl.invoiceCorrectionType"
+                    show-field="description"
+                    value-field="id"
+                    required="true"
+                    label="Type">
+                </vn-autocomplete>
+            </vn-horizontal>
+        </section>
     </tpl-body>
     <tpl-buttons>
         <button response="accept" translate>Transfer client</button>
diff --git a/modules/invoiceOut/front/descriptor-menu/index.js b/modules/invoiceOut/front/descriptor-menu/index.js
index d3862a753..f9d436092 100644
--- a/modules/invoiceOut/front/descriptor-menu/index.js
+++ b/modules/invoiceOut/front/descriptor-menu/index.js
@@ -129,11 +129,11 @@ class Controller extends Section {
     transferInvoice() {
         const params = {
             id: this.invoiceOut.id,
-            ref: this.invoiceOut.ref,
-            newClientFk: this.invoiceOut.client.id,
-            cplusRectificationId: this.cplusRectificationType,
-            siiTypeInvoiceOutId: this.siiTypeInvoiceOut,
-            invoiceCorrectionTypeId: this.invoiceCorrectionType
+            refFk: this.invoiceOut.ref,
+            newClientFk: this.clientId,
+            cplusRectificationFk: this.cplusRectificationType,
+            siiTypeInvoiceOutFk: this.siiTypeInvoiceOut,
+            invoiceCorrectionTypeFk: this.invoiceCorrectionType
         };
         this.$http.post(`InvoiceOuts/transferInvoice`, params).then(res => {
             const invoiceId = res.data;
diff --git a/modules/invoiceOut/front/descriptor-menu/locale/es.yml b/modules/invoiceOut/front/descriptor-menu/locale/es.yml
index 0f74b5fec..9456646af 100644
--- a/modules/invoiceOut/front/descriptor-menu/locale/es.yml
+++ b/modules/invoiceOut/front/descriptor-menu/locale/es.yml
@@ -22,4 +22,4 @@ The email can't be empty: El correo no puede estar vacío
 The following refund tickets have been created: "Se han creado los siguientes tickets de abono: {{ticketIds}}"
 Refund...: Abono...
 Transfer invoice to...: Transferir factura a...
-Cplus Type: Cplus Tipo
+Rectificative type: Tipo rectificativa
diff --git a/modules/ticket/back/methods/sale/refund.js b/modules/ticket/back/methods/sale/refund.js
index 17b70f12b..a7831e7e3 100644
--- a/modules/ticket/back/methods/sale/refund.js
+++ b/modules/ticket/back/methods/sale/refund.js
@@ -19,7 +19,7 @@ module.exports = Self => {
             }
         ],
         returns: {
-            type: ['number'],
+            type: ['object'],
             root: true
         },
         http: {
@@ -54,7 +54,7 @@ module.exports = Self => {
 
             if (tx) await tx.commit();
 
-            return refundsTicket[0];
+            return refundsTicket;
         } catch (e) {
             if (tx) await tx.rollback();
             throw e;
diff --git a/modules/ticket/back/methods/ticket/invoiceTickets.js b/modules/ticket/back/methods/ticket/invoiceTickets.js
index fa3ee93af..29fb1769b 100644
--- a/modules/ticket/back/methods/ticket/invoiceTickets.js
+++ b/modules/ticket/back/methods/ticket/invoiceTickets.js
@@ -10,7 +10,13 @@ module.exports = function(Self) {
                 description: 'The tickets id',
                 type: ['number'],
                 required: true
+            },
+            {
+                arg: 'invoiceCorrection',
+                description: 'The invoice correction',
+                type: 'object',
             }
+
         ],
         returns: {
             type: ['object'],
@@ -22,7 +28,7 @@ module.exports = function(Self) {
         }
     });
 
-    Self.invoiceTickets = async(ctx, ticketsIds, options) => {
+    Self.invoiceTickets = async(ctx, ticketsIds, invoiceCorrection, options) => {
         const models = Self.app.models;
         const date = Date.vnNew();
         date.setHours(0, 0, 0, 0);
@@ -68,9 +74,9 @@ module.exports = function(Self) {
 
                 const addressIds = result.map(address => address.addressFk);
                 for (const address of addressIds)
-                    await createInvoice(ctx, companyId, ticketsIds, address, invoicesIds, myOptions);
+                    await createInvoice(ctx, companyId, ticketsIds, address, invoicesIds, invoiceCorrection, myOptions);
             } else
-                await createInvoice(ctx, companyId, ticketsIds, null, invoicesIds, myOptions);
+                await createInvoice(ctx, companyId, ticketsIds, null, invoicesIds, invoiceCorrection, myOptions);
 
             if (tx) await tx.commit();
         } catch (e) {
@@ -85,9 +91,9 @@ module.exports = function(Self) {
         return invoicesIds;
     };
 
-    async function createInvoice(ctx, companyId, ticketsIds, address, invoicesIds, myOptions) {
+    async function createInvoice(ctx, companyId, ticketsIds, address, invoicesIds, invoiceCorrection, myOptions) {
         const models = Self.app.models;
-
+        console.log(ticketsIds, address);
         await models.Ticket.rawSql(`
             CREATE OR REPLACE TEMPORARY TABLE tmp.ticketToInvoice
             (PRIMARY KEY  (id))
@@ -98,7 +104,8 @@ module.exports = function(Self) {
                         ${address ? `AND addressFk = ${address}` : ''}
         `, [ticketsIds], myOptions);
 
-        const invoiceId = await models.Ticket.makeInvoice(ctx, 'R', companyId, Date.vnNew(), myOptions);
+        const invoiceId =
+            await models.Ticket.makeInvoice(ctx, 'R', companyId, Date.vnNew(), invoiceCorrection, myOptions);
         invoicesIds.push(invoiceId);
     }
 };
diff --git a/modules/ticket/back/methods/ticket/makeInvoice.js b/modules/ticket/back/methods/ticket/makeInvoice.js
index e18e58e0b..9618e49e0 100644
--- a/modules/ticket/back/methods/ticket/makeInvoice.js
+++ b/modules/ticket/back/methods/ticket/makeInvoice.js
@@ -22,6 +22,11 @@ module.exports = function(Self) {
                 description: 'The invoice date',
                 type: 'date',
                 required: true
+            },
+            {
+                arg: 'invoiceCorrection',
+                description: 'The invoice correction',
+                type: 'object',
             }
         ],
         returns: {
@@ -34,7 +39,7 @@ module.exports = function(Self) {
         }
     });
 
-    Self.makeInvoice = async(ctx, invoiceType, companyFk, invoiceDate, options) => {
+    Self.makeInvoice = async(ctx, invoiceType, companyFk, invoiceDate, invoiceCorrection, options) => {
         const models = Self.app.models;
         invoiceDate.setHours(0, 0, 0, 0);
 
@@ -67,8 +72,8 @@ module.exports = function(Self) {
 
             const [firstTicket] = tickets;
             const clientId = firstTicket.clientFk;
-            const clientCanBeInvoiced = await models.Client.canBeInvoiced(clientId, companyFk, myOptions);
-            if (!clientCanBeInvoiced)
+            const clientCanBeInvoiced = await models.Client.canBeInvoiced(clientId, companyFk, invoiceCorrection, myOptions);
+            if (!clientCanBeInvoiced && !invoiceCorrection)
                 throw new UserError(`This client can't be invoiced`);
 
             const query = `SELECT vn.invoiceSerial(?, ?, ?) AS serial`;
@@ -85,6 +90,13 @@ module.exports = function(Self) {
             if (!resultInvoice)
                 throw new UserError('No tickets to invoice', 'notInvoiced');
 
+            if (invoiceCorrection) {
+                await models.InvoiceCorrection.create(
+                    Object.assign(invoiceCorrection, {correctingFk: resultInvoice.id}),
+                    myOptions
+                );
+            }
+
             if (serial != 'R' && resultInvoice.id)
                 await Self.rawSql('CALL invoiceOutBooking(?)', [resultInvoice.id], myOptions);
 
diff --git a/modules/ticket/back/methods/ticket/refund.js b/modules/ticket/back/methods/ticket/refund.js
index 758384ae2..4fed02260 100644
--- a/modules/ticket/back/methods/ticket/refund.js
+++ b/modules/ticket/back/methods/ticket/refund.js
@@ -15,7 +15,7 @@ module.exports = Self => {
             }
         ],
         returns: {
-            type: ['number'],
+            type: ['object'],
             root: true
         },
         http: {

From e634a5e2139d8f948d9478f668e12b7c97a5b884 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 30 Nov 2023 15:15:40 +0100
Subject: [PATCH 02/11] refs #5914 feat: create getTaxBases and use in
 negatives and positives procedures

---
 db/changes/235001/00-getTaxBases.sql          | 33 +++++++++++++++++++
 .../235001/01-newHasAnyPositiveBase.sql       | 28 ++++++++++++++++
 .../235001/01-refactorHasAnyNegativeBase.sql  | 28 ++++++++++++++++
 db/dump/fixtures.sql                          | 13 ++++----
 4 files changed, 96 insertions(+), 6 deletions(-)
 create mode 100644 db/changes/235001/00-getTaxBases.sql
 create mode 100644 db/changes/235001/01-newHasAnyPositiveBase.sql
 create mode 100644 db/changes/235001/01-refactorHasAnyNegativeBase.sql

diff --git a/db/changes/235001/00-getTaxBases.sql b/db/changes/235001/00-getTaxBases.sql
new file mode 100644
index 000000000..fa43c32f7
--- /dev/null
+++ b/db/changes/235001/00-getTaxBases.sql
@@ -0,0 +1,33 @@
+DELIMITER $$
+$$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`getTaxBases`()
+BEGIN
+
+/*	Calcula y devuelve en número de bases imponibles postivas y negativas
+*	Requiere la tabla temporal tmp.ticketToInvoice(id)
+*
+*	returns tmp.taxBases
+*/
+
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket
+		(KEY (ticketFk))
+		ENGINE = MEMORY
+		SELECT id ticketFk
+			FROM tmp.ticketToInvoice;
+
+	CALL ticket_getTax(NULL);
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.taxBases;
+	CREATE TEMPORARY TABLE tmp.taxBases
+		ENGINE = MEMORY
+		SELECT
+			    SUM(CASE WHEN taxableBase > 0 THEN 1 ELSE 0 END) as positive,
+				SUM(CASE WHEN taxableBase < 0 THEN 1 ELSE 0 END) as negative
+			FROM(
+				SELECT SUM(taxableBase) as taxableBase
+					FROM tmp.ticketTax
+					GROUP BY pgcFk
+				) t;
+
+END$$
+DELIMITER ;
diff --git a/db/changes/235001/01-newHasAnyPositiveBase.sql b/db/changes/235001/01-newHasAnyPositiveBase.sql
new file mode 100644
index 000000000..c9e7e8e05
--- /dev/null
+++ b/db/changes/235001/01-newHasAnyPositiveBase.sql
@@ -0,0 +1,28 @@
+DELIMITER $$
+$$
+CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`hasAnyPositiveBase`() RETURNS tinyint(1)
+    DETERMINISTIC
+BEGIN
+
+/*	Calcula si existe alguna base imponible positiva
+*	Requiere la tabla temporal tmp.ticketToInvoice(id) para getTaxBases()
+*
+*	returns BOOLEAN
+*/
+
+	DECLARE hasAnyPositiveBase BOOLEAN;
+
+    CALL getTaxBases();
+
+	SELECT positive > 0 INTO hasAnyPositiveBase
+        FROM tmp.taxBases;
+
+	DROP TEMPORARY TABLE
+        tmp.ticketTax,
+        tmp.ticket,
+        tmp.taxBases;
+
+	RETURN hasAnyPositiveBase;
+
+END$$
+DELIMITER ;
diff --git a/db/changes/235001/01-refactorHasAnyNegativeBase.sql b/db/changes/235001/01-refactorHasAnyNegativeBase.sql
new file mode 100644
index 000000000..b6780e280
--- /dev/null
+++ b/db/changes/235001/01-refactorHasAnyNegativeBase.sql
@@ -0,0 +1,28 @@
+DELIMITER $$
+$$
+CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`hasAnyNegativeBase`() RETURNS tinyint(1)
+    DETERMINISTIC
+BEGIN
+
+/*	Calcula si existe alguna base imponible negativa
+*	Requiere la tabla temporal tmp.ticketToInvoice(id) para getTaxBases()
+*
+*	returns BOOLEAN
+*/
+
+	DECLARE hasAnyNegativeBase BOOLEAN;
+
+    CALL getTaxBases();
+
+	SELECT negative > 0 INTO hasAnyNegativeBase
+        FROM tmp.taxBases;
+
+	DROP TEMPORARY TABLE
+        tmp.ticketTax,
+        tmp.ticket,
+        tmp.taxBases;
+
+	RETURN hasAnyNegativeBase;
+
+END$$
+DELIMITER ;
diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index 788487ed0..ed0a30d14 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -598,18 +598,19 @@ INSERT INTO `vn`.`taxArea` (`code`, `claveOperacionFactura`, `CodigoTransaccion`
 
 INSERT INTO `vn`.`invoiceOutSerial` (`code`, `description`, `isTaxed`, `taxAreaFk`, `isCEE`, `type`)
     VALUES
-        ('A', 'Global nacional',         1, 'NATIONAL',  0, 'global'),
-        ('T', 'Española rapida',         1, 'NATIONAL',  0, 'quick'),
-        ('V', 'Intracomunitaria global', 0, 'CEE',       1, 'global'),
-        ('M', 'Múltiple nacional',       1, 'NATIONAL',  0, 'quick'),
-        ('E', 'Exportación rápida',      0, 'WORLD',     0, 'quick');
+        ('A', 'Global nacional',            1, 'NATIONAL',  0,  'global'),
+        ('T', 'Española rapida',            1, 'NATIONAL',  0,  'quick'),
+        ('V', 'Intracomunitaria global',    0, 'CEE',       1,  'global'),
+        ('M', 'Múltiple nacional',          1, 'NATIONAL',  0,  'quick'),
+        ('R', 'Rectificativa',              1, 'NATIONAL',  0,   NULL),
+        ('E', 'Exportación rápida',         0, 'WORLD',     0,  'quick');
 
 INSERT INTO `vn`.`invoiceOut`(`id`, `serial`, `amount`, `issued`,`clientFk`, `created`, `companyFk`, `dued`, `booked`, `bankFk`, `hasPdf`)
     VALUES
         (1, 'T', 1026.24,   util.VN_CURDATE(),                              1101, util.VN_CURDATE(),                              442, util.VN_CURDATE(),                              util.VN_CURDATE(), 1, 0),
         (2, 'T', 121.36,    util.VN_CURDATE(),                              1102, util.VN_CURDATE(),                              442, util.VN_CURDATE(),                              util.VN_CURDATE(), 1, 0),
         (3, 'T', 8.88,      util.VN_CURDATE(),                              1103, util.VN_CURDATE(),                              442, util.VN_CURDATE(),                              util.VN_CURDATE(), 1, 0),
-        (4, 'T', 8.88,      util.VN_CURDATE(),                              1103, util.VN_CURDATE(),                              442, util.VN_CURDATE(),                              util.VN_CURDATE(), 1, 0),
+        (4, 'T', 8.88,      util.VN_CURDATE(),                              1104, util.VN_CURDATE(),                              442, util.VN_CURDATE(),                              util.VN_CURDATE(), 1, 0),
         (5, 'A', 8.88,      DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1103, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 442, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 0);
 
 UPDATE `vn`.`invoiceOut` SET ref = 'T1111111' WHERE id = 1;

From b2e7ea3089b24acfbc1dfbde612cbe7ee36940b5 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 30 Nov 2023 15:16:41 +0100
Subject: [PATCH 03/11] refs #5914 feat: make invoice support rectificative

---
 loopback/locale/es.json                       |  3 ++-
 .../back/methods/client/canBeInvoiced.js      |  2 +-
 .../back/methods/invoiceOut/invoiceClient.js  |  1 +
 .../invoiceOut/specs/transferinvoice.spec.js  | 23 +++++++++++-----
 .../methods/invoiceOut/transferInvoice.js     |  8 +++---
 .../invoiceOut/front/descriptor-menu/index.js |  2 +-
 .../back/methods/sale/specs/refund.spec.js    |  8 +++---
 .../back/methods/ticket/canBeInvoiced.js      | 16 ++++++++----
 .../back/methods/ticket/invoiceTickets.js     |  1 -
 .../ticket/back/methods/ticket/makeInvoice.js | 26 +++++++++++--------
 .../ticket/specs/canBeInvoiced.spec.js        |  8 +++---
 .../ticket/specs/invoiceTickets.spec.js       | 10 +++----
 .../methods/ticket/specs/makeInvoice.spec.js  |  4 +--
 modules/ticket/front/descriptor-menu/index.js |  2 +-
 .../front/descriptor-menu/index.spec.js       |  5 ++--
 modules/ticket/front/sale/index.js            |  2 +-
 modules/ticket/front/sale/index.spec.js       |  2 +-
 17 files changed, 72 insertions(+), 51 deletions(-)

diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 41acc36c3..71e0dc6af 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -328,5 +328,6 @@
 	"User disabled": "Usuario desactivado",
 	"The amount cannot be less than the minimum": "La cantidad no puede ser menor que la cantidad mínima",
 	"quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mínima",
-	"Cannot past travels with entries": "No se pueden pasar envíos con entradas"
+	"Cannot past travels with entries": "No se pueden pasar envíos con entradas",
+	"No tickets to invoice": "No hay tickets para facturar"
 }
diff --git a/modules/client/back/methods/client/canBeInvoiced.js b/modules/client/back/methods/client/canBeInvoiced.js
index 843e9549f..cdb865500 100644
--- a/modules/client/back/methods/client/canBeInvoiced.js
+++ b/modules/client/back/methods/client/canBeInvoiced.js
@@ -1,7 +1,7 @@
 const UserError = require('vn-loopback/util/user-error');
 
 module.exports = function(Self) {
-    Self.remoteMethodCtx('canBeInvoiced', {
+    Self.remoteMethod('canBeInvoiced', {
         description: 'Change property isEqualizated in all client addresses',
         accessType: 'READ',
         accepts: [
diff --git a/modules/invoiceOut/back/methods/invoiceOut/invoiceClient.js b/modules/invoiceOut/back/methods/invoiceOut/invoiceClient.js
index fa22dab1e..530b02353 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/invoiceClient.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/invoiceClient.js
@@ -80,6 +80,7 @@ module.exports = Self => {
                 invoiceType,
                 args.companyFk,
                 args.invoiceDate,
+                null,
                 options
             );
 
diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/transferinvoice.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/transferinvoice.spec.js
index dea4b6d00..b3bd17826 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/specs/transferinvoice.spec.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/specs/transferinvoice.spec.js
@@ -23,20 +23,29 @@ describe('InvoiceOut tranferInvoice()', () => {
         const tx = await models.InvoiceOut.beginTransaction({});
         const options = {transaction: tx};
         const args = {
-            id: '1',
+            id: '4',
             refFk: 'T4444444',
             newClientFk: 1,
-            cplusRectificationId: 1,
-            siiTypeInvoiceOutId: 1,
-            invoiceCorrectionTypeId: 1
+            cplusRectificationTypeFk: 1,
+            siiTypeInvoiceOutFk: 1,
+            invoiceCorrectionTypeFk: 1
         };
         ctx.args = args;
         try {
+            const {clientFk: oldClient} = await models.InvoiceOut.findById(args.id, {fields: ['clientFk']});
+            const invoicesBefore = await models.InvoiceOut.find({}, options);
             const result = await models.InvoiceOut.transferInvoice(
                 ctx,
                 options);
+            const invoicesAfter = await models.InvoiceOut.find({}, options);
+            const rectificativeInvoice = invoicesAfter[invoicesAfter.length - 2];
+            const newInvoice = invoicesAfter[invoicesAfter.length - 1];
 
             expect(result).toBeDefined();
+            expect(invoicesAfter.length - invoicesBefore.length).toEqual(2);
+            expect(rectificativeInvoice.clientFk).toEqual(oldClient);
+            expect(newInvoice.clientFk).toEqual(args.newClientFk);
+
             await tx.rollback();
         } catch (e) {
             await tx.rollback();
@@ -51,9 +60,9 @@ describe('InvoiceOut tranferInvoice()', () => {
             id: '1',
             refFk: 'T1111111',
             newClientFk: 1101,
-            cplusRectificationId: 1,
-            siiTypeInvoiceOutId: 1,
-            invoiceCorrectionTypeId: 1
+            cplusRectificationTypeFk: 1,
+            siiTypeInvoiceOutFk: 1,
+            invoiceCorrectionTypeFk: 1
         };
         ctx.args = args;
         try {
diff --git a/modules/invoiceOut/back/methods/invoiceOut/transferInvoice.js b/modules/invoiceOut/back/methods/invoiceOut/transferInvoice.js
index dcdd9b9b1..5f2428539 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/transferInvoice.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/transferInvoice.js
@@ -22,7 +22,7 @@ module.exports = Self => {
                 required: true
             },
             {
-                arg: 'cplusRectificationFk',
+                arg: 'cplusRectificationTypeFk',
                 type: 'number',
                 required: true
             },
@@ -50,7 +50,7 @@ module.exports = Self => {
     Self.transferInvoice = async(ctx, options) => {
         const models = Self.app.models;
         const myOptions = {userId: ctx.req.accessToken.userId};
-        const {id, refFk, newClientFk, cplusRectificationFk, siiTypeInvoiceOutFk, invoiceCorrectionTypeFk} = ctx.args;
+        const {id, refFk, newClientFk, cplusRectificationTypeFk, siiTypeInvoiceOutFk, invoiceCorrectionTypeFk} = ctx.args;
         let tx;
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -87,11 +87,11 @@ module.exports = Self => {
             }
 
             const invoiceCorrection =
-                {correctedFk: id, cplusRectificationFk, siiTypeInvoiceOutFk, invoiceCorrectionTypeFk};
+                {correctedFk: id, cplusRectificationTypeFk, siiTypeInvoiceOutFk, invoiceCorrectionTypeFk};
             const refundTicketIds = refundTickets.map(ticket => ticket.id);
 
             await models.Ticket.invoiceTickets(ctx, refundTicketIds, invoiceCorrection, myOptions);
-            const [[invoiceId]] = await models.Ticket.invoiceTickets(ctx, clonedTicketIds, myOptions);
+            const [invoiceId] = await models.Ticket.invoiceTickets(ctx, clonedTicketIds, null, myOptions);
 
             if (tx) {
                 await tx.commit();
diff --git a/modules/invoiceOut/front/descriptor-menu/index.js b/modules/invoiceOut/front/descriptor-menu/index.js
index f9d436092..aee323e39 100644
--- a/modules/invoiceOut/front/descriptor-menu/index.js
+++ b/modules/invoiceOut/front/descriptor-menu/index.js
@@ -131,7 +131,7 @@ class Controller extends Section {
             id: this.invoiceOut.id,
             refFk: this.invoiceOut.ref,
             newClientFk: this.clientId,
-            cplusRectificationFk: this.cplusRectificationType,
+            cplusRectificationTypeFk: this.cplusRectificationType,
             siiTypeInvoiceOutFk: this.siiTypeInvoiceOut,
             invoiceCorrectionTypeFk: this.invoiceCorrectionType
         };
diff --git a/modules/ticket/back/methods/sale/specs/refund.spec.js b/modules/ticket/back/methods/sale/specs/refund.spec.js
index 08eb1fabd..60f77e90c 100644
--- a/modules/ticket/back/methods/sale/specs/refund.spec.js
+++ b/modules/ticket/back/methods/sale/specs/refund.spec.js
@@ -23,9 +23,9 @@ describe('Sale refund()', () => {
         try {
             const options = {transaction: tx};
 
-            const refundedTicket = await models.Sale.refund(ctx, salesIds, servicesIds, withWarehouse, options);
+            const refundedTickets = await models.Sale.refund(ctx, salesIds, servicesIds, withWarehouse, options);
 
-            expect(refundedTicket).toBeDefined();
+            expect(refundedTickets).toBeDefined();
 
             await tx.rollback();
         } catch (e) {
@@ -42,11 +42,11 @@ describe('Sale refund()', () => {
             const options = {transaction: tx};
             const ticketsBefore = await models.Ticket.find({}, options);
 
-            const ticket = await models.Sale.refund(ctx, salesIds, servicesIds, withWarehouse, options);
+            const tickets = await models.Sale.refund(ctx, salesIds, servicesIds, withWarehouse, options);
 
             const refundedTicket = await models.Ticket.findOne({
                 where: {
-                    id: ticket.id
+                    id: tickets[0].id
                 },
                 include: [
                     {
diff --git a/modules/ticket/back/methods/ticket/canBeInvoiced.js b/modules/ticket/back/methods/ticket/canBeInvoiced.js
index 348f02348..fe7223c17 100644
--- a/modules/ticket/back/methods/ticket/canBeInvoiced.js
+++ b/modules/ticket/back/methods/ticket/canBeInvoiced.js
@@ -10,6 +10,11 @@ module.exports = function(Self) {
                 description: 'The tickets id',
                 type: ['number'],
                 required: true
+            },
+            {
+                arg: 'isRectificative',
+                description: 'If it is rectificative',
+                type: 'boolean'
             }
         ],
         returns: {
@@ -23,7 +28,7 @@ module.exports = function(Self) {
         }
     });
 
-    Self.canBeInvoiced = async(ctx, ticketsIds, options) => {
+    Self.canBeInvoiced = async(ctx, ticketsIds, isRectificative, options) => {
         const myOptions = {};
         const $t = ctx.req.__; // $translate
 
@@ -48,10 +53,11 @@ module.exports = function(Self) {
         const [supplierCompany] = await Self.rawSql(query, [companyFk], options);
 
         const isSpanishCompany = supplierCompany?.isSpanishCompany;
-
-        const [result] = await Self.rawSql('SELECT hasAnyNegativeBase() AS base', null, options);
-        const hasAnyNegativeBase = result?.base && isSpanishCompany;
-        if (hasAnyNegativeBase)
+        const taxBaseFunction = isRectificative ? 'hasAnyPositiveBase' : 'hasAnyNegativeBase';
+        const [result] =
+            await Self.rawSql(`SELECT ?() AS hasBasesProblem`, [taxBaseFunction], options);
+        const hasAnyIncorrectBase = result?.hasBasesProblem && isSpanishCompany;
+        if (hasAnyIncorrectBase)
             throw new UserError($t('Negative basis of tickets', {ticketsIds: ticketsIds}));
 
         const today = Date.vnNew();
diff --git a/modules/ticket/back/methods/ticket/invoiceTickets.js b/modules/ticket/back/methods/ticket/invoiceTickets.js
index 29fb1769b..212f6556a 100644
--- a/modules/ticket/back/methods/ticket/invoiceTickets.js
+++ b/modules/ticket/back/methods/ticket/invoiceTickets.js
@@ -93,7 +93,6 @@ module.exports = function(Self) {
 
     async function createInvoice(ctx, companyId, ticketsIds, address, invoicesIds, invoiceCorrection, myOptions) {
         const models = Self.app.models;
-        console.log(ticketsIds, address);
         await models.Ticket.rawSql(`
             CREATE OR REPLACE TEMPORARY TABLE tmp.ticketToInvoice
             (PRIMARY KEY  (id))
diff --git a/modules/ticket/back/methods/ticket/makeInvoice.js b/modules/ticket/back/methods/ticket/makeInvoice.js
index 6f1586c2b..fe7e527c8 100644
--- a/modules/ticket/back/methods/ticket/makeInvoice.js
+++ b/modules/ticket/back/methods/ticket/makeInvoice.js
@@ -67,20 +67,24 @@ module.exports = function(Self) {
                 fields: ['id', 'clientFk', 'addressFk']
             }, myOptions);
 
-            await models.Ticket.canBeInvoiced(ctx, ticketsIds, myOptions);
+            await models.Ticket.canBeInvoiced(ctx, ticketsIds, !!invoiceCorrection, myOptions);
 
             const [firstTicket] = tickets;
             const clientId = firstTicket.clientFk;
-            const clientCanBeInvoiced = await models.Client.canBeInvoiced(clientId, companyFk, invoiceCorrection, myOptions);
-            if (!clientCanBeInvoiced && !invoiceCorrection)
+            const clientCanBeInvoiced =
+                await models.Client.canBeInvoiced(clientId, companyFk, myOptions);
+
+            if (!clientCanBeInvoiced)
                 throw new UserError(`This client can't be invoiced`);
 
-            const query = `SELECT vn.invoiceSerial(?, ?, ?) AS serial`;
-            const [{serial}] = await Self.rawSql(query, [
-                clientId,
-                companyFk,
-                invoiceType,
-            ], myOptions);
+            const [{serial}] = invoiceCorrection ? [{serial: 'R'}] : await Self.rawSql(
+                `SELECT vn.invoiceSerial(?, ?, ?) AS serial`,
+                [
+                    clientId,
+                    companyFk,
+                    invoiceType
+                ],
+                myOptions);
 
             const invoiceOutSerial = await models.InvoiceOutSerial.findById(serial);
             if (invoiceOutSerial?.taxAreaFk == 'WORLD') {
@@ -92,7 +96,7 @@ module.exports = function(Self) {
             await Self.rawSql('CALL invoiceOut_new(?, ?, null, @invoiceId)', [serial, invoiceDate], myOptions);
 
             const [resultInvoice] = await Self.rawSql('SELECT @invoiceId id', [], myOptions);
-            if (!resultInvoice)
+            if (!resultInvoice?.id)
                 throw new UserError('No tickets to invoice', 'notInvoiced');
 
             if (invoiceCorrection) {
@@ -102,7 +106,7 @@ module.exports = function(Self) {
                 );
             }
 
-            if (serial != 'R' && resultInvoice.id)
+            if (resultInvoice.id) // serial != 'R' &&
                 await Self.rawSql('CALL invoiceOutBooking(?)', [resultInvoice.id], myOptions);
 
             if (tx) await tx.commit();
diff --git a/modules/ticket/back/methods/ticket/specs/canBeInvoiced.spec.js b/modules/ticket/back/methods/ticket/specs/canBeInvoiced.spec.js
index 538dbc49f..e443ed6d3 100644
--- a/modules/ticket/back/methods/ticket/specs/canBeInvoiced.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/canBeInvoiced.spec.js
@@ -27,7 +27,7 @@ describe('ticket canBeInvoiced()', () => {
                         WHERE id IN (?)
             `, [ticketId], options);
 
-            const canBeInvoiced = await models.Ticket.canBeInvoiced(ctx, [ticketId], options);
+            const canBeInvoiced = await models.Ticket.canBeInvoiced(ctx, [ticketId], false, options);
 
             expect(canBeInvoiced).toEqual(false);
 
@@ -59,7 +59,7 @@ describe('ticket canBeInvoiced()', () => {
                         WHERE id IN (?)
             `, [ticketId], options);
 
-            const canBeInvoiced = await models.Ticket.canBeInvoiced(ctx, [ticketId], options);
+            const canBeInvoiced = await models.Ticket.canBeInvoiced(ctx, [ticketId], false, options);
 
             expect(canBeInvoiced).toEqual(false);
 
@@ -95,7 +95,7 @@ describe('ticket canBeInvoiced()', () => {
                         WHERE id IN (?)
             `, [ticketId], options);
 
-            const canBeInvoiced = await models.Ticket.canBeInvoiced(ctx, [ticketId], options);
+            const canBeInvoiced = await models.Ticket.canBeInvoiced(ctx, [ticketId], false, options);
 
             expect(canBeInvoiced).toEqual(false);
 
@@ -123,7 +123,7 @@ describe('ticket canBeInvoiced()', () => {
                         WHERE id IN (?)
             `, [ticketId], options);
 
-            const canBeInvoiced = await models.Ticket.canBeInvoiced(ctx, [ticketId], options);
+            const canBeInvoiced = await models.Ticket.canBeInvoiced(ctx, [ticketId], false, options);
 
             expect(canBeInvoiced).toEqual(true);
 
diff --git a/modules/ticket/back/methods/ticket/specs/invoiceTickets.spec.js b/modules/ticket/back/methods/ticket/specs/invoiceTickets.spec.js
index 8971fb24a..162dc066a 100644
--- a/modules/ticket/back/methods/ticket/specs/invoiceTickets.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/invoiceTickets.spec.js
@@ -31,7 +31,7 @@ describe('ticket invoiceTickets()', () => {
             const options = {transaction: tx};
 
             const ticketsIds = [11, 16];
-            await models.Ticket.invoiceTickets(ctx, ticketsIds, options);
+            await models.Ticket.invoiceTickets(ctx, ticketsIds, null, options);
 
             await tx.rollback();
         } catch (e) {
@@ -57,7 +57,7 @@ describe('ticket invoiceTickets()', () => {
             await client.updateAttribute('isTaxDataChecked', false, options);
 
             const ticketsIds = [11];
-            await models.Ticket.invoiceTickets(ctx, ticketsIds, options);
+            await models.Ticket.invoiceTickets(ctx, ticketsIds, null, options);
 
             await tx.rollback();
         } catch (e) {
@@ -80,8 +80,8 @@ describe('ticket invoiceTickets()', () => {
             const options = {transaction: tx};
 
             const ticketsIds = [11];
-            await models.Ticket.invoiceTickets(ctx, ticketsIds, options);
-            await models.Ticket.invoiceTickets(ctx, ticketsIds, options);
+            await models.Ticket.invoiceTickets(ctx, ticketsIds, null, options);
+            await models.Ticket.invoiceTickets(ctx, ticketsIds, null, options);
 
             await tx.rollback();
         } catch (e) {
@@ -102,7 +102,7 @@ describe('ticket invoiceTickets()', () => {
             const options = {transaction: tx};
 
             const ticketsIds = [11];
-            const invoicesIds = await models.Ticket.invoiceTickets(ctx, ticketsIds, options);
+            const invoicesIds = await models.Ticket.invoiceTickets(ctx, ticketsIds, null, options);
 
             expect(invoicesIds.length).toBeGreaterThan(0);
 
diff --git a/modules/ticket/back/methods/ticket/specs/makeInvoice.spec.js b/modules/ticket/back/methods/ticket/specs/makeInvoice.spec.js
index 9b1fd8f6f..456303602 100644
--- a/modules/ticket/back/methods/ticket/specs/makeInvoice.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/makeInvoice.spec.js
@@ -42,7 +42,7 @@ describe('ticket makeInvoice()', () => {
                         WHERE id IN (?)
             `, [ticketsIds], options);
 
-            const invoiceId = await models.Ticket.makeInvoice(ctx, invoiceType, companyFk, invoiceDate, options);
+            const invoiceId = await models.Ticket.makeInvoice(ctx, invoiceType, companyFk, invoiceDate, null, options);
 
             expect(invoiceId).toBeDefined();
 
@@ -70,7 +70,7 @@ describe('ticket makeInvoice()', () => {
                         WHERE id IN (?)
             `, [ticketsId], options);
 
-            await models.Ticket.makeInvoice(ctx, invoiceType, companyFk, invoiceDate, options);
+            await models.Ticket.makeInvoice(ctx, invoiceType, companyFk, invoiceDate, null, options);
             await tx.rollback();
         } catch (e) {
             error = e;
diff --git a/modules/ticket/front/descriptor-menu/index.js b/modules/ticket/front/descriptor-menu/index.js
index 18db8c147..cd819e623 100644
--- a/modules/ticket/front/descriptor-menu/index.js
+++ b/modules/ticket/front/descriptor-menu/index.js
@@ -292,7 +292,7 @@ class Controller extends Section {
         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
                 }));
diff --git a/modules/ticket/front/descriptor-menu/index.spec.js b/modules/ticket/front/descriptor-menu/index.spec.js
index 1bb270165..c755b14c3 100644
--- a/modules/ticket/front/descriptor-menu/index.spec.js
+++ b/modules/ticket/front/descriptor-menu/index.spec.js
@@ -262,11 +262,12 @@ describe('Ticket Component vnTicketDescriptorMenu', () => {
             const params = {
                 ticketsIds: [16]
             };
-            $httpBackend.expectPOST('Tickets/refund', params).respond({id: 99});
+            const response = {id: 99};
+            $httpBackend.expectPOST('Tickets/refund', params).respond([response]);
             controller.refund();
             $httpBackend.flush();
 
-            expect(controller.$state.go).toHaveBeenCalledWith('ticket.card.sale', {id: 99});
+            expect(controller.$state.go).toHaveBeenCalledWith('ticket.card.sale', response);
         });
     });
 
diff --git a/modules/ticket/front/sale/index.js b/modules/ticket/front/sale/index.js
index 4f6a9e757..ed6d9b10a 100644
--- a/modules/ticket/front/sale/index.js
+++ b/modules/ticket/front/sale/index.js
@@ -526,7 +526,7 @@ class Controller extends Section {
         const params = {salesIds: salesIds, withWarehouse: withWarehouse};
         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
             }));
diff --git a/modules/ticket/front/sale/index.spec.js b/modules/ticket/front/sale/index.spec.js
index 70781eb58..36be32f52 100644
--- a/modules/ticket/front/sale/index.spec.js
+++ b/modules/ticket/front/sale/index.spec.js
@@ -729,7 +729,7 @@ describe('Ticket', () => {
                     salesIds: [1, 4],
                 };
                 const refundTicket = {id: 99};
-                $httpBackend.expect('POST', 'Sales/refund', params).respond(200, refundTicket);
+                $httpBackend.expect('POST', 'Sales/refund', params).respond(200, [refundTicket]);
                 controller.createRefund();
                 $httpBackend.flush();
 

From ec66386b442a292329819041dca82b2c2677b2b6 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 11 Dec 2023 07:49:44 +0100
Subject: [PATCH 04/11] refs #5914 fix: correct sql folder

---
 db/changes/{235001 => 235201}/00-getTaxBases.sql                | 0
 db/changes/{235001 => 235201}/01-newHasAnyPositiveBase.sql      | 0
 db/changes/{235001 => 235201}/01-refactorHasAnyNegativeBase.sql | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename db/changes/{235001 => 235201}/00-getTaxBases.sql (100%)
 rename db/changes/{235001 => 235201}/01-newHasAnyPositiveBase.sql (100%)
 rename db/changes/{235001 => 235201}/01-refactorHasAnyNegativeBase.sql (100%)

diff --git a/db/changes/235001/00-getTaxBases.sql b/db/changes/235201/00-getTaxBases.sql
similarity index 100%
rename from db/changes/235001/00-getTaxBases.sql
rename to db/changes/235201/00-getTaxBases.sql
diff --git a/db/changes/235001/01-newHasAnyPositiveBase.sql b/db/changes/235201/01-newHasAnyPositiveBase.sql
similarity index 100%
rename from db/changes/235001/01-newHasAnyPositiveBase.sql
rename to db/changes/235201/01-newHasAnyPositiveBase.sql
diff --git a/db/changes/235001/01-refactorHasAnyNegativeBase.sql b/db/changes/235201/01-refactorHasAnyNegativeBase.sql
similarity index 100%
rename from db/changes/235001/01-refactorHasAnyNegativeBase.sql
rename to db/changes/235201/01-refactorHasAnyNegativeBase.sql

From 21a1dbeae7fe4a9d9fe75ef910efbdb0fd023dde Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 14 Dec 2023 15:56:49 +0100
Subject: [PATCH 05/11] refs #5914 fix: ticket canBeInvoiced and optimized
 invoiceTickets

---
 .../235201/01-refactorHasAnyNegativeBase.sql  |  1 +
 db/dump/fixtures.sql                          |  2 +-
 e2e/paths/05-ticket/18_index_payout.spec.js   |  2 +-
 e2e/paths/09-invoice-out/01_summary.spec.js   |  4 +--
 loopback/locale/en.json                       |  6 ++--
 loopback/locale/es.json                       |  9 +++--
 .../methods/client/specs/consumption.spec.js  |  4 +--
 .../invoiceOut/specs/transferinvoice.spec.js  | 26 ++++++++++++++-
 .../front/descriptor-menu/index.html          |  2 +-
 .../invoiceOut/front/index/manual/index.html  |  1 +
 .../back/methods/ticket/canBeInvoiced.js      | 23 +++----------
 .../back/methods/ticket/invoiceTickets.js     | 33 ++++++++-----------
 .../ticket/back/methods/ticket/makeInvoice.js |  2 +-
 13 files changed, 64 insertions(+), 51 deletions(-)

diff --git a/db/changes/235201/01-refactorHasAnyNegativeBase.sql b/db/changes/235201/01-refactorHasAnyNegativeBase.sql
index b6780e280..65822fc95 100644
--- a/db/changes/235201/01-refactorHasAnyNegativeBase.sql
+++ b/db/changes/235201/01-refactorHasAnyNegativeBase.sql
@@ -26,3 +26,4 @@ BEGIN
 
 END$$
 DELIMITER ;
+
diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index 874e42787..127bf5ef0 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -720,7 +720,7 @@ INSERT INTO `vn`.`route`(`id`, `time`, `workerFk`, `created`, `vehicleFk`, `agen
 INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeFk`, `shipped`, `landed`, `clientFk`,`nickname`, `addressFk`, `refFk`, `isDeleted`, `zoneFk`, `zonePrice`, `zoneBonus`, `created`, `weight`)
     VALUES
         (1 , 3,     1,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Bat cave',                                      121, NULL,     0, 1,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),      1),
-        (2 , 1,     1,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower',                                   124, NULL,     0, 1,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),      2),
+        (2 , 1,     1,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Bat cave',                                      1,   NULL,     0, 1,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),      2),
         (3 , 1,     7,  1, 6,       DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -2 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower',                                   124, NULL,     0, 3,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH),      NULL),
         (4 , 3,     2,  1, 2,       DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -3 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower',                                   124, NULL,     0, 9,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH),      NULL),
         (5 , 3,     3,  3, 3,       DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -4 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower',                                   124, NULL,     0, 10,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH),      NULL),
diff --git a/e2e/paths/05-ticket/18_index_payout.spec.js b/e2e/paths/05-ticket/18_index_payout.spec.js
index 7e5201d11..9c5518424 100644
--- a/e2e/paths/05-ticket/18_index_payout.spec.js
+++ b/e2e/paths/05-ticket/18_index_payout.spec.js
@@ -35,7 +35,7 @@ describe('Ticket index payout path', () => {
         await page.waitToClick(selectors.ticketsIndex.openAdvancedSearchButton);
         await page.write(selectors.ticketsIndex.advancedSearchClient, '1101');
         await page.keyboard.press('Enter');
-        await page.waitForNumberOfElements(selectors.ticketsIndex.anySearchResult, 9);
+        await page.waitForNumberOfElements(selectors.ticketsIndex.anySearchResult, 10);
         await page.waitToClick(selectors.ticketsIndex.firstTicketCheckbox);
         await page.waitToClick(selectors.ticketsIndex.secondTicketCheckbox);
 
diff --git a/e2e/paths/09-invoice-out/01_summary.spec.js b/e2e/paths/09-invoice-out/01_summary.spec.js
index 728f0130a..09ac66ffc 100644
--- a/e2e/paths/09-invoice-out/01_summary.spec.js
+++ b/e2e/paths/09-invoice-out/01_summary.spec.js
@@ -28,7 +28,6 @@ describe('InvoiceOut summary path', () => {
 
     it('should contain the tax breakdown', async() => {
         const firstTax = await page.waitToGetProperty(selectors.invoiceOutSummary.taxOne, 'innerText');
-
         const secondTax = await page.waitToGetProperty(selectors.invoiceOutSummary.taxTwo, 'innerText');
 
         expect(firstTax).toContain('10%');
@@ -37,10 +36,9 @@ describe('InvoiceOut summary path', () => {
 
     it('should contain the tickets info', async() => {
         const firstTicket = await page.waitToGetProperty(selectors.invoiceOutSummary.ticketOne, 'innerText');
-
         const secondTicket = await page.waitToGetProperty(selectors.invoiceOutSummary.ticketTwo, 'innerText');
 
         expect(firstTicket).toContain('Bat cave');
-        expect(secondTicket).toContain('Stark tower');
+        expect(secondTicket).toContain('Bat cave');
     });
 });
diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index 7d5b5ed47..962e1ea13 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -45,6 +45,7 @@
 	"Extension format is invalid": "Extension format is invalid",
 	"NO_ZONE_FOR_THIS_PARAMETERS": "NO_ZONE_FOR_THIS_PARAMETERS",
 	"This client can't be invoiced": "This client can't be invoiced",
+	"You must provide the correction information to generate a corrective invoice": "You must provide the correction information to generate a corrective invoice",
 	"The introduced hour already exists": "The introduced hour already exists",
 	"Invalid parameters to create a new ticket": "Invalid parameters to create a new ticket",
 	"Concept cannot be blank": "Concept cannot be blank",
@@ -178,7 +179,8 @@
 	"The renew period has not been exceeded": "The renew period has not been exceeded",
 	"You can not use the same password": "You can not use the same password",
 	"Valid priorities": "Valid priorities: %d",
-	"Negative basis of tickets": "Negative basis of tickets: {{ticketsIds}}",
+	"hasAnyNegativeBase": "Negative basis of tickets: {{ticketsIds}}",
+	"hasAnyPositiveBase": "Positive basis of tickets: {{ticketsIds}}",
 	"This ticket cannot be left empty.": "This ticket cannot be left empty. %s",
 	"Social name should be uppercase": "Social name should be uppercase",
 	"Street should be uppercase": "Street should be uppercase",
@@ -201,4 +203,4 @@
 	"keepPrice": "keepPrice",
 	"Cannot past travels with entries": "Cannot past travels with entries",
 	"It was not able to remove the next expeditions:": "It was not able to remove the next expeditions: {{expeditions}}"
-}
\ No newline at end of file
+}
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index e544be0e6..0c2ad3238 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -72,6 +72,7 @@
 	"The secret can't be blank": "La contraseña no puede estar en blanco",
 	"We weren't able to send this SMS": "No hemos podido enviar el SMS",
 	"This client can't be invoiced": "Este cliente no puede ser facturado",
+    "You must provide the correction information to generate a corrective invoice": "Debes informar la información de corrección para generar una factura rectificativa",
 	"This ticket can't be invoiced": "Este ticket no puede ser facturado",
 	"You cannot add or modify services to an invoiced ticket": "No puedes añadir o modificar servicios a un ticket facturado",
 	"This ticket can not be modified": "Este ticket no puede ser modificado",
@@ -305,7 +306,8 @@
 	"Mail not sent": "Se ha producido un fallo al enviar la factura al cliente [{{clientId}}]({{{clientUrl}}}), por favor revisa la dirección de correo electrónico",
 	"The renew period has not been exceeded": "El periodo de renovación no ha sido superado",
 	"Valid priorities": "Prioridades válidas: %d",
-	"Negative basis of tickets": "Base negativa para los tickets: {{ticketsIds}}",
+	"hasAnyNegativeBase": "Base negativa para los tickets: {{ticketsIds}}",
+	"hasAnyPositiveBase": "Base positivas para los tickets: {{ticketsIds}}",
 	"You cannot assign an alias that you are not assigned to": "No puede asignar un alias que no tenga asignado",
 	"This ticket cannot be left empty.": "Este ticket no se puede dejar vacío. %s",
 	"The company has not informed the supplier account for bank transfers": "La empresa no tiene informado la cuenta de proveedor para transferencias bancarias",
@@ -330,5 +332,8 @@
 	"quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mínima",
 	"Cannot past travels with entries": "No se pueden pasar envíos con entradas",
 	"No tickets to invoice": "No hay tickets para facturar",
-	"It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}"
+	"It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}",
+	"Base negativa para los tickets: 39": "Base negativa para los tickets: 39",
+	"Base negativa para los tickets: 41": "Base negativa para los tickets: 41",
+	"keepPrice": "keepPrice"
 }
diff --git a/modules/client/back/methods/client/specs/consumption.spec.js b/modules/client/back/methods/client/specs/consumption.spec.js
index 47a495d79..85dbb7422 100644
--- a/modules/client/back/methods/client/specs/consumption.spec.js
+++ b/modules/client/back/methods/client/specs/consumption.spec.js
@@ -16,7 +16,7 @@ describe('client consumption() filter', () => {
             };
             const result = await models.Client.consumption(ctx, filter, options);
 
-            expect(result.length).toEqual(10);
+            expect(result.length).toEqual(11);
 
             await tx.rollback();
         } catch (e) {
@@ -49,7 +49,7 @@ describe('client consumption() filter', () => {
             const thirdRow = result[2];
 
             expect(result.length).toEqual(3);
-            expect(firstRow.quantity).toEqual(10);
+            expect(firstRow.quantity).toEqual(11);
             expect(secondRow.quantity).toEqual(15);
             expect(thirdRow.quantity).toEqual(20);
 
diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/transferinvoice.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/transferinvoice.spec.js
index b3bd17826..11575999a 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/specs/transferinvoice.spec.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/specs/transferinvoice.spec.js
@@ -2,7 +2,7 @@
 const models = require('vn-loopback/server/server').models;
 const LoopBackContext = require('loopback-context');
 
-describe('InvoiceOut tranferInvoice()', () => {
+describe('InvoiceOut transferInvoice()', () => {
     const activeCtx = {
         accessToken: {userId: 5},
         http: {
@@ -69,9 +69,33 @@ describe('InvoiceOut tranferInvoice()', () => {
             await models.InvoiceOut.transferInvoice(
                 ctx,
                 options);
+            await tx.rollback();
         } catch (e) {
             expect(e.message).toBe(`Select a different client`);
             await tx.rollback();
         }
     });
+
+    it('should throw an UserError when it is refund', async() => {
+        const tx = await models.InvoiceOut.beginTransaction({});
+        const options = {transaction: tx};
+        const args = {
+            id: '1',
+            refFk: 'T1111111',
+            newClientFk: 1102,
+            cplusRectificationTypeFk: 1,
+            siiTypeInvoiceOutFk: 1,
+            invoiceCorrectionTypeFk: 1
+        };
+        ctx.args = args;
+        try {
+            await models.InvoiceOut.transferInvoice(
+                ctx,
+                options);
+            await tx.rollback();
+        } catch (e) {
+            expect(e.message).toContain(`This ticket is already a refund`);
+            await tx.rollback();
+        }
+    });
 });
diff --git a/modules/invoiceOut/front/descriptor-menu/index.html b/modules/invoiceOut/front/descriptor-menu/index.html
index 267aa0b15..435db3612 100644
--- a/modules/invoiceOut/front/descriptor-menu/index.html
+++ b/modules/invoiceOut/front/descriptor-menu/index.html
@@ -227,7 +227,7 @@
                     vn-one
                     vn-id="siiTypeInvoiceOut"
                     data="siiTypeInvoiceOuts"
-                    show-field="code"
+                    show-field="description"
                     value-field="id"
                     fields="['id','code','description']"
                     required="true"
diff --git a/modules/invoiceOut/front/index/manual/index.html b/modules/invoiceOut/front/index/manual/index.html
index c3362a319..5872911e4 100644
--- a/modules/invoiceOut/front/index/manual/index.html
+++ b/modules/invoiceOut/front/index/manual/index.html
@@ -6,6 +6,7 @@
         auto-load="true"
         url="InvoiceOutSerials"
         data="invoiceOutSerials"
+        where="{code: {neq: 'R'}}"
         order="code">
     </vn-crud-model>
     <vn-crud-model
diff --git a/modules/ticket/back/methods/ticket/canBeInvoiced.js b/modules/ticket/back/methods/ticket/canBeInvoiced.js
index fe7223c17..75d13a508 100644
--- a/modules/ticket/back/methods/ticket/canBeInvoiced.js
+++ b/modules/ticket/back/methods/ticket/canBeInvoiced.js
@@ -39,27 +39,14 @@ module.exports = function(Self) {
             where: {
                 id: {inq: ticketsIds}
             },
-            fields: ['id', 'refFk', 'shipped', 'totalWithVat', 'companyFk']
+            fields: ['id', 'refFk', 'shipped', 'totalWithVat']
         }, myOptions);
-        const [firstTicket] = tickets;
-        const companyFk = firstTicket.companyFk;
 
-        const query =
-                `SELECT COUNT(*) isSpanishCompany
-                    FROM supplier s
-                        JOIN country c ON c.id = s.countryFk
-                            AND c.code = 'ES'
-                    WHERE s.id = ?`;
-        const [supplierCompany] = await Self.rawSql(query, [companyFk], options);
-
-        const isSpanishCompany = supplierCompany?.isSpanishCompany;
         const taxBaseFunction = isRectificative ? 'hasAnyPositiveBase' : 'hasAnyNegativeBase';
-        const [result] =
-            await Self.rawSql(`SELECT ?() AS hasBasesProblem`, [taxBaseFunction], options);
-        const hasAnyIncorrectBase = result?.hasBasesProblem && isSpanishCompany;
-        if (hasAnyIncorrectBase)
-            throw new UserError($t('Negative basis of tickets', {ticketsIds: ticketsIds}));
-
+        const [hasAnyIncorrectBase] =
+            await Self.rawSql(`SELECT ${taxBaseFunction}() AS hasBasesProblem`, null, options);
+        if (hasAnyIncorrectBase?.hasBasesProblem)
+            throw new UserError($t(taxBaseFunction, {ticketsIds: ticketsIds}));
         const today = Date.vnNew();
 
         tickets.some(ticket => {
diff --git a/modules/ticket/back/methods/ticket/invoiceTickets.js b/modules/ticket/back/methods/ticket/invoiceTickets.js
index 212f6556a..f1793773b 100644
--- a/modules/ticket/back/methods/ticket/invoiceTickets.js
+++ b/modules/ticket/back/methods/ticket/invoiceTickets.js
@@ -47,10 +47,10 @@ module.exports = function(Self) {
         let invoicesIds = [];
         try {
             const tickets = await models.Ticket.find({
+                fields: ['id', 'clientFk', 'companyFk', 'addressFk'],
                 where: {
                     id: {inq: ticketsIds}
-                },
-                fields: ['id', 'clientFk', 'companyFk']
+                }
             }, myOptions);
 
             const [firstTicket] = tickets;
@@ -65,18 +65,17 @@ module.exports = function(Self) {
                 fields: ['id', 'hasToInvoiceByAddress']
             }, myOptions);
 
+            let ticketsByAddress = {[firstTicket.addressFk]: ticketsIds};
             if (client.hasToInvoiceByAddress) {
-                const query = `
-                    SELECT DISTINCT addressFk
-                        FROM ticket t
-                        WHERE id IN (?)`;
-                const result = await Self.rawSql(query, [ticketsIds], myOptions);
-
-                const addressIds = result.map(address => address.addressFk);
-                for (const address of addressIds)
-                    await createInvoice(ctx, companyId, ticketsIds, address, invoicesIds, invoiceCorrection, myOptions);
-            } else
-                await createInvoice(ctx, companyId, ticketsIds, null, invoicesIds, invoiceCorrection, myOptions);
+                ticketsByAddress = tickets.reduce((group, ticket) => {
+                    const {addressFk} = ticket;
+                    group[addressFk] = group[addressFk] ?? [];
+                    group[addressFk].push(ticket.id);
+                    return group;
+                }, {});
+            }
+            for (const ticketIds of Object.values(ticketsByAddress))
+                invoicesIds.push(await createInvoice(ctx, companyId, ticketIds, invoiceCorrection, myOptions));
 
             if (tx) await tx.commit();
         } catch (e) {
@@ -91,7 +90,7 @@ module.exports = function(Self) {
         return invoicesIds;
     };
 
-    async function createInvoice(ctx, companyId, ticketsIds, address, invoicesIds, invoiceCorrection, myOptions) {
+    async function createInvoice(ctx, companyId, ticketsIds, invoiceCorrection, myOptions) {
         const models = Self.app.models;
         await models.Ticket.rawSql(`
             CREATE OR REPLACE TEMPORARY TABLE tmp.ticketToInvoice
@@ -100,12 +99,8 @@ module.exports = function(Self) {
                 SELECT id
                     FROM vn.ticket
                     WHERE id IN (?)
-                        ${address ? `AND addressFk = ${address}` : ''}
         `, [ticketsIds], myOptions);
-
-        const invoiceId =
-            await models.Ticket.makeInvoice(ctx, 'R', companyId, Date.vnNew(), invoiceCorrection, myOptions);
-        invoicesIds.push(invoiceId);
+        return models.Ticket.makeInvoice(ctx, 'R', companyId, Date.vnNew(), invoiceCorrection, myOptions);
     }
 };
 
diff --git a/modules/ticket/back/methods/ticket/makeInvoice.js b/modules/ticket/back/methods/ticket/makeInvoice.js
index fe7e527c8..32aa03f9d 100644
--- a/modules/ticket/back/methods/ticket/makeInvoice.js
+++ b/modules/ticket/back/methods/ticket/makeInvoice.js
@@ -106,7 +106,7 @@ module.exports = function(Self) {
                 );
             }
 
-            if (resultInvoice.id) // serial != 'R' &&
+            if (resultInvoice.id)
                 await Self.rawSql('CALL invoiceOutBooking(?)', [resultInvoice.id], myOptions);
 
             if (tx) await tx.commit();

From c755b1e6fa7f948b78d9de47e6fad5c43f14a198 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 15 Dec 2023 08:50:22 +0100
Subject: [PATCH 06/11] refs #5914 fix: correct sql version

---
 db/changes/{235201 => 235001}/00-getTaxBases.sql                | 0
 db/changes/{235201 => 235001}/01-newHasAnyPositiveBase.sql      | 0
 db/changes/{235201 => 235001}/01-refactorHasAnyNegativeBase.sql | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename db/changes/{235201 => 235001}/00-getTaxBases.sql (100%)
 rename db/changes/{235201 => 235001}/01-newHasAnyPositiveBase.sql (100%)
 rename db/changes/{235201 => 235001}/01-refactorHasAnyNegativeBase.sql (100%)

diff --git a/db/changes/235201/00-getTaxBases.sql b/db/changes/235001/00-getTaxBases.sql
similarity index 100%
rename from db/changes/235201/00-getTaxBases.sql
rename to db/changes/235001/00-getTaxBases.sql
diff --git a/db/changes/235201/01-newHasAnyPositiveBase.sql b/db/changes/235001/01-newHasAnyPositiveBase.sql
similarity index 100%
rename from db/changes/235201/01-newHasAnyPositiveBase.sql
rename to db/changes/235001/01-newHasAnyPositiveBase.sql
diff --git a/db/changes/235201/01-refactorHasAnyNegativeBase.sql b/db/changes/235001/01-refactorHasAnyNegativeBase.sql
similarity index 100%
rename from db/changes/235201/01-refactorHasAnyNegativeBase.sql
rename to db/changes/235001/01-refactorHasAnyNegativeBase.sql

From 59f2e3d0e62c16c1822210bb7a71730bd3625025 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 15 Dec 2023 08:54:41 +0100
Subject: [PATCH 07/11] refs #5914 fix: remove unnecessary

---
 db/dump/structure.sql   | 30 ------------------------------
 loopback/locale/es.json |  3 +--
 2 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/db/dump/structure.sql b/db/dump/structure.sql
index 4e1695185..1db4252f4 100644
--- a/db/dump/structure.sql
+++ b/db/dump/structure.sql
@@ -26391,36 +26391,6 @@ CREATE TABLE `cplusCorrectingType` (
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
---
--- Table structure for table `cplusInvoiceType472`
---
-
-DROP TABLE IF EXISTS `cplusInvoiceType472`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `cplusInvoiceType472` (
-  `id` int(10) unsigned NOT NULL,
-  `description` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='(*18) TIPO FACTURA (Asientos)SOPORTADO – DEDUCIBLE (472)';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `siiTypeInvoiceOut`
---
-
-DROP TABLE IF EXISTS `siiTypeInvoiceOut`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `siiTypeInvoiceOut` (
-  `id` int(10) unsigned NOT NULL,
-  `code` varchar(2) NOT NULL,
-  `description` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `code_UNIQUE` (`code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Tipo de Factura Emitidas en el suministro de inmediato';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
 --
 -- Table structure for table `cplusRectificationType`
 --
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 0c2ad3238..3a1cdfe99 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -334,6 +334,5 @@
 	"No tickets to invoice": "No hay tickets para facturar",
 	"It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}",
 	"Base negativa para los tickets: 39": "Base negativa para los tickets: 39",
-	"Base negativa para los tickets: 41": "Base negativa para los tickets: 41",
-	"keepPrice": "keepPrice"
+	"Base negativa para los tickets: 41": "Base negativa para los tickets: 41"
 }

From 356fe6869635c241b897e8531b202aebe46b563c Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 15 Dec 2023 08:57:09 +0100
Subject: [PATCH 08/11] refs #5914 fix: remove unnecessary translation

---
 loopback/locale/es.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 3a1cdfe99..e137beb2d 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -332,7 +332,5 @@
 	"quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mínima",
 	"Cannot past travels with entries": "No se pueden pasar envíos con entradas",
 	"No tickets to invoice": "No hay tickets para facturar",
-	"It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}",
-	"Base negativa para los tickets: 39": "Base negativa para los tickets: 39",
-	"Base negativa para los tickets: 41": "Base negativa para los tickets: 41"
+	"It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}"
 }

From 1e3a7e5f9113aac0beb95b052c2b8be745934995 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 2 Jan 2024 13:17:10 +0100
Subject: [PATCH 09/11] refs #5914 refactor: invoiceTickets

---
 ...00-fixInvoiceCorrectionConstraintsName.sql |  7 +++++
 .../{235001 => 240001}/00-getTaxBases.sql     |  0
 .../01-newHasAnyPositiveBase.sql              |  2 +-
 .../01-refactorHasAnyNegativeBase.sql         |  2 +-
 .../back/models/invoice-correction.json       | 27 +++++++++++++++++++
 .../back/methods/ticket/canBeInvoiced.js      |  7 -----
 .../back/methods/ticket/invoiceTickets.js     | 19 +++++++------
 .../ticket/back/methods/ticket/makeInvoice.js |  3 +--
 .../ticket/specs/canBeInvoiced.spec.js        | 20 +++-----------
 9 files changed, 50 insertions(+), 37 deletions(-)
 create mode 100644 db/changes/240001/00-fixInvoiceCorrectionConstraintsName.sql
 rename db/changes/{235001 => 240001}/00-getTaxBases.sql (100%)
 rename db/changes/{235001 => 240001}/01-newHasAnyPositiveBase.sql (91%)
 rename db/changes/{235001 => 240001}/01-refactorHasAnyNegativeBase.sql (91%)

diff --git a/db/changes/240001/00-fixInvoiceCorrectionConstraintsName.sql b/db/changes/240001/00-fixInvoiceCorrectionConstraintsName.sql
new file mode 100644
index 000000000..426afea90
--- /dev/null
+++ b/db/changes/240001/00-fixInvoiceCorrectionConstraintsName.sql
@@ -0,0 +1,7 @@
+ALTER TABLE `vn`.`invoiceCorrection` DROP FOREIGN KEY `cplusInvoiceTyoeFk`;
+ALTER TABLE `vn`.`invoiceCorrection` DROP FOREIGN KEY `invoiceCorrectionType_Fk33`;
+ALTER TABLE `vn`.`invoiceCorrection` DROP FOREIGN KEY `invoiceCorrection_ibfk_1`;
+
+ALTER TABLE `vn`.`invoiceCorrection` ADD CONSTRAINT `siiTypeInvoiceOut_FK` FOREIGN KEY (`siiTypeInvoiceOutFk`) REFERENCES `vn`.`siiTypeInvoiceOut`(id) ON UPDATE CASCADE;
+ALTER TABLE `vn`.`invoiceCorrection` ADD CONSTRAINT `invoiceCorrectionType_FK` FOREIGN KEY (`invoiceCorrectionTypeFk`) REFERENCES `vn`.`invoiceCorrectionType`(id) ON UPDATE CASCADE;
+ALTER TABLE `vn`.`invoiceCorrection` ADD CONSTRAINT `cplusRectificationType_FK` FOREIGN KEY (`cplusRectificationTypeFk`) REFERENCES `vn`.`cplusRectificationType`(id) ON UPDATE CASCADE;
diff --git a/db/changes/235001/00-getTaxBases.sql b/db/changes/240001/00-getTaxBases.sql
similarity index 100%
rename from db/changes/235001/00-getTaxBases.sql
rename to db/changes/240001/00-getTaxBases.sql
diff --git a/db/changes/235001/01-newHasAnyPositiveBase.sql b/db/changes/240001/01-newHasAnyPositiveBase.sql
similarity index 91%
rename from db/changes/235001/01-newHasAnyPositiveBase.sql
rename to db/changes/240001/01-newHasAnyPositiveBase.sql
index c9e7e8e05..70fd51bcc 100644
--- a/db/changes/235001/01-newHasAnyPositiveBase.sql
+++ b/db/changes/240001/01-newHasAnyPositiveBase.sql
@@ -14,7 +14,7 @@ BEGIN
 
     CALL getTaxBases();
 
-	SELECT positive > 0 INTO hasAnyPositiveBase
+	SELECT positive INTO hasAnyPositiveBase
         FROM tmp.taxBases;
 
 	DROP TEMPORARY TABLE
diff --git a/db/changes/235001/01-refactorHasAnyNegativeBase.sql b/db/changes/240001/01-refactorHasAnyNegativeBase.sql
similarity index 91%
rename from db/changes/235001/01-refactorHasAnyNegativeBase.sql
rename to db/changes/240001/01-refactorHasAnyNegativeBase.sql
index 65822fc95..f851ee6b9 100644
--- a/db/changes/235001/01-refactorHasAnyNegativeBase.sql
+++ b/db/changes/240001/01-refactorHasAnyNegativeBase.sql
@@ -14,7 +14,7 @@ BEGIN
 
     CALL getTaxBases();
 
-	SELECT negative > 0 INTO hasAnyNegativeBase
+	SELECT negative INTO hasAnyNegativeBase
         FROM tmp.taxBases;
 
 	DROP TEMPORARY TABLE
diff --git a/modules/invoiceOut/back/models/invoice-correction.json b/modules/invoiceOut/back/models/invoice-correction.json
index 5924c9232..58f6f63b7 100644
--- a/modules/invoiceOut/back/models/invoice-correction.json
+++ b/modules/invoiceOut/back/models/invoice-correction.json
@@ -26,6 +26,33 @@
         "invoiceCorrectionTypeFk": {
             "type": "number",
             "required": true
+        },
+        "relations": {
+            "correcting": {
+                "type": "belongsTo",
+                "model": "InvoiceOut",
+                "foreignKey": "correctingFk"
+            },
+            "corrected": {
+                "type": "belongsTo",
+                "model": "InvoiceOut",
+                "foreignKey": "correctedFk"
+            },
+            "cplusRectificationType": {
+                "type": "belongsTo",
+                "model": "cplusRectificationType",
+                "foreignKey": "cplusRectificationTypeFk"
+            },
+            "siiTypeInvoiceOut": {
+                "type": "belongsTo",
+                "model": "siiTypeInvoiceOut",
+                "foreignKey": "siiTypeInvoiceOutFk"
+            },
+            "invoiceCorrectionType": {
+                "type": "belongsTo",
+                "model": "invoiceCorrectionType",
+                "foreignKey": "invoiceCorrectionTypeFk"
+            }
         }
     }
 }
diff --git a/modules/ticket/back/methods/ticket/canBeInvoiced.js b/modules/ticket/back/methods/ticket/canBeInvoiced.js
index 75d13a508..855a864c2 100644
--- a/modules/ticket/back/methods/ticket/canBeInvoiced.js
+++ b/modules/ticket/back/methods/ticket/canBeInvoiced.js
@@ -17,11 +17,6 @@ module.exports = function(Self) {
                 type: 'boolean'
             }
         ],
-        returns: {
-            arg: 'data',
-            type: 'boolean',
-            root: true
-        },
         http: {
             path: `/canBeInvoiced`,
             verb: 'get'
@@ -63,7 +58,5 @@ module.exports = function(Self) {
             if (ticketsIds.length == 1 && priceZero)
                 throw new UserError(`A ticket with an amount of zero can't be invoiced`);
         });
-
-        return true;
     };
 };
diff --git a/modules/ticket/back/methods/ticket/invoiceTickets.js b/modules/ticket/back/methods/ticket/invoiceTickets.js
index f1793773b..57f623289 100644
--- a/modules/ticket/back/methods/ticket/invoiceTickets.js
+++ b/modules/ticket/back/methods/ticket/invoiceTickets.js
@@ -61,20 +61,19 @@ module.exports = function(Self) {
             if (!isSameClient)
                 throw new UserError(`You can't invoice tickets from multiple clients`);
 
-            const client = await models.Client.findById(clientId, {
-                fields: ['id', 'hasToInvoiceByAddress']
+            const {hasToInvoiceByAddress} = await models.Client.findById(clientId, {
+                fields: ['hasToInvoiceByAddress']
             }, myOptions);
 
-            let ticketsByAddress = {[firstTicket.addressFk]: ticketsIds};
-            if (client.hasToInvoiceByAddress) {
-                ticketsByAddress = tickets.reduce((group, ticket) => {
-                    const {addressFk} = ticket;
+            let ticketsByAddress = hasToInvoiceByAddress
+                ? Object.values(tickets.reduce((group, {id, addressFk}) => {
                     group[addressFk] = group[addressFk] ?? [];
-                    group[addressFk].push(ticket.id);
+                    group[addressFk].push(id);
                     return group;
-                }, {});
-            }
-            for (const ticketIds of Object.values(ticketsByAddress))
+                }, {}))
+                : [[ticketsIds]];
+
+            for (const ticketIds of ticketsByAddress)
                 invoicesIds.push(await createInvoice(ctx, companyId, ticketIds, invoiceCorrection, myOptions));
 
             if (tx) await tx.commit();
diff --git a/modules/ticket/back/methods/ticket/makeInvoice.js b/modules/ticket/back/methods/ticket/makeInvoice.js
index 32aa03f9d..83222a4ee 100644
--- a/modules/ticket/back/methods/ticket/makeInvoice.js
+++ b/modules/ticket/back/methods/ticket/makeInvoice.js
@@ -106,8 +106,7 @@ module.exports = function(Self) {
                 );
             }
 
-            if (resultInvoice.id)
-                await Self.rawSql('CALL invoiceOutBooking(?)', [resultInvoice.id], myOptions);
+            await Self.rawSql('CALL invoiceOutBooking(?)', [resultInvoice.id], myOptions);
 
             if (tx) await tx.commit();
 
diff --git a/modules/ticket/back/methods/ticket/specs/canBeInvoiced.spec.js b/modules/ticket/back/methods/ticket/specs/canBeInvoiced.spec.js
index e443ed6d3..1509b87df 100644
--- a/modules/ticket/back/methods/ticket/specs/canBeInvoiced.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/canBeInvoiced.spec.js
@@ -27,10 +27,7 @@ describe('ticket canBeInvoiced()', () => {
                         WHERE id IN (?)
             `, [ticketId], options);
 
-            const canBeInvoiced = await models.Ticket.canBeInvoiced(ctx, [ticketId], false, options);
-
-            expect(canBeInvoiced).toEqual(false);
-
+            await models.Ticket.canBeInvoiced(ctx, [ticketId], false, options);
             await tx.rollback();
         } catch (e) {
             error = e;
@@ -59,10 +56,7 @@ describe('ticket canBeInvoiced()', () => {
                         WHERE id IN (?)
             `, [ticketId], options);
 
-            const canBeInvoiced = await models.Ticket.canBeInvoiced(ctx, [ticketId], false, options);
-
-            expect(canBeInvoiced).toEqual(false);
-
+            await models.Ticket.canBeInvoiced(ctx, [ticketId], false, options);
             await tx.rollback();
         } catch (e) {
             error = e;
@@ -95,10 +89,7 @@ describe('ticket canBeInvoiced()', () => {
                         WHERE id IN (?)
             `, [ticketId], options);
 
-            const canBeInvoiced = await models.Ticket.canBeInvoiced(ctx, [ticketId], false, options);
-
-            expect(canBeInvoiced).toEqual(false);
-
+            await models.Ticket.canBeInvoiced(ctx, [ticketId], false, options);
             await tx.rollback();
         } catch (e) {
             error = e;
@@ -123,10 +114,7 @@ describe('ticket canBeInvoiced()', () => {
                         WHERE id IN (?)
             `, [ticketId], options);
 
-            const canBeInvoiced = await models.Ticket.canBeInvoiced(ctx, [ticketId], false, options);
-
-            expect(canBeInvoiced).toEqual(true);
-
+            await models.Ticket.canBeInvoiced(ctx, [ticketId], false, options);
             await tx.rollback();
         } catch (e) {
             await tx.rollback();

From ba26237998a1bf2143c0b095963cd48aa1bffb28 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 3 Jan 2024 12:19:28 +0100
Subject: [PATCH 10/11] refs #5914 refactor: getTaxBases

---
 db/changes/240001/00-getTaxBases.sql          | 10 ++++----
 .../240001/01-newHasAnyPositiveBase.sql       |  6 +++--
 .../240001/01-refactorHasAnyNegativeBase.sql  |  7 ++++--
 .../front/descriptor-menu/locale/es.yml       |  1 +
 .../back/methods/ticket/invoiceTickets.js     |  2 +-
 .../ticket/specs/canBeInvoiced.spec.js        | 25 +++++++++++++++++++
 6 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/db/changes/240001/00-getTaxBases.sql b/db/changes/240001/00-getTaxBases.sql
index fa43c32f7..8bd1b745a 100644
--- a/db/changes/240001/00-getTaxBases.sql
+++ b/db/changes/240001/00-getTaxBases.sql
@@ -2,8 +2,8 @@ DELIMITER $$
 $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`getTaxBases`()
 BEGIN
-
-/*	Calcula y devuelve en número de bases imponibles postivas y negativas
+/**
+*   Calcula y devuelve en número de bases imponibles postivas y negativas
 *	Requiere la tabla temporal tmp.ticketToInvoice(id)
 *
 *	returns tmp.taxBases
@@ -21,10 +21,10 @@ BEGIN
 	CREATE TEMPORARY TABLE tmp.taxBases
 		ENGINE = MEMORY
 		SELECT
-			    SUM(CASE WHEN taxableBase > 0 THEN 1 ELSE 0 END) as positive,
-				SUM(CASE WHEN taxableBase < 0 THEN 1 ELSE 0 END) as negative
+                SUM(taxableBase > 0) as positive,
+				SUM(taxableBase < 0) as negative
 			FROM(
-				SELECT SUM(taxableBase) as taxableBase
+				SELECT SUM(taxableBase) taxableBase
 					FROM tmp.ticketTax
 					GROUP BY pgcFk
 				) t;
diff --git a/db/changes/240001/01-newHasAnyPositiveBase.sql b/db/changes/240001/01-newHasAnyPositiveBase.sql
index 70fd51bcc..c4edfaed0 100644
--- a/db/changes/240001/01-newHasAnyPositiveBase.sql
+++ b/db/changes/240001/01-newHasAnyPositiveBase.sql
@@ -4,7 +4,8 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`hasAnyPositiveBase`(
     DETERMINISTIC
 BEGIN
 
-/*	Calcula si existe alguna base imponible positiva
+/**
+*	Calcula si existe alguna base imponible positiva
 *	Requiere la tabla temporal tmp.ticketToInvoice(id) para getTaxBases()
 *
 *	returns BOOLEAN
@@ -15,7 +16,8 @@ BEGIN
     CALL getTaxBases();
 
 	SELECT positive INTO hasAnyPositiveBase
-        FROM tmp.taxBases;
+        FROM tmp.taxBases
+        LIMIT 1;
 
 	DROP TEMPORARY TABLE
         tmp.ticketTax,
diff --git a/db/changes/240001/01-refactorHasAnyNegativeBase.sql b/db/changes/240001/01-refactorHasAnyNegativeBase.sql
index f851ee6b9..a3eb2d9c7 100644
--- a/db/changes/240001/01-refactorHasAnyNegativeBase.sql
+++ b/db/changes/240001/01-refactorHasAnyNegativeBase.sql
@@ -4,7 +4,8 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`hasAnyNegativeBase`(
     DETERMINISTIC
 BEGIN
 
-/*	Calcula si existe alguna base imponible negativa
+/**
+*	Calcula si existe alguna base imponible negativa
 *	Requiere la tabla temporal tmp.ticketToInvoice(id) para getTaxBases()
 *
 *	returns BOOLEAN
@@ -15,7 +16,8 @@ BEGIN
     CALL getTaxBases();
 
 	SELECT negative INTO hasAnyNegativeBase
-        FROM tmp.taxBases;
+        FROM tmp.taxBases
+        LIMIT 1;
 
 	DROP TEMPORARY TABLE
         tmp.ticketTax,
@@ -27,3 +29,4 @@ BEGIN
 END$$
 DELIMITER ;
 
+
diff --git a/modules/invoiceOut/front/descriptor-menu/locale/es.yml b/modules/invoiceOut/front/descriptor-menu/locale/es.yml
index 9456646af..bf89b2ba0 100644
--- a/modules/invoiceOut/front/descriptor-menu/locale/es.yml
+++ b/modules/invoiceOut/front/descriptor-menu/locale/es.yml
@@ -23,3 +23,4 @@ The following refund tickets have been created: "Se han creado los siguientes ti
 Refund...: Abono...
 Transfer invoice to...: Transferir factura a...
 Rectificative type: Tipo rectificativa
+Invoice trasfered!: ¡Factura transferida!
diff --git a/modules/ticket/back/methods/ticket/invoiceTickets.js b/modules/ticket/back/methods/ticket/invoiceTickets.js
index 57f623289..06429836e 100644
--- a/modules/ticket/back/methods/ticket/invoiceTickets.js
+++ b/modules/ticket/back/methods/ticket/invoiceTickets.js
@@ -71,7 +71,7 @@ module.exports = function(Self) {
                     group[addressFk].push(id);
                     return group;
                 }, {}))
-                : [[ticketsIds]];
+                : [ticketsIds];
 
             for (const ticketIds of ticketsByAddress)
                 invoicesIds.push(await createInvoice(ctx, companyId, ticketIds, invoiceCorrection, myOptions));
diff --git a/modules/ticket/back/methods/ticket/specs/canBeInvoiced.spec.js b/modules/ticket/back/methods/ticket/specs/canBeInvoiced.spec.js
index 1509b87df..78973e040 100644
--- a/modules/ticket/back/methods/ticket/specs/canBeInvoiced.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/canBeInvoiced.spec.js
@@ -121,4 +121,29 @@ describe('ticket canBeInvoiced()', () => {
             throw e;
         }
     });
+
+    it('should return falsy for a ticket has positiveBase', async() => {
+        const tx = await models.Ticket.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            await models.Ticket.rawSql(`
+                CREATE OR REPLACE TEMPORARY TABLE tmp.ticketToInvoice
+                (PRIMARY KEY  (id))
+                    ENGINE = MEMORY
+                    SELECT id
+                        FROM vn.ticket
+                        WHERE id IN (?)
+            `, [ticketId], options);
+
+            await models.Ticket.canBeInvoiced(ctx, [ticketId], true, options);
+            await tx.rollback();
+        } catch (e) {
+            error = e;
+            await tx.rollback();
+        }
+
+        expect(error.message).toEqual(`hasAnyPositiveBase`);
+    });
 });

From 227afbe39dfa3255f177a6d6736e1a4267bbe249 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 3 Jan 2024 14:54:01 +0100
Subject: [PATCH 11/11] refs #5914 fix(invoiceOut_descriptorMenu): transalation

---
 modules/invoiceOut/front/descriptor-menu/index.js      | 2 +-
 modules/invoiceOut/front/descriptor-menu/locale/es.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/invoiceOut/front/descriptor-menu/index.js b/modules/invoiceOut/front/descriptor-menu/index.js
index aee323e39..2c28599e7 100644
--- a/modules/invoiceOut/front/descriptor-menu/index.js
+++ b/modules/invoiceOut/front/descriptor-menu/index.js
@@ -137,7 +137,7 @@ class Controller extends Section {
         };
         this.$http.post(`InvoiceOuts/transferInvoice`, params).then(res => {
             const invoiceId = res.data;
-            this.vnApp.showSuccess(this.$t('Invoice trasfered!'));
+            this.vnApp.showSuccess(this.$t('Transferred invoice'));
             this.$state.go('invoiceOut.card.summary', {id: invoiceId});
         });
     }
diff --git a/modules/invoiceOut/front/descriptor-menu/locale/es.yml b/modules/invoiceOut/front/descriptor-menu/locale/es.yml
index bf89b2ba0..aaeefd9cc 100644
--- a/modules/invoiceOut/front/descriptor-menu/locale/es.yml
+++ b/modules/invoiceOut/front/descriptor-menu/locale/es.yml
@@ -23,4 +23,4 @@ The following refund tickets have been created: "Se han creado los siguientes ti
 Refund...: Abono...
 Transfer invoice to...: Transferir factura a...
 Rectificative type: Tipo rectificativa
-Invoice trasfered!: ¡Factura transferida!
+Transferred invoice: Factura transferida