Merge branch 'dev' into 7380_substitutionCondition

back/methods/collection/getSales.js

@@ -60,6 +60,7 @@ module.exports = Self => {
         if (print) await Self.rawSql('CALL vn.collection_printSticker(?,NULL)', [id], myOptions);
 
         for (let ticket of tickets) {
+            if (ticket.observaciones) {
                 let observations = ticket.observaciones.split(' ');
 
                 for (let observation of observations) {
@@ -72,6 +73,7 @@ module.exports = Self => {
                     }
                 }
             }
+        }
 
         return getCollection(id, tickets, sales, placements, myOptions);
     };

db/dump/.dump/structure.sql

@@ -51399,9 +51399,9 @@ BEGIN
 	SELECT (pc.maxNotReadyCollections - COUNT(*)) <= 0
 		INTO vHasTooMuchCollections
 		FROM productionConfig pc
-			LEFT JOIN tCollection ON TRUE;
+			LEFT JOIN tmp.collection ON TRUE;
 
-	DROP TEMPORARY TABLE tCollection;
+	DROP TEMPORARY TABLE tmp.collection;
 
 	IF vHasTooMuchCollections THEN
 		CALL util.throw('Hay colecciones pendientes');
@@ -51478,9 +51478,9 @@ BEGIN
  * @param vWorkerFk id del worker.
  * @table Devuelve tabla temporal con las colecciones pendientes
  */
-	DROP TEMPORARY TABLE IF EXISTS tCollection;
+	DROP TEMPORARY TABLE IF EXISTS tmp.collection;
 
-	CREATE TEMPORARY TABLE tCollection
+	CREATE TEMPORARY TABLE tmp.collection
 	SELECT 	c.id collectionFk,
 			date(c.created) created,
 			COUNT(DISTINCT tc.ticketFk) ticketTotalCount
@@ -51499,7 +51499,7 @@ BEGIN
 		GROUP BY c.id
 		HAVING COUNT(*) > COUNT(DISTINCT st.id);
 
-	SELECT * FROM tCollection;
+	SELECT * FROM tmp.collection;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;

db/dump/fixtures.before.sql

@@ -3911,3 +3911,19 @@ VALUES(1, '');
 INSERT INTO dipole.expedition_PrintOut (expeditionFk, ticketFk, addressFk, street, postalCode, city, shopName, isPrinted, created, printerFk, routeFk, parkingCode,
 truckName, clientFk, phone, province, agency, m3, workerCode, itemFk, quantity, longName, shelvingFk, comments)
 VALUES(1, 1, 0, ' ', ' ', ' ', ' ', 0, '2001-01-01 00:00:00', 1, 0, ' ', ' ', 0, NULL, '', NULL, 0.000, NULL, 10, NULL, NULL, 'NCC', NULL);
+
+INSERT INTO vn.accountDetail
+(id, value, accountDetailTypeFk, supplierAccountFk)
+VALUES
+	(21, 'ES12345B12345678', 3, 241),
+	(35, 'ES12346B12345679', 3, 241);
+
+INSERT INTO vn.accountDetailType
+(id, description)
+VALUES
+		(1, 'IBAN'),
+		(2, 'SWIFT'),
+		(3, 'Referencia Remesas'),
+		(4, 'Referencia Transferencias'),
+		(5, 'Referencia Nominas'),
+		(6, 'ABA');

db/routines/vn/procedures/collection_assign.sql

@@ -47,9 +47,9 @@ BEGIN
 		INTO vHasTooMuchCollections,
 			vLockName
 		FROM productionConfig pc
-			LEFT JOIN tCollection ON TRUE;
+			LEFT JOIN tmp.collection ON TRUE;
 
-	DROP TEMPORARY TABLE tCollection;
+	DROP TEMPORARY TABLE tmp.collection;
 
 	IF vHasTooMuchCollections THEN
 		CALL util.throw('Hay colecciones pendientes');

db/routines/vn/procedures/collection_get.sql

@@ -7,11 +7,15 @@ BEGIN
  * @param vWorkerFk id del worker.
  * @table Devuelve tabla temporal con las colecciones pendientes
  */
-	DROP TEMPORARY TABLE IF EXISTS tCollection;
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		RESIGNAL;
+	END;
 
-	CREATE TEMPORARY TABLE tCollection
+	CREATE OR REPLACE TEMPORARY TABLE tmp.collection
+		ENGINE = MEMORY
 		SELECT c.id collectionFk,
