Merge branch 'master' into Hotfix-midnight-determinist

db/routines/vn/procedures/entry_checkBooked.sql

@@ -1,22 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`entry_checkBooked`(
-	vSelf INT
-)
-BEGIN
-/**
- * Comprueba si una entrada está contabilizada,
- * y si lo está retorna un throw.
- *
- * @param vSelf Id de entrada
- */
-	DECLARE vIsBooked BOOL;
-
-	SELECT isBooked INTO vIsBooked
-		FROM `entry`
-		WHERE id = vSelf;
-
-	IF vIsBooked AND NOT IFNULL(@isModeInventory, FALSE) THEN
-		CALL util.throw('Entry is already booked');
-	END IF;
-END$$
-DELIMITER ;

db/routines/vn/procedures/entry_isEditable.sql

@@ -0,0 +1,24 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`entry_isEditable`(
+	vSelf INT
+)
+BEGIN
+/**
+ * Comprueba si una entrada se puede actualizar
+ * si no se puede retorna un throw.
+ *
+ * @param vSelf Id de entrada
+ */
+	DECLARE vIsEditable BOOL;
+
+	SELECT e.isBooked INTO vIsEditable
+		FROM `entry` e
+			JOIN entryType et ON et.code = e.typeFk 
+		WHERE NOT et.isInformal
+			AND e.id = vSelf;
+
+	IF vIsEditable AND NOT IFNULL(@isModeInventory, FALSE) THEN
+		CALL util.throw('Entry is not editable');
+	END IF;
+END$$
+DELIMITER ;

db/routines/vn/procedures/entry_updateComission.sql

@@ -23,7 +23,8 @@ BEGIN
 				JOIN vn.travel t ON t.id = e.travelFk
 				JOIN vn.warehouse w ON w.id = t.warehouseInFk 
 			WHERE t.shipped >= util.VN_CURDATE()
-				AND e.currencyFk = vCurrency;
+				AND e.currencyFk = vCurrency
+				AND NOT e.isBooked;
 
 	SET vComission = currency_getCommission(vCurrency);
 

db/routines/vn/triggers/buy_beforeDelete.sql

@@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`buy_beforeDelete`
 	BEFORE DELETE ON `buy`
 	FOR EACH ROW
 BEGIN 
-	CALL entry_checkBooked(OLD.entryFk);
+	CALL entry_isEditable(OLD.entryFk);
 	IF OLD.printedStickers <> 0 THEN
 		CALL util.throw("it is not possible to delete buys with printed labels ");
 	END IF;

db/routines/vn/triggers/buy_beforeInsert.sql

@@ -15,7 +15,7 @@ trig: BEGIN
 		LEAVE trig;
 	END IF;
 
-	CALL entry_checkBooked(NEW.entryFk);
+	CALL entry_isEditable(NEW.entryFk);
 	IF NEW.printedStickers <> 0 THEN
 		CALL util.throw('it is not possible to create buy lines with printedstickers other than 0');
 	END IF;

db/routines/vn/triggers/buy_beforeUpdate.sql

@@ -13,7 +13,7 @@ trig:BEGIN
 		LEAVE trig;
 	END IF;
 
-	CALL entry_checkBooked(OLD.entryFk);
+	CALL entry_isEditable(OLD.entryFk);
 	SET NEW.editorFk = account.myUser_getId();
 
 	SELECT defaultEntry INTO vDefaultEntry

db/routines/vn/triggers/entry_beforeDelete.sql

@@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`entry_beforeDelete`
 	BEFORE DELETE ON `entry`
 	FOR EACH ROW
 BEGIN
-	CALL entry_checkBooked(OLD.id);
+	CALL entry_isEditable(OLD.id);
 	DELETE FROM buy WHERE entryFk = OLD.id;
 END$$
 DELIMITER ;

db/routines/vn/triggers/entry_beforeUpdate.sql

@@ -9,7 +9,7 @@ BEGIN
 	DECLARE vTotalBuy INT;
 	
 	IF NEW.isBooked = OLD.isBooked THEN
