db/routines/sage/procedures/invoiceIn_add.sql

@@ -25,7 +25,7 @@ BEGIN
 	DECLARE vIsInformativeExportation BOOL DEFAULT FALSE;
 
 	DECLARE vCursor CURSOR FOR
-		SELECT it.taxableBase,
+		SELECT SUM(it.taxableBase),
 				CAST(SUM((( it.taxableBase / 100) * t.PorcentajeIva)) AS DECIMAL (10,2)),
 				t.PorcentajeIva,
 				it.transactionTypeSageFk,
@@ -204,17 +204,17 @@ BEGIN
 		FROM vn.invoiceInCorrection
 		WHERE correctingFk = vInvoiceInFk;
 
-	IF vInvoiceInOriginalFk THEN 
+	IF vInvoiceInOriginalFk THEN
 
 		UPDATE movContaIVA mci
 				JOIN vn.invoiceInRefund iir ON iir.invoiceInRefundFk = vInvoiceInFk
 				JOIN (SELECT issued,
-							SUM(sub.taxableBase) taxableBase, 
+							SUM(sub.taxableBase) taxableBase,
 							SUM(ROUND((sub.taxableBase * sub.PorcentajeIva) / 100 , 2)) vat
 						FROM(SELECT issued,
-									SUM(iit.taxableBase) taxableBase, 
+									SUM(iit.taxableBase) taxableBase,
 									ti.PorcentajeIva
-								FROM vn.invoiceIn i 
+								FROM vn.invoiceIn i
 									JOIN vn.invoiceInTax iit ON iit.invoiceInFk = i.id
 									JOIN sage.TiposIva ti ON ti.CodigoIva = iit.taxTypeSageFk
 								WHERE i.id = vInvoiceInOriginalFk
@@ -222,7 +222,7 @@ BEGIN
 					)invoiceInOriginal
 				JOIN ClavesOperacion co ON co.Descripcion = 'Factura rectificativa'
 			SET mci.TipoRectificativa = iir.refundCategoryFk,
-				mci.ClaseAbonoRectificativas = iir.refundType, 
+				mci.ClaseAbonoRectificativas = iir.refundType,
 				mci.FechaFacturaOriginal = invoiceInOriginal.issued,
 				mci.FechaOperacion = invoiceInOriginal.issued,
 				mci.BaseImponibleOriginal = invoiceInOriginal.taxableBase,
@@ -232,4 +232,4 @@ BEGIN
 
 	END IF;
 END$$
-DELIMITER ;
+DELIMITER ;

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

@@ -82,7 +82,7 @@ module.exports = Self => {
 
                 const message = $t('Changed sale quantity', {
                     ticketId: sale.ticket().id,
-                    changes: change,
+                    changes: JSON.stringify(change),
                     ticketUrl: `${url}ticket/${sale.ticket().id}/sale`,
                 });
 

modules/ticket/back/methods/ticket-request/filter.js

@@ -64,6 +64,11 @@ module.exports = Self => {
                 arg: 'myTeam',
                 type: 'boolean',
                 description: `Team partners`
+            },
+            {
+                arg: 'daysOnward',
+                type: 'number',
+                description: 'The days onward'
             }
         ],
         returns: {
@@ -104,6 +109,9 @@ module.exports = Self => {
                 teamMembersId.push(userId);
         }
 
+        const today = Date.vnNew();
+        const future = Date.vnNew();
+
         let where = buildFilter(ctx.args, (param, value) => {
             switch (param) {
             case 'search':
@@ -140,9 +148,13 @@ module.exports = Self => {
                     return {'tr.requesterFk': {inq: teamMembersId}};
                 else
                     return {'tr.requesterFk': {nin: teamMembersId}};
+            case 'daysOnward':
+                today.setHours(0, 0, 0, 0);
+                future.setDate(today.getDate() + value);
+                future.setHours(23, 59, 59, 999);
+                return {'t.shipped': {between: [today, future]}};
             }
         });
-
         if (!where)
             where = {};
         where['tw.ticketFk'] = null;

modules/worker/back/models/worker-irpf.json

@@ -23,7 +23,7 @@
             "type" : "number"
         },
         "isDependend": {
-            "type" : "number"
+            "type" : "boolean"
         },
         "familySituation": {
             "type" : "number"
@@ -35,15 +35,17 @@
             "type" : "number"
         },
         "hasHousingPaymentBefore": {
-            "type" : "number"
+            "type" : "boolean"
         },
         "hasHousingPaymentAfter": {
-            "type" : "number"
+            "type" : "boolean"
         },
         "updated": {
             "type" : "date"
+        },
+        "hasExtendedWorking": {
+            "type" : "boolean"
         }
-
     },
     "relations": {
         "disabilityGrade": {