-			date(c.created) created,
+				DATE(c.created) created,
 				COUNT(DISTINCT tc.ticketFk) ticketTotalCount
 			FROM collection c 
 					JOIN ticketCollection tc ON tc.collectionFk = c.id 
@@ -19,15 +23,16 @@ BEGIN
 					JOIN ticketState ts ON ts.ticketFk = tc.ticketFk
 					JOIN state s2 ON s2.id = ts.stateFk
 					JOIN productionConfig pc
-				JOIN vn.state ss on ss.code = 'PREPARED'
+					JOIN vn.state ss ON ss.code = 'PREPARED'
-				LEFT JOIN vn.saleTracking st on st.saleFk = s.id AND st.stateFk = ss.id
+					LEFT JOIN vn.saleTracking st ON st.saleFk = s.id
+						AND st.stateFk = ss.id
 			WHERE c.workerFk = vWorkerFk 
 					AND TIMESTAMPDIFF(HOUR, c.created , util.VN_NOW()) < pc.pendingCollectionsAge
-				AND s.quantity != 0
+					AND s.quantity
 					AND s2.order < pc.pendingCollectionsOrder 
 			GROUP BY c.id
 			HAVING COUNT(*) > COUNT(DISTINCT st.id);
 
-	SELECT * FROM tCollection;
+	SELECT * FROM tmp.collection;
 END$$
 DELIMITER ;

db/routines/vn/procedures/collection_getAssigned.sql

@@ -34,10 +34,10 @@ BEGIN
 			pc.collection_assign_lockname
 		INTO vHasTooMuchCollections,
 			vLockName
-		FROM tCollection tc
+		FROM tmp.collection c
 			JOIN productionConfig pc;
 
-	DROP TEMPORARY TABLE tCollection;
+	DROP TEMPORARY TABLE tmp.collection;
 
 	IF vHasTooMuchCollections THEN
 		CALL util.throw('There are pending collections');

db/routines/vn/procedures/entry_isEditable.sql

@@ -18,7 +18,7 @@ BEGIN
 			AND e.id = vSelf;
 
 	IF vIsEditable AND NOT IFNULL(@isModeInventory, FALSE) THEN
-		CALL util.throw('Entry is not editable');
+		CALL util.throw(CONCAT('Entry ', vSelf, ' is not editable'));
 	END IF;
 END$$
 DELIMITER ;

db/routines/vn/procedures/entry_splitByShelving.sql

@@ -17,34 +17,19 @@ BEGIN
 		SELECT 	bb.id buyFk,
 				FLOOR(ish.visible / ish.packing) ishStickers,
 				bb.stickers buyStickers
-				FROM vn.itemShelving ish
+			FROM itemShelving ish
 				JOIN (SELECT b.id, b.itemFk, b.stickers 
-						FROM vn.buy b 
+						FROM buy b
 						WHERE b.entryFk = vFromEntryFk
 						ORDER BY b.stickers DESC
 						LIMIT 10000000000000000000) bb ON bb.itemFk = ish.itemFk
 							AND bb.stickers >= FLOOR(ish.visible / ish.packing)
-			WHERE shelvingFk = vShelvingFk COLLATE utf8_general_ci
+			WHERE ish.shelvingFk = vShelvingFk COLLATE utf8_general_ci
+				AND NOT ish.isSplit
 			GROUP BY ish.id;
 			
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
-	-- Cantidades de la matrícula que exceden la de las entradas 
-	SELECT 	ish.itemFk, 
-			i.longName, 
-			FLOOR(ish.visible / ish.packing) AS etiEnMatricula,
-			bb.stickers etiEnEntrada
-				FROM vn.itemShelving ish
-					JOIN vn.item i ON i.id = ish.itemFk 
-				LEFT JOIN (SELECT b.id, b.itemFk, b.stickers 
-						FROM vn.buy b 
-						WHERE b.entryFk = vFromEntryFk
-						ORDER BY b.stickers DESC
-						LIMIT 10000000000000000000) bb ON bb.itemFk = ish.itemFk
-			WHERE shelvingFk = vShelvingFk COLLATE utf8_general_ci
-				AND  IFNULL(bb.stickers,0) < FLOOR(ish.visible / ish.packing)
-			GROUP BY ish.id;
-		
 	OPEN cur;
 
 	read_loop: LOOP