-		CALL entry_checkBooked(OLD.id);
+		CALL entry_isEditable(OLD.id);
 	ELSE
 		IF NEW.isBooked THEN
 			SELECT COUNT(*) INTO vTotalBuy

db/routines/vn/triggers/ticket_afterUpdate.sql

@@ -8,7 +8,9 @@ BEGIN
 			SET hasNewRoute = TRUE
 			WHERE ticketFk = NEW.id;
 		
-		CALL ticket_doCmr(NEW.id);
+		IF NEW.cmrFk THEN 
+			CALL ticket_doCmr(NEW.id);
+		END IF;	
 	END IF;
 END$$
 DELIMITER ;

db/versions/11092-azureBirch/00-firstScript.sql

@@ -0,0 +1 @@
+CREATE INDEX ticketLog_creationDate_IDX USING BTREE ON vn.ticketLog (creationDate,changedModel,`action`);

loopback/locale/en.json

@@ -227,5 +227,8 @@
 	"They're not your subordinate": "They're not your subordinate",
 	"InvoiceIn is already booked": "InvoiceIn is already booked",
 	"This workCenter is already assigned to this agency": "This workCenter is already assigned to this agency",
-	"You can only have one PDA": "You can only have one PDA"
-}
+	"You can only have one PDA": "You can only have one PDA",
+	"It has been invoiced but the PDF could not be generated": "It has been invoiced but the PDF could not be generated",
+	"It has been invoiced but the PDF of refund not be generated": "It has been invoiced but the PDF of refund not be generated"
+
+}

loopback/locale/es.json

@@ -359,5 +359,7 @@
 	"It was not able to create the invoice": "No se pudo crear la factura",
 	"ticketCommercial": "El ticket {{ ticket }} para el vendedor {{ salesMan }} está en preparación. (mensaje generado automáticamente)",
 	"This PDA is already assigned to another user": "Este PDA ya está asignado a otro usuario",
-	"You can only have one PDA": "Solo puedes tener un PDA"
-}
+	"You can only have one PDA": "Solo puedes tener un PDA",
+	"It has been invoiced but the PDF could not be generated": "Se ha facturado pero no se ha podido generar el PDF",
+	"It has been invoiced but the PDF of refund not be generated": "Se ha facturado pero no se ha podido generar el PDF del abono"
+}

loopback/locale/fr.json

@@ -356,5 +356,7 @@
 	"InvoiceIn is already booked": "La facture reçue est déjà comptabilisée",
 	"This workCenter is already assigned to this agency": "Ce centre de travail est déjà assigné à cette agence",
 	"Select ticket or client": "Choisissez un ticket ou un client",
-	"It was not able to create the invoice": "Il n'a pas été possible de créer la facture"
-}
+	"It was not able to create the invoice": "Il n'a pas été possible de créer la facture",
+	"It has been invoiced but the PDF could not be generated": "La facture a été émise mais le PDF n'a pas pu être généré",
+	"It has been invoiced but the PDF of refund not be generated": "Il a été facturé mais le PDF de remboursement n'a pas été généré"
+}

loopback/locale/pt.json

@@ -356,5 +356,7 @@
 	"InvoiceIn is already booked": "InvoiceIn já está reservado",
 	"This workCenter is already assigned to this agency": "Este centro de trabalho já está atribuído a esta agência",
 	"Select ticket or client": "Selecione um ticket ou cliente",
-	"It was not able to create the invoice": "Não foi possível criar a fatura"
-}
+	"It was not able to create the invoice": "Não foi possível criar a fatura",
+	"It has been invoiced but the PDF could not be generated": "Foi faturado, mas o PDF não pôde ser gerado",
+	"It has been invoiced but the PDF of refund not be generated": "Foi faturado mas não foi gerado o PDF do reembolso"
+}

modules/invoiceOut/back/methods/invoiceOut/specs/transferinvoice.spec.js

@@ -1,4 +1,3 @@
-
 const models = require('vn-loopback/server/server').models;
 const LoopBackContext = require('loopback-context');
 
@@ -17,26 +16,27 @@ describe('InvoiceOut transferInvoice()', () => {
         spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
             active: activeCtx
         });
-        spyOn(models.InvoiceOut, 'makePdfAndNotify');
     });
 
     it('should return the id of the created issued invoice', async() => {
         const tx = await models.InvoiceOut.beginTransaction({});
         const options = {transaction: tx};
-        const args = {
-            id: '4',
-            refFk: 'T4444444',
-            newClientFk: 1,
-            cplusRectificationTypeFk: 1,
-            siiTypeInvoiceOutFk: 1,
-            invoiceCorrectionTypeFk: 1
-        };
-        ctx.args = args;
+        const id = 4;
+        const newClient = 1;
+        spyOn(models.InvoiceOut, 'makePdfList');
+
         try {
-            const {clientFk: oldClient} = await models.InvoiceOut.findById(args.id, {fields: ['clientFk']});
+            const {clientFk: oldClient} = await models.InvoiceOut.findById(id, {fields: ['clientFk']});
             const invoicesBefore = await models.InvoiceOut.find({}, options);
             const result = await models.InvoiceOut.transferInvoice(
                 ctx,
+                id,
+                'T4444444',
+                newClient,
+                1,
+                1,
+                1,
+                true,
                 options);
             const invoicesAfter = await models.InvoiceOut.find({}, options);
             const rectificativeInvoice = invoicesAfter[invoicesAfter.length - 2];
@@ -45,7 +45,7 @@ describe('InvoiceOut transferInvoice()', () => {
             expect(result).toBeDefined();
             expect(invoicesAfter.length - invoicesBefore.length).toEqual(2);
             expect(rectificativeInvoice.clientFk).toEqual(oldClient);
-            expect(newInvoice.clientFk).toEqual(args.newClientFk);
+            expect(newInvoice.clientFk).toEqual(newClient);
 
             await tx.rollback();
         } catch (e) {
@@ -54,22 +54,13 @@ describe('InvoiceOut transferInvoice()', () => {
         }
     });
 
-    it('should throw an UserError when it is the same client', async() => {
+    it('should throw an error when it is the same client', async() => {
         const tx = await models.InvoiceOut.beginTransaction({});
         const options = {transaction: tx};
-        const args = {
-            id: '1',
-            refFk: 'T1111111',
-            newClientFk: 1101,
-            cplusRectificationTypeFk: 1,
-            siiTypeInvoiceOutFk: 1,
-            invoiceCorrectionTypeFk: 1
-        };
-        ctx.args = args;
+        spyOn(models.InvoiceOut, 'makePdfList');
+
         try {
-            await models.InvoiceOut.transferInvoice(
-                ctx,
-                options);
+            await models.InvoiceOut.transferInvoice(ctx, '1', 'T1111111', 1101, 1, 1, 1, true, options);
             await tx.rollback();
         } catch (e) {
             expect(e.message).toBe(`Select a different client`);
@@ -77,26 +68,49 @@ describe('InvoiceOut transferInvoice()', () => {
         }
     });
 
-    it('should throw an UserError when it is refund', async() => {
+    it('should throw an error 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;
+        spyOn(models.InvoiceOut, 'makePdfList');
         try {
-            await models.InvoiceOut.transferInvoice(
-                ctx,
-                options);
+            await models.InvoiceOut.transferInvoice(ctx, '1', 'T1111111', 1102, 1, 1, 1, true, options);
             await tx.rollback();
         } catch (e) {
             expect(e.message).toContain(`This ticket is already a refund`);
             await tx.rollback();
         }
     });
+
+    it('should throw an error when pdf failed', async() => {
+        const tx = await models.InvoiceOut.beginTransaction({});
+        const options = {transaction: tx};
+        spyOn(models.InvoiceOut, 'makePdfList').and.returnValue(() => {
+            throw new Error('test');
+        });
+
+        try {
+            await models.InvoiceOut.transferInvoice(ctx, '1', 'T1111111', 1102, 1, 1, 1, true, options);
+            await tx.rollback();
+        } catch (e) {
+            expect(e.message).toContain(`It has been invoiced but the PDF could not be generated`);
+            await tx.rollback();
+        }
+    });
+
+    it('should not generate an invoice', async() => {
+        const tx = await models.InvoiceOut.beginTransaction({});
+        const options = {transaction: tx};
+        spyOn(models.InvoiceOut, 'makePdfList');
+
+        let response;
+        try {
+            response = await models.InvoiceOut.transferInvoice(ctx, '1', 'T1111111', 1102, 1, 1, 1, false, options);
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+
+        expect(response).not.toBeDefined();
+    });
 });

modules/invoiceOut/back/methods/invoiceOut/transferInvoice.js

@@ -37,13 +37,13 @@ module.exports = Self => {
                 required: true
             },
             {
-                arg: 'checked',
+                arg: 'makeInvoice',
                 type: 'boolean',
                 required: true
             },
         ],
         returns: {
-            type: 'boolean',
+            type: 'object',
             root: true
         },
         http: {
@@ -52,11 +52,22 @@ module.exports = Self => {
         }
     });
 
-    Self.transferInvoice = async(ctx, options) => {
+    Self.transferInvoice = async(
+        ctx,
+        id,
+        refFk,
+        newClientFk,
+        cplusRectificationTypeFk,
+        siiTypeInvoiceOutFk,
+        invoiceCorrectionTypeFk,
+        makeInvoice,
+        options
+    ) => {
         const models = Self.app.models;
         const myOptions = {userId: ctx.req.accessToken.userId};
-        const {id, refFk, newClientFk, cplusRectificationTypeFk, siiTypeInvoiceOutFk, invoiceCorrectionTypeFk} = ctx.args;
-        const checked = ctx.args.checked;
+        let invoiceId;
+        let refundId;
+
         let tx;
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -100,15 +111,29 @@ module.exports = Self => {
             };
             const refundTicketIds = refundTickets.map(ticket => ticket.id);
 
-            await models.Ticket.invoiceTickets(ctx, refundTicketIds, invoiceCorrection, myOptions);
+            refundId = await models.Ticket.invoiceTickets(ctx, refundTicketIds, invoiceCorrection, myOptions);
 
-            if (!checked) {
-                const [invoiceId] = await models.Ticket.invoiceTicketsAndPdf(ctx, clonedTicketIds, null, myOptions);
-                return invoiceId;
-            }
+            if (makeInvoice)
+                invoiceId = await models.Ticket.invoiceTickets(ctx, clonedTicketIds, null, myOptions);
+
+            tx && await tx.commit();
         } catch (e) {
             if (tx) await tx.rollback();
             throw e;
         }
+
+        if (tx && makeInvoice) {
+            try {
+                await models.InvoiceOut.makePdfList(ctx, invoiceId);
+            } catch (e) {
+                throw new UserError('It has been invoiced but the PDF could not be generated');
+            }
+            try {
+                await models.InvoiceOut.makePdfList(ctx, refundId);
+            } catch (e) {
+                throw new UserError('It has been invoiced but the PDF of refund not be generated');
+            }
+        }
+        return invoiceId;
     };
 };

modules/invoiceOut/front/descriptor-menu/index.js

@@ -158,7 +158,7 @@ class Controller extends Section {
             cplusRectificationTypeFk: this.cplusRectificationType,
             siiTypeInvoiceOutFk: this.siiTypeInvoiceOut,
             invoiceCorrectionTypeFk: this.invoiceCorrectionType,
-            checked: this.checked
+            makeInvoice: this.checked
         };
 
         this.$http.get(`Clients/${this.clientId}`).then(response => {

modules/ticket/back/methods/sale/clone.js

@@ -135,6 +135,7 @@ module.exports = Self => {
             const now = Date.vnNew();
 
             const ticket = await models.Ticket.findById(ticketId, null, myOptions);
+            if (!ctx.args) ctx.args = {};
             ctx.args.clientId = ticket.clientFk;
             ctx.args.shipped = now;
             ctx.args.landed = now;