@@ -57,16 +42,16 @@ BEGIN
 		END IF;
 
 		IF vIshStickers =  vBuyStickers THEN
-			UPDATE vn.buy
+			UPDATE buy
 				SET entryFk = vToEntryFk
 				WHERE id = vBuyFk;
 		ELSE
-			UPDATE vn.buy
+			UPDATE buy
 				SET stickers = stickers - vIshStickers,
 					quantity = stickers * packing 
 				WHERE id = vBuyFk;
 
-			INSERT INTO	vn.buy(entryFk,
+			INSERT INTO	buy(entryFk,
 								itemFk,
 								quantity,
 								buyingValue,
@@ -117,13 +102,16 @@ BEGIN
 							weight,
 							deliveryFk,
 							itemOriginalFk
-						FROM vn.buy
+						FROM buy
 						WHERE id = vBuyFk;
 
 			UPDATE buy SET printedStickers = vIshStickers WHERE id = LAST_INSERT_ID();
 		END IF;
-	END LOOP;
 
+		UPDATE itemShelving
+			SET isSplit = TRUE
+				WHERE shelvingFk = vShelvingFk;
+	END LOOP;
 	CLOSE cur;
 END$$
 DELIMITER ;

db/routines/vn/procedures/invoiceIn_booking.sql

@@ -13,20 +13,32 @@ BEGIN
  * @param vBookEntry Id de asiento, si es NULL se genera uno nuevo
  */
 	DECLARE vFiscalYear INT;
-	DECLARE vHasDistinctTransactions INT;
+	DECLARE vDistinctTransactions INT;
+	DECLARE vHasRepeatedTransactions BOOL;
 
-	SELECT COUNT(DISTINCT transactionTypeSageFk) INTO vHasDistinctTransactions
+	SELECT COUNT(DISTINCT iit.transactionTypeSageFk) INTO vDistinctTransactions
 		FROM invoiceIn ii
 			JOIN invoiceInTax iit ON iit.invoiceInFk = ii.id
 			JOIN invoiceInSerial iis ON iis.code = ii.serial 
-		WHERE ii.id = vSelf
+		WHERE iit.invoiceInFk = vSelf
 			AND iis.taxAreaFk = 'CEE'
-			AND transactionTypeSageFk;
+			AND iit.transactionTypeSageFk;
 
-	IF vHasDistinctTransactions > 1 THEN 
+	IF vDistinctTransactions > 1 THEN 
 		CALL util.throw ('This invoice does not allow different types of transactions');
 	END IF;
 
+	SELECT TRUE INTO vHasRepeatedTransactions
+		FROM invoiceInTax
+		WHERE invoiceInFk = vSelf
+		GROUP BY transactionTypeSageFk
+		HAVING COUNT(transactionTypeSageFk) > 1
+		LIMIT 1;
+
+	IF vHasRepeatedTransactions THEN 
+		CALL util.throw ('This invoice contains repeated types of transactions');
+	END IF;
+
 	CREATE OR REPLACE TEMPORARY TABLE tInvoiceIn
 		ENGINE = MEMORY
 		SELECT ii.bookEntried,

db/routines/vn/procedures/productionControl.sql

@@ -15,6 +15,11 @@ proc: BEGIN
 	DECLARE vEndingDate DATETIME;
 	DECLARE vIsTodayRelative BOOLEAN;
 
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		RESIGNAL;
+	END;
+
 	SELECT util.dayEnd(util.VN_CURDATE()) + INTERVAL LEAST(vScopeDays, maxProductionScopeDays) DAY
 		INTO vEndingDate
 		FROM productionConfig;
@@ -31,7 +36,8 @@ proc: BEGIN
 	CALL prepareClientList();
 
 	CREATE OR REPLACE TEMPORARY TABLE tmp.sale_getProblems
-		(INDEX (ticketFk)) ENGINE = MEMORY
+		(INDEX (ticketFk))
+		ENGINE = MEMORY
 		SELECT tt.ticketFk, tt.clientFk, t.warehouseFk, t.shipped
 			FROM tmp.productionTicket tt
 				JOIN ticket t ON t.id = tt.ticketFk;

db/routines/vn/procedures/sale_getProblems.sql

@@ -282,8 +282,7 @@ BEGIN
 				FROM (
 					SELECT tl.ticketFk, 
 							s.id saleFk,
-							LEFT(GROUP_CONCAT('RE: ',i.id, ' ',  IFNULL(i.longName,''), ' '), 250) problem, 
+							LEFT(GROUP_CONCAT('RE: ',i.id, ' ',  IFNULL(i.longName,'') SEPARATOR ', '), 250) problem
-							MOD(s.quantity, b.`grouping`) hasRounding
 						FROM tmp.ticket_list tl
 							JOIN ticket t ON t.id = tl.ticketFk 
 								AND t.warehouseFk = vWarehouseFk
@@ -291,8 +290,8 @@ BEGIN
 							JOIN item i ON i.id = s.itemFk
 							JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk
 							JOIN buy b ON b.id = bu.buyFk
+						WHERE MOD(s.quantity, b.`grouping`)	
 						GROUP BY tl.ticketFk
-						HAVING hasRounding
 				)sub 
 			ON DUPLICATE KEY UPDATE hasRounding = sub.problem, saleFk = sub.saleFk;
 	END LOOP;

db/routines/vn/procedures/ticket_Clone.sql

@@ -9,6 +9,11 @@ BEGIN
  */
 	DECLARE vStateFk INT;
 
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		RESIGNAL;
+	END;
+
 	INSERT INTO ticket (
 		clientFk,
 		shipped,

db/routines/vn/procedures/workerTimeControl_direction.sql

@@ -9,6 +9,8 @@ BEGIN
  */
 	DECLARE vLastIn DATETIME ;
 	DECLARE vIsMiddleOdd BOOLEAN ;
+	DECLARE vMailTo VARCHAR(50) DEFAULT NULL;
+	DECLARE vUserName VARCHAR(50) DEFAULT NULL;
 
 	IF (vTimed IS NULL) THEN 
 		SET vTimed = util.VN_NOW();
@@ -57,5 +59,18 @@ BEGIN
 			VALUES('in', NULL);
 	END IF;
 
+	IF (SELECT option1 IS NULL AND option2 IS NULL FROM  tmp.workerTimeControlDirection) THEN
+		SELECT CONCAT(u.name, '@verdnatura.es'), CONCAT(w.firstName, ' ', w.lastName)
+				INTO vMailTo, vUserName
+			FROM account.user u
+				JOIN worker w ON w.bossFk = u.id
+			WHERE w.id = vWorkerFk;
+
+		CALL mail_insert( 
+			vMailTo, 
+			vMailTo, 
+			'Error al fichar', 
+			CONCAT(vUserName, ' tiene problemas para fichar'));
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/entry_beforeUpdate.sql

@@ -11,11 +11,9 @@ BEGIN
 	IF NEW.isBooked = OLD.isBooked AND (
 			NOT (NEW.supplierFk <=> OLD.supplierFk) OR
 			NOT (NEW.dated <=> OLD.dated) OR
-			NOT (NEW.invoiceNumber <=> OLD.invoiceNumber) OR
 			NOT (NEW.travelFk <=> OLD.travelFk) OR
 			NOT (NEW.companyFk <=> OLD.companyFk) OR
 			NOT (NEW.invoiceInFk <=> OLD.invoiceInFk) OR
-			NOT (NEW.invoiceAmount <=> OLD.invoiceAmount) OR
 			NOT (NEW.typeFk <=> OLD.typeFk)
 		) THEN
 

db/versions/11131-brownPhormium/00-firstScript.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.itemShelving ADD isSplit tinyint(1) NULL COMMENT 'Este valor cambia al splitar un carro que se ha quedado en holanda';

db/versions/11134-silverRaphis/00-firstScript.sql

@@ -0,0 +1,42 @@
+USE `vn`;
+
+CREATE TABLE IF NOT EXISTS vn.`tillSerial` (
+  `code` varchar(2) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `description` varchar(30) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `account` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES(' S', 'Saldos final / inicial', NULL);
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('A', 'Factura cliente', NULL);
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('B', 'Factura cliente', NULL);
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('C', 'Facturas Contado', NULL);
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('CC', 'Cuadre caja', '6780000000');
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('CD', 'Cuenta Director Comercial', '5510000002');
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('CH', 'Cheques', NULL);
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('CM', 'Cambio', NULL);
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('CR', 'Ingreso/Reintegro Caja Rural', NULL);
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('CT', 'Correos y telégrafos', '6290000005');
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('DC', 'Dietas conductores', '6290000010');
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('DH', 'Deudas Holland', NULL);
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('DT', 'Dietas', '6290000011');
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('E', 'Entrada mercancia', NULL);
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('EN', 'Enric Martinez', NULL);
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('GC', 'Cuenta con dto. Comercial', '5510000003');
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('GP', 'Gastos de personal', NULL);
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('GR', 'Gastos RRPP dpto comercial', '6290001002');
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('GS', 'Gasoil', '6280000002');
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('GV', 'Gastos viaje', '6290001000');
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('JV', 'Juanvi', '6290000553');
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('MB', 'Movimiento bancario', NULL);
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('MP', 'Materias Primas', '6000000000');
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('OG', 'Otros gastos', '6290000000');
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('PM', 'Pequeño material', '6290000007');
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('R', 'Factura proveedor', NULL);
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('RC', 'Ingreso/Reintegro Ruralcaja', NULL);
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('RN', 'Reparación nave', '6220000004');
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('SS', 'Gastos Silla', NULL);
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('T', 'Ticket', NULL);
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('TA', 'Factura rapida', NULL);
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('TC', 'Ticket contado', NULL);
+INSERT IGNORE vn.tillSerial (code, `description`, account) VALUES('TR', 'Traspaso', NULL);

db/versions/11137-salmonRoebelini/00-firstScript.sql

@@ -0,0 +1,4 @@
+ALTER TABLE vn.expeditionState
+    MODIFY COLUMN userFk INT(10) UNSIGNED,
+	ADD CONSTRAINT expeditionState_userFk FOREIGN KEY (userFk)
+		REFERENCES account.`user`(id);

modules/entry/back/methods/entry/filter.js

@@ -146,10 +146,11 @@ module.exports = Self => {
         });
         filter = mergeFilters(ctx.args.filter, {where});
         const userId = ctx.req.accessToken.userId;
-        const isSupplier = await Self.app.models.Supplier.findById(userId, myOptions);
+        const client = await Self.app.models.Client.findById(userId, myOptions);
-        if (isSupplier) {
+        const supplier = await Self.app.models.Supplier.findOne({where: {nif: client.fi}}, myOptions);
+        if (supplier) {
             if (!filter.where) filter.where = {};
-            filter.where[`e.supplierFk`] = ctx.req.accessToken.userId;
+            filter.where[`e.supplierFk`] = supplier.id;
         }
         const stmts = [];
         let stmt;

modules/entry/back/methods/entry/getBuys.js

@@ -36,9 +36,10 @@ module.exports = Self => {
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
-        const isSupplier = await Self.app.models.Supplier.findById(userId, myOptions);
+        const client = await Self.app.models.Client.findById(userId, myOptions);
-        if (isSupplier) {
+        const supplier = await Self.app.models.Supplier.findOne({where: {nif: client.fi}}, myOptions);
-            const isEntryOwner = (await Self.findById(id)).supplierFk === userId;
+        if (supplier) {
+            const isEntryOwner = (await Self.findById(id)).supplierFk === supplier.id;
 
             if (!isEntryOwner) throw new UserError('Access Denied');
         }

modules/entry/back/methods/entry/specs/filter.spec.js

@@ -56,7 +56,7 @@ describe('Entry filter()', () => {
             try {
                 const ctx = {
                     args: {},
-                    req: {accessToken: {userId: 2}}
+                    req: {accessToken: {userId: 1102}}
                 };
 
                 const result = await models.Entry.filter(ctx, options);
@@ -79,7 +79,7 @@ describe('Entry filter()', () => {
                     args: {
                         supplierFk: 1
                     },
-                    req: {accessToken: {userId: 2}}
+                    req: {accessToken: {userId: 1102}}
                 };
 
                 const result = await models.Entry.filter(ctx, options);

modules/entry/back/methods/entry/specs/getBuys.spec.js

@@ -40,7 +40,7 @@ describe('entry getBuys()', () => {
                     args: {
                         search: 1
                     },
-                    req: {accessToken: {userId: 2}}
+                    req: {accessToken: {userId: 1102}}
                 };
 
                 const result = await models.Entry.getBuys(ctx, entryId, options);

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

@@ -66,6 +66,10 @@ module.exports = Self => {
                 promises.push(deletedSale);
             }
 
+            const deletedSales = await Promise.all(promises);
+
+            if (tx) await tx.commit();
+
             const salesPerson = ticket.client().salesPersonUser();
             if (salesPerson) {
                 const url = await Self.app.models.Url.getUrl();
@@ -75,13 +79,9 @@ module.exports = Self => {
                     ticketUrl: `${url}ticket/${ticketId}/sale`,
                     deletions: deletions
                 });
-                await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message, myOptions);
+                await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message);
             }
 
-            const deletedSales = await Promise.all(promises);
-
-            if (tx) await tx.commit();
-
             return deletedSales;
         } catch (e) {
             if (tx) await tx.rollback();

print/templates/reports/buy-label/buy-label.html

@@ -59,7 +59,7 @@
         <tr>
             <td colspan="3" class="barcode">
                 <div v-html="getBarcode(buy.id)"></div>
-                <span>{{buy.id}}</span>
+                <span>{{buy.itemFk}}</span>
             </td>
         </tr>
         <tr>

print/templates/reports/buy-label/sql/buys.sql

@@ -8,6 +8,7 @@ SELECT ROW_NUMBER() OVER(ORDER BY b.id) labelNum,
 		b.`grouping`,
 		i.stems,
 		b.id,
+		b.itemFk,
 		p.name producer
 	FROM buy b
 		JOIN item i ON i.id = b.itemFk

print/templates/reports/sepa-core/sepa-core.html

@@ -27,8 +27,7 @@
                             <tr>
                                 <td>{{$t('supplier.identifier')}}</td>
                                 <th>
-                                    <div>{{supplier.iban}}</div>
+                                    <div>{{supplier.accountDetailValue.join(', ')}}</div>
-                                    <div>{{supplier.nif}}</div>
                                 </th>
                             </tr>
                             <tr>

print/templates/reports/sepa-core/sepa-core.js

@@ -7,7 +7,11 @@ module.exports = {
     async serverPrefetch() {
         this.client = await this.findOneFromDef('client', [this.companyId, this.companyId, this.id]);
         this.checkMainEntity(this.client);
-        this.supplier = await this.findOneFromDef('supplier', [this.companyId, this.companyId, this.id]);
+        const suppliers = await this.rawSqlFromDef('supplier', [this.companyId, this.companyId, this.id]);
+        this.supplier = {
+            ...suppliers[0],
+            accountDetailValue: suppliers.map(val => val?.accountDetailValue)
+        };
     },
     props: {
         id: {
@@ -23,11 +27,11 @@ module.exports = {
     methods: {
         getSupplierCif() {
             return db.findOne(`
-            SELECT sa.iban, s.nif
+            SELECT DISTINCT ad.value
                 FROM supplierAccount sa
-                JOIN company co ON co.supplierAccountFk = sa.id
+                    JOIN accountDetail ad ON ad.supplierAccountFk = sa.id
-                JOIN supplier s ON sa.supplierFk = s.id
+                    JOIN accountDetailType adt ON adt.id = ad.accountDetailTypeFk AND adt.id = 3
-                WHERE co.id = ?`) [this.companyId];
+                WHERE sa.supplierFk = ?`) [this.companyId];
         }
     }
 

print/templates/reports/sepa-core/sql/supplier.sql

@@ -9,7 +9,8 @@ SELECT
     s.nif,
     sa.iban,
     sa.supplierFk,
-    be.name bankName
+    be.name bankName,
+    ad.value accountDetailValue
 FROM
     client c
     LEFT JOIN mandate m ON m.clientFk = c.id AND m.companyFk = ? AND m.finished IS NULL
@@ -19,9 +20,10 @@ FROM
     LEFT JOIN province p ON p.id = c.provinceFk
     LEFT JOIN supplierAccount sa ON sa.supplierFk = s.id
     LEFT JOIN bankEntity be ON sa.bankEntityFk = be.id
+    LEFT JOIN accountDetail ad ON ad.supplierAccountFk = sa.id
+    LEFT JOIN accountDetailType adt ON adt.id = ad.accountDetailTypeFk AND adt.id = 3
 WHERE
     (m.companyFk = ? OR m.companyFk IS NULL)
     AND (c.id = ? OR (c.id IS NULL AND c.countryFk = sa.countryFk))
 ORDER BY
-    m.created DESC
+    m.created DESC;
-LIMIT 1;