verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 65 Releases Wiki Activity

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness
gitea/salix/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Carlos Satorres 2024-12-23 13:30:27 +01:00
parent e2a4c5339a 549cb7633e
commit 6f16974320
48 changed files with 767 additions and 280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
db/dump/fixtures.before.sql
View File

@ -1922,7 +1922,7 @@ INSERT INTO `vn`.`claimDestination`(`id`, `description`, `addressFk`)
INSERT INTO `vn`.`claimDevelopment`(`id`, `claimFk`, `claimResponsibleFk`, `workerFk`, `claimReasonFk`, `claimResultFk`, `claimRedeliveryFk`, `claimDestinationFk`) INSERT INTO `vn`.`claimDevelopment`(`id`, `claimFk`, `claimResponsibleFk`, `workerFk`, `claimReasonFk`, `claimResultFk`, `claimRedeliveryFk`, `claimDestinationFk`)
VALUES VALUES
(1, 1, 1, 21, 1, 1, 2, 5), (1, 1, 1, 21, 7, 1, 2, 5),
(2, 1, 2, 21, 7, 2, 2, 5), (2, 1, 2, 21, 7, 2, 2, 5),
(3, 2, 7, 21, 9, 3, 2, 5), (3, 2, 7, 21, 9, 3, 2, 5),
(4, 3, 7, 21, 15, 8, 2, 5), (4, 3, 7, 21, 15, 8, 2, 5),
@ -4038,6 +4038,11 @@ INSERT IGNORE INTO vn.saySimpleConfig (url, defaultChannel)
INSERT INTO vn.workerIrpf (workerFk,spouseNif, geographicMobilityDate) INSERT INTO vn.workerIrpf (workerFk,spouseNif, geographicMobilityDate)
VALUES (1106,'26493101E','2019-09-20'); VALUES (1106,'26493101E','2019-09-20');
INSERT INTO vn.referenceRate (currencyFk, dated, value)
VALUES (2, '2000-12-01', 1.0495),
(2, '2001-01-01', 1.0531),
(2, '2001-02-01', 7.6347);
INSERT IGNORE INTO vn.osrmConfig (id,url,tolerance) INSERT IGNORE INTO vn.osrmConfig (id,url,tolerance)
VALUES (1,'https://router.project-osrm.org', 0.002); VALUES (1,'https://router.project-osrm.org', 0.002);

2
db/routines/hedera/procedures/order_confirmWithUser.sql
View File

@ -107,7 +107,7 @@ BEGIN
) INTO vHas0Amount; ) INTO vHas0Amount;
IF vHas0Amount THEN IF vHas0Amount THEN
CALL util.throw('Hay líneas vacías. Por favor, elimínelas'); CALL util.throw('orderLinesWithZero');
END IF; END IF;
START TRANSACTION; START TRANSACTION;

11
db/routines/sage/procedures/invoiceIn_add.sql
View File

@ -4,8 +4,8 @@ BEGIN
/** /**
* Traslada la info de contabilidad relacionada con las facturas recibidas * Traslada la info de contabilidad relacionada con las facturas recibidas
* *
* @vInvoiceInFk Factura recibida * @param vInvoiceInFk Factura recibida
* @vXDiarioFk Id tabla XDiario * @param vXDiarioFk Id tabla XDiario
*/ */
DECLARE vInvoiceInOriginalFk INT; DECLARE vInvoiceInOriginalFk INT;
DECLARE vDone BOOL DEFAULT FALSE; DECLARE vDone BOOL DEFAULT FALSE;
@ -205,9 +205,9 @@ BEGIN
WHERE correctingFk = vInvoiceInFk; WHERE correctingFk = vInvoiceInFk;
IF vInvoiceInOriginalFk THEN IF vInvoiceInOriginalFk THEN
UPDATE movContaIVA mci UPDATE movContaIVA mci
JOIN vn.invoiceInRefund iir ON iir.invoiceInRefundFk = vInvoiceInFk JOIN vn.invoiceInCorrection iic ON iic.correctingFk = vInvoiceInFk
JOIN vn.siiTypeInvoiceIn st ON st.id = iic.siiTypeInvoiceInFk
JOIN (SELECT issued, JOIN (SELECT issued,
SUM(sub.taxableBase) taxableBase, SUM(sub.taxableBase) taxableBase,
SUM(ROUND((sub.taxableBase * sub.PorcentajeIva) / 100 , 2)) vat SUM(ROUND((sub.taxableBase * sub.PorcentajeIva) / 100 , 2)) vat
@ -216,7 +216,7 @@ BEGIN
ti.PorcentajeIva ti.PorcentajeIva
FROM vn.invoiceIn i FROM vn.invoiceIn i
JOIN vn.invoiceInTax iit ON iit.invoiceInFk = i.id JOIN vn.invoiceInTax iit ON iit.invoiceInFk = i.id
JOIN sage.TiposIva ti ON ti.CodigoIva = iit.taxTypeSageFk JOIN TiposIva ti ON ti.CodigoIva = iit.taxTypeSageFk
WHERE i.id = vInvoiceInOriginalFk WHERE i.id = vInvoiceInOriginalFk
GROUP BY ti.CodigoIva)sub GROUP BY ti.CodigoIva)sub
)invoiceInOriginal )invoiceInOriginal
@ -229,7 +229,6 @@ BEGIN
mci.CuotaIvaOriginal = invoiceInOriginal.vat, mci.CuotaIvaOriginal = invoiceInOriginal.vat,
mci.ClaveOperacionFactura = co.ClaveOperacionFactura_ mci.ClaveOperacionFactura = co.ClaveOperacionFactura_
WHERE mci.id = vXDiarioFk; WHERE mci.id = vXDiarioFk;
END IF; END IF;
END$$ END$$
DELIMITER ; DELIMITER ;

5
db/routines/sage/procedures/invoiceOut_add.sql
View File

@ -169,6 +169,7 @@ BEGIN
UPDATE movContaIVA mci UPDATE movContaIVA mci
JOIN vn.invoiceOut i ON i.id = vInvoiceOutCorrectedFk JOIN vn.invoiceOut i ON i.id = vInvoiceOutCorrectedFk
JOIN vn.invoiceCorrection ic ON ic.correctedFk = vInvoiceOutCorrectedFk JOIN vn.invoiceCorrection ic ON ic.correctedFk = vInvoiceOutCorrectedFk
JOIN vn.siiTypeInvoiceOut st ON st.id = ic.siiTypeInvoiceOutFk
JOIN (SELECT SUM(IF(IFNULL(e.vatFk, TRUE), iot.taxableBase, 0)) taxableBase, JOIN (SELECT SUM(IF(IFNULL(e.vatFk, TRUE), iot.taxableBase, 0)) taxableBase,
SUM(IF(IFNULL(e.vatFk, TRUE), iot.vat, 0)) vat, SUM(IF(IFNULL(e.vatFk, TRUE), iot.vat, 0)) vat,
SUM(IF(IFNULL(e.vatFk, TRUE), 0, iot.vat)) equ SUM(IF(IFNULL(e.vatFk, TRUE), 0, iot.vat)) equ
@ -177,8 +178,8 @@ BEGIN
WHERE iot.invoiceOutFk = vInvoiceOutCorrectedFk WHERE iot.invoiceOutFk = vInvoiceOutCorrectedFk
) tax ) tax
JOIN ClavesOperacion co ON co.Descripcion = 'Factura rectificativa' JOIN ClavesOperacion co ON co.Descripcion = 'Factura rectificativa'
SET mci.TipoRectificativa = 2, SET mci.TipoRectificativa = ic.cplusRectificationTypeFk,
mci.ClaseAbonoRectificativas = 1, mci.ClaseAbonoRectificativas = REGEXP_REPLACE(st.`code`, '[^0-9]', ''),
mci.FechaFacturaOriginal = i.issued, mci.FechaFacturaOriginal = i.issued,
mci.FechaOperacion = i.issued, mci.FechaOperacion = i.issued,
mci.BaseImponibleOriginal = tax.taxableBase, mci.BaseImponibleOriginal = tax.taxableBase,

48
db/routines/vn/procedures/inventoryFailureAdd.sql
View File

@ -1,48 +0,0 @@
DELIMITER $$
CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`inventoryFailureAdd`()
BEGIN
DECLARE done BOOL DEFAULT FALSE;
DECLARE vTicketFk INT;
DECLARE rs CURSOR FOR
SELECT id FROM vn.ticket
WHERE shipped = util.yesterday()
AND clientFk = 400
AND warehouseFk IN (1,44);
DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
OPEN rs;
FETCH rs INTO vTicketFk;
WHILE NOT done DO
INSERT INTO vn.inventoryFailure(dated, itemFk, quantity, value, warehouseFk, throwerFk)
SELECT t.shipped,
s.itemFk,
s.quantity,
b.buyingValue + b.freightValue + b.packageValue + b.comissionValue,
t.warehouseFk,
w.id
FROM vn.ticket t
JOIN vn.sale s ON s.ticketFk = t.id
LEFT JOIN cache.last_buy lb ON lb.warehouse_id = t.warehouseFk AND item_id = s.itemFk
LEFT JOIN vn.buy b ON b.id = lb.buy_id
LEFT JOIN vn.worker w ON w.code = LEFT(s.concept, 3)
WHERE t.id = vTicketFk
AND s.quantity > 0;
FETCH rs INTO vTicketFk;
END WHILE;
CLOSE rs;
END$$
DELIMITER ;

3
db/routines/vn/procedures/invoiceIn_booking.sql
View File

@ -43,7 +43,7 @@ BEGIN
ii.cplusTaxBreakFk, ii.cplusTaxBreakFk,
ii.cplusSubjectOpFk, ii.cplusSubjectOpFk,
ii.siiTypeInvoiceInFk, ii.siiTypeInvoiceInFk,
ii.cplusRectificationTypeFk, ic.cplusRectificationTypeFk,
ii.booked, ii.booked,
IFNULL(a.isUeeMember, c.isUeeMember) isUeeMember, IFNULL(a.isUeeMember, c.isUeeMember) isUeeMember,
(c.id = cc.id) isSameCountry, (c.id = cc.id) isSameCountry,
@ -66,6 +66,7 @@ BEGIN
e.name expenseName e.name expenseName
FROM invoiceIn ii FROM invoiceIn ii
JOIN supplier s ON s.id = ii.supplierFk JOIN supplier s ON s.id = ii.supplierFk
LEFT JOIN invoiceInCorrection ic ON ic.correctingFk = ii.id
LEFT JOIN province p ON p.id = s.provinceFk LEFT JOIN province p ON p.id = s.provinceFk
LEFT JOIN autonomy a ON a.id = p.autonomyFk LEFT JOIN autonomy a ON a.id = p.autonomyFk
JOIN country c ON c.id = s.countryFk JOIN country c ON c.id = s.countryFk

4
db/routines/vn/procedures/item_cleanFloramondo.sql
View File

@ -164,10 +164,6 @@ BEGIN
SET itemFk = vItemNew SET itemFk = vItemNew
WHERE itemFk = vItemOld; WHERE itemFk = vItemOld;
UPDATE inventoryFailure
SET itemFk = vItemNew
WHERE itemFk = vItemOld;
UPDATE genericAllocation UPDATE genericAllocation
SET itemFk = vItemNew SET itemFk = vItemNew
WHERE itemFk = vItemOld; WHERE itemFk = vItemOld;

7
db/routines/vn/procedures/ticket_canAdvance.sql
View File

@ -52,7 +52,8 @@ BEGIN
IFNULL(dest.nickname, origin.nickname) nickname, IFNULL(dest.nickname, origin.nickname) nickname,
dest.landed, dest.landed,
dest.preparation, dest.preparation,
origin.departmentFk origin.departmentFk,
origin.saleClonedFk
FROM ( FROM (
SELECT s.ticketFk, SELECT s.ticketFk,
c.salesPersonFk workerFk, c.salesPersonFk workerFk,
@ -73,11 +74,13 @@ BEGIN
t.warehouseFk, t.warehouseFk,
t.companyFk, t.companyFk,
t.agencyModeFk, t.agencyModeFk,
wd.departmentFk wd.departmentFk,
sc.saleClonedFk
FROM ticket t FROM ticket t
JOIN client c ON c.id = t.clientFk JOIN client c ON c.id = t.clientFk
JOIN workerDepartment wd ON wd.workerFk = c.salesPersonFk JOIN workerDepartment wd ON wd.workerFk = c.salesPersonFk
JOIN sale s ON s.ticketFk = t.id JOIN sale s ON s.ticketFk = t.id
LEFT JOIN saleCloned sc ON sc.saleClonedFk = s.id
JOIN saleVolume sv ON sv.saleFk = s.id JOIN saleVolume sv ON sv.saleFk = s.id
JOIN item i ON i.id = s.itemFk JOIN item i ON i.id = s.itemFk
JOIN ticketState ts ON ts.ticketFk = t.id JOIN ticketState ts ON ts.ticketFk = t.id

18
db/routines/vn/triggers/invoiceIn_afterUpdate.sql
View File

@ -3,24 +3,30 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`invoiceIn_afterUpdate`
AFTER UPDATE ON `invoiceIn` AFTER UPDATE ON `invoiceIn`
FOR EACH ROW FOR EACH ROW
BEGIN BEGIN
IF NEW.issued != OLD.issued DECLARE vIsEuro BOOL;
OR NEW.currencyFk != OLD.currencyFk THEN
SELECT `code` = 'EUR' INTO vIsEuro
FROM currency
WHERE id = NEW.currencyFk;
IF (NOT NEW.issued <=> OLD.issued
OR NEW.currencyFk <> OLD.currencyFk) THEN
UPDATE invoiceInTax iit UPDATE invoiceInTax iit
JOIN invoiceIn ii ON ii.id = iit.invoiceInFk JOIN invoiceIn ii ON ii.id = iit.invoiceInFk
LEFT JOIN referenceRate rr ON rr.dated = ii.issued LEFT JOIN referenceRate rr ON rr.dated = ii.issued
AND rr.currencyFk = ii.currencyFk AND rr.currencyFk = ii.currencyFk
SET iit.taxableBase = IF(iit.foreignValue IS NULL, iit.taxableBase, iit.foreignValue / rr.value) SET iit.taxableBase = IF(vIsEuro, iit.taxableBase, iit.foreignValue / rr.value),
iit.foreignValue = IF(vIsEuro, NULL, iit.foreignValue)
WHERE ii.id = NEW.id; WHERE ii.id = NEW.id;
UPDATE invoiceInDueDay iidd UPDATE invoiceInDueDay iidd
JOIN invoiceIn ii ON ii.id = iidd.invoiceInFk JOIN invoiceIn ii ON ii.id = iidd.invoiceInFk
LEFT JOIN referenceRate rr ON rr.dated = ii.issued LEFT JOIN referenceRate rr ON rr.dated = ii.issued
AND rr.currencyFk = ii.currencyFk AND rr.currencyFk = ii.currencyFk
SET iidd.amount = IF(iidd.foreignValue IS NULL, iidd.amount, iidd.foreignValue / rr.value) SET iidd.amount = IF(vIsEuro, iidd.amount, iidd.foreignValue / rr.value),
iidd.foreignValue = IF(vIsEuro, NULL, iidd.foreignValue)
WHERE ii.id = NEW.id; WHERE ii.id = NEW.id;
END IF; END IF;
END$$ END$$
DELIMITER ; DELIMITER ;

11
db/versions/11320-salmonRose/00-firstScript.sql Normal file
View File

@ -0,0 +1,11 @@
INSERT INTO hedera.message (code, description)
VALUES ('orderLinesWithZero','There are empty lines. Please delete them');
INSERT INTO hedera.messageI18n (code, lang, description)
VALUES ('orderLinesWithZero','es','Hay líneas vacías. Por favor, elimínelas');
INSERT INTO hedera.messageI18n (code, lang, description)
VALUES ('orderLinesWithZero','fr','Il y a des lignes vides. Veuillez les supprimer');
INSERT INTO hedera.messageI18n (code, lang, description)
VALUES ('orderLinesWithZero','pt','Existem linhas vazias. Por favor, apague-os');

318
db/versions/11327-maroonOak/00-firstScript.sql
View File

@ -2,8 +2,8 @@ CREATE TABLE IF NOT EXISTS `vn`.`sim` (
`code` VARCHAR(25) COMMENT 'No se ha puesto BIGINT por incompatibilidad con Access', `code` VARCHAR(25) COMMENT 'No se ha puesto BIGINT por incompatibilidad con Access',
`line` VARCHAR(15) NOT NULL CHECK (`line` REGEXP '^[0-9]+$'), `line` VARCHAR(15) NOT NULL CHECK (`line` REGEXP '^[0-9]+$'),
`ext` INT(4) NOT NULL, `ext` INT(4) NOT NULL,
`pin` INT(4) NOT NULL, `pin` VARCHAR(4) NOT NULL CHECK (`pin` REGEXP '^[0-9]+$'),
`puk` INT(15) NOT NULL, `puk` VARCHAR(15) NOT NULL CHECK (`pin` REGEXP '^[0-9]+$'),
PRIMARY KEY (`code`) PRIMARY KEY (`code`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
@ -11,163 +11,163 @@ ALTER TABLE vn.deviceProductionUser CHANGE simSerialNumber simFk VARCHAR(25) DEF
ALTER TABLE vn.deviceProductionUser MODIFY COLUMN simFk VARCHAR(25) DEFAULT NULL NULL; ALTER TABLE vn.deviceProductionUser MODIFY COLUMN simFk VARCHAR(25) DEFAULT NULL NULL;
INSERT IGNORE INTO `vn`.`sim` (`line`, `ext`, `pin`, `code`, `puk`) VALUES INSERT IGNORE INTO `vn`.`sim` (`line`, `ext`, `pin`, `code`, `puk`) VALUES
('621188151', 2209, 1486, '3456985220092508',14213470), ('621188151', 2209, '1486', '3456985220092508','14213470'),
('621188152', 2210, 8765, '3456985220092509',99473093), ('621188152', 2210, '8765', '3456985220092509','99473093'),
('621188153', 2211, 3064, '3456985220092510',52967210), ('621188153', 2211, '3064', '3456985220092510','52967210'),
('621188759', 2081, 3700, '3456985220123637',56600999), ('621188759', 2081, '3700', '3456985220123637','56600999'),
('621188760', 2082, 3259, '345698522023638',87492404), ('621188760', 2082, '3259', '345698522023638','87492404'),
('621188761', 2083, 2790, '3456985220123639',94009456), ('621188761', 2083, '2790', '3456985220123639','94009456'),
('621188762', 2084, 2480, '3456985220123644',1484999), ('621188762', 2084, '2480', '3456985220123644','1484999'),
('621188763', 2085, 6876, '3456985220123641',36577064), ('621188763', 2085, '6876', '3456985220123641','36577064'),
('621188766', 2086, 7775, '3456985220123642',80761698), ('621188766', 2086, '7775', '3456985220123642','80761698'),
('621188769', 2088, 4027, '3456985220123643',37921712), ('621188769', 2088, '4027', '3456985220123643','37921712'),
('621188771', 2089, 8797, '3456985220123640',63092540), ('621188771', 2089, '8797', '3456985220123640','63092540'),
('621188772', 2090, 8404, '3456985220123645',21014997), ('621188772', 2090, '8404', '3456985220123645','21014997'),
('621188773', 2091, 5481, '3456985220123646',16317277), ('621188773', 2091, '5481', '3456985220123646','16317277'),
('621188774', 2092, 9632, '3456985220123647',22235994), ('621188774', 2092, '9632', '3456985220123647','22235994'),
('621188775', 2093, 4654, '3456985220123648',28506486), ('621188775', 2093, '4654', '3456985220123648','28506486'),
('621188838', 2094, 1392, '3456985220123649',29498627), ('621188838', 2094, '1392', '3456985220123649','29498627'),
('621188839', 2095, 7774, '3456985220123650',46263490), ('621188839', 2095, '7774', '3456985220123650','46263490'),
('621188840', 2096, 7304, '3456985220123658',8212044), ('621188840', 2096, '7304', '3456985220123658','8212044'),
('621188841', 2097, 5569, '3456985220123652',81597658), ('621188841', 2097, '5569', '3456985220123652','81597658'),
('621188842', 2098, 4944, '3456985220123653',24961501), ('621188842', 2098, '4944', '3456985220123653','24961501'),
('621188843', 2099, 5142, '3456985220123654',17035634), ('621188843', 2099, '5142', '3456985220123654','17035634'),
('621188844', 2111, 7245, '3456985220123655',90231951), ('621188844', 2111, '7245', '3456985220123655','90231951'),
('621188846', 2110, 6590, '3456985220123656',72201537), ('621188846', 2110, '6590', '3456985220123656','72201537'),
('667680207', 2564, 4042, '34569832200759166',48401979), ('667680207', 2564, '4042', '34569832200759166','48401979'),
('667680315', 2565, 7143, '34569832200759372',32143252), ('667680315', 2565, '7143', '34569832200759372','32143252'),
('667680318', 2566, 6342, '34569832200759364',39597112), ('667680318', 2566, '6342', '34569832200759364','39597112'),
('667680413', 2567, 5580, '34569832200759356',32786992), ('667680413', 2567, '5580', '34569832200759356','32786992'),
('667680463', 2568, 0171, '34569832200759349',34240853), ('667680463', 2568, '0171', '34569832200759349','34240853'),
('667688217', 2569, 2500, '34569832200759331',5687589), ('667688217', 2569, '2500', '34569832200759331','5687589'),
('633603945', 2212, 7129, '34569832200759323',51554019), ('633603945', 2212, '7129', '34569832200759323','51554019'),
('622130186', 2213, 4826, '34569832200759307',19623551), ('622130186', 2213, '4826', '34569832200759307','19623551'),
('633973424', 2214, 8535, '34569832200759299',94619307), ('633973424', 2214, '8535', '34569832200759299','94619307'),
('633703828', 2215, 8628, '34569832200759281',22468012), ('633703828', 2215, '8628', '34569832200759281','22468012'),
('622025110', 2216, 2399, '34569832200759273',34602918), ('622025110', 2216, '2399', '34569832200759273','34602918'),
('622924867', 2217, 5665, '34569832200759265',26920216), ('622924867', 2217, '5665', '34569832200759265','26920216'),
('722409630', 2218, 5211, '34569832200759240',93750137), ('722409630', 2218, '5211', '34569832200759240','93750137'),
('623590529', 2219, 0493, '34569832200759208',47077088), ('623590529', 2219, '0493', '34569832200759208','47077088'),
('633243462', 2220, 6902, '34569832200759174',6421962), ('633243462', 2220, '6902', '34569832200759174','6421962'),
('633047286', 2221, 5592, '34569832200759182',32069439), ('633047286', 2221, '5592', '34569832200759182','32069439'),
('744716801', 2112, 9184, '34569832200759190',57049814), ('744716801', 2112, '9184', '34569832200759190','57049814'),
('655995021', 2131, 8896, '34569852202049093',19497356), ('655995021', 2131, '8896', '34569852202049093','19497356'),
('685522718', 2132, 1955, '34569852202049101',28519879), ('685522718', 2132, '1955', '34569852202049101','28519879'),
('674587213', 2994, 2006, '34569332200223743',62360135), ('674587213', 2994, '2006', '34569332200223743','62360135'),
('674587227', 2993, 9271, '34569332200223750',81628192), ('674587227', 2993, '9271', '34569332200223750','81628192'),
('674587229', 2993, 0900, '34569332200223768',91119071), ('674587229', 2993, '0900', '34569332200223768','91119071'),
('674587231', 2992, 5007, '34569332200223776',45826232), ('674587231', 2992, '5007', '34569332200223776','45826232'),
('674587234', 2991, 1378, '34569332200223784',91245744), ('674587234', 2991, '1378', '34569332200223784','91245744'),
('674587240', 2990, 0905, '34569332200223792',13083224), ('674587240', 2990, '0905', '34569332200223792','13083224'),
('674587245', 2989, 9059, '34569332200223800',15291807), ('674587245', 2989, '9059', '34569332200223800','15291807'),
('674587250', 2988, 8188, '34569332200223818',83017918), ('674587250', 2988, '8188', '34569332200223818','83017918'),
('674587254', 2987, 2962, '34569332200223826',92809271), ('674587254', 2987, '2962', '34569332200223826','92809271'),
('674587256', 2986, 0358, '34569332200223834',81067040), ('674587256', 2986, '0358', '34569332200223834','81067040'),
('674592713', 2570, 2537, '34569332200230672',82325850), ('674592713', 2570, '2537', '34569332200230672','82325850'),
('697832478', 2579, 0936, '34568732200494825',49658372), ('697832478', 2579, '0936', '34568732200494825','49658372'),
('697832176', 2571, 5944, '34568732200494742',19039461), ('697832176', 2571, '5944', '34568732200494742','19039461'),
('697832477', 2572, 5138, '34568732200494759',25712504), ('697832477', 2572, '5138', '34568732200494759','25712504'),
('697832178', 2573, 4597, '34568732200494767',66241760), ('697832178', 2573, '4597', '34568732200494767','66241760'),
('697832182', 2574, 9241, '34568732200494775',07342562), ('697832182', 2574, '9241', '34568732200494775','07342562'),
('697832196', 2575, 2995, '34568732200494783',53929026), ('697832196', 2575, '2995', '34568732200494783','53929026'),
('697832214', 2576, 7434, '34568732200494791',49698432), ('697832214', 2576, '7434', '34568732200494791','49698432'),
('697832230', 2577, 7004, '34568732200494809',21578612), ('697832230', 2577, '7004', '34568732200494809','21578612'),
('697832235', 2578, 9674, '34568732200494817',93090700), ('697832235', 2578, '9674', '34568732200494817','93090700'),
('673420375', 2599, 5430, '34562052300117259',35911412), ('673420375', 2599, '5430', '34562052300117259','35911412'),
('673420367', 2598, 8402, '34562052300117242',924654), ('673420367', 2598, '8402', '34562052300117242','924654'),
('673420361', 2597, 5125, '34562052300117234',12027970), ('673420361', 2597, '5125', '34562052300117234','12027970'),
('673420355', 2596, 5069, '34562052300117226',34978149), ('673420355', 2596, '5069', '34562052300117226','34978149'),
('673420348', 2595, 8911, '34562052300117218',4228121), ('673420348', 2595, '8911', '34562052300117218','4228121'),
('673420346', 2594, 2461, '34562052300117200',67670772), ('673420346', 2594, '2461', '34562052300117200','67670772'),
('673420345', 2593, 2226, '34562052300117192',90586404), ('673420345', 2593, '2226', '34562052300117192','90586404'),
('673420306', 2592, 3355, '34562052300117184',97850017), ('673420306', 2592, '3355', '34562052300117184','97850017'),
('673420257', 2591, 9395, '34562052300117176',50713786), ('673420257', 2591, '9395', '34562052300117176','50713786'),
('673420231', 2590, 1378, '34562052300117168',50151763), ('673420231', 2590, '1378', '34562052300117168','50151763'),
('673420223', 2589, 9580, '34562052300117150',99534550), ('673420223', 2589, '9580', '34562052300117150','99534550'),
('673420216', 2588, 4955, '34562052300117143',317554), ('673420216', 2588, '4955', '34562052300117143','317554'),
('673420203', 2587, 6742, '34562052300117135',69321531), ('673420203', 2587, '6742', '34562052300117135','69321531'),
('673420201', 2586, 1659, '34562052300117127',54720480), ('673420201', 2586, '1659', '34562052300117127','54720480'),
('673420199', 2585, 7823, '34562052300117119',22923796), ('673420199', 2585, '7823', '34562052300117119','22923796'),
('673420198', 2584, 1787, '34562052300117101',54414630), ('673420198', 2584, '1787', '34562052300117101','54414630'),
('673420168', 2583, 6334, '34562052300117093',50694894), ('673420168', 2583, '6334', '34562052300117093','50694894'),
('673420147', 2582, 8951, '34562052300117085',1402535), ('673420147', 2582, '8951', '34562052300117085','1402535'),
('673420125', 2581, 3068, '34562052300117077',86216200), ('673420125', 2581, '3068', '34562052300117077','86216200'),
('673420124', 2580, 9517, '34562052300117069',42504099), ('673420124', 2580, '9517', '34562052300117069','42504099'),
('600294609', 2715, 7474, '34569832304894588',55923317), ('600294609', 2715, '7474', '34569832304894588','55923317'),
('600084713', 2703, 8342, '34569832304894570',8392636), ('600084713', 2703, '8342', '34569832304894570','8392636'),
('600084732', 2704, 1625, '34569832304894513',75477452), ('600084732', 2704, '1625', '34569832304894513','75477452'),
('600084850', 2705, 9896, '34569832304894653',28589813), ('600084850', 2705, '9896', '34569832304894653','28589813'),
('600084951', 2706, 5520, '34569832304894661',75353012), ('600084951', 2706, '5520', '34569832304894661','75353012'),
('600084978', 2707, 2698, '34569832304894679',9005523), ('600084978', 2707, '2698', '34569832304894679','9005523'),
('600085403', 2708, 0837, '34569832304894646',77051152), ('600085403', 2708, '0837', '34569832304894646','77051152'),
('600085513', 2709, 3106, '34569832304894687',41571002), ('600085513', 2709, '3106', '34569832304894687','41571002'),
('600293916', 2712, 8990, '34569832304894620',95188676), ('600293916', 2712, '8990', '34569832304894620','95188676'),
('600294160', 2714, 6376, '34569832304894703',79879896), ('600294160', 2714, '6376', '34569832304894703','79879896'),
('671919529', 2975, 9184, '34569832304806236',7535392), ('671919529', 2975, '9184', '34569832304806236','7535392'),
('671919942', 2981, 0328, '34569832304806269',31052894), ('671919942', 2981, '0328', '34569832304806269','31052894'),
('671919530', 2976, 0344, '34569832304806251',89860304), ('671919530', 2976, '0344', '34569832304806251','89860304'),
('671919533', 2977, 0668, '34569832304806244',42921771), ('671919533', 2977, '0668', '34569832304806244','42921771'),
('671919535', 2978, 0105, '34569832304806277',31009417), ('671919535', 2978, '0105', '34569832304806277','31009417'),
('671919537', 2979, 0881, '34569832304806285',33479769), ('671919537', 2979, '0881', '34569832304806285','33479769'),
('671919540', 2980, 9874, '34569832304806293',14103929), ('671919540', 2980, '9874', '34569832304806293','14103929'),
('671919525', 2972, 2089, '34569832304806301',45903729), ('671919525', 2972, '2089', '34569832304806301','45903729'),
('671919527', 2973, 8206, '34569832304806368',1586035), ('671919527', 2973, '8206', '34569832304806368','1586035'),
('671919528', 2974, 2532, '34569832304806327',62310124), ('671919528', 2974, '2532', '34569832304806327','62310124'),
('673668717', 2836, 7973, '34562032301044223',15635496), ('673668717', 2836, '7973', '34562032301044223','15635496'),
('673668734', 2837, 4457, '34562032301044231',18313118), ('673668734', 2837, '4457', '34562032301044231','18313118'),
('673668738', 2824, 2911, '34562032301044249',30875583), ('673668738', 2824, '2911', '34562032301044249','30875583'),
('673668745', 2838, 7253, '34562032301044256',62754222), ('673668745', 2838, '7253', '34562032301044256','62754222'),
('673668796', 2839, 0068, '34562032301044264',15556829), ('673668796', 2839, '0068', '34562032301044264','15556829'),
('673668803', 2840, 2386, '34562032301044272',17572287), ('673668803', 2840, '2386', '34562032301044272','17572287'),
('673669591', 2850, 3833, '34562032301044280',34828896), ('673669591', 2850, '3833', '34562032301044280','34828896'),
('673668808', 2841, 3584, '34562032301044298',16234497), ('673668808', 2841, '3584', '34562032301044298','16234497'),
('673670102', 2851, 3554, '34562032301044306',23652625), ('673670102', 2851, '3554', '34562032301044306','23652625'),
('673670131', 2852, 4412, '34562032301044314',88611709), ('673670131', 2852, '4412', '34562032301044314','88611709'),
('673670135', 2827, 6058, '34562032301044322',53918579), ('673670135', 2827, '6058', '34562032301044322','53918579'),
('673670201', 2828, 8066, '34562032301044330',92369343), ('673670201', 2828, '8066', '34562032301044330','92369343'),
('673670225', 2829, 4592, '34562032301044348',24126635), ('673670225', 2829, '4592', '34562032301044348','24126635'),
('673670236', 2830, 2974, '34562032301044355',88608465), ('673670236', 2830, '2974', '34562032301044355','88608465'),
('673671485', 2849, 0349, '34562032301044363',44944874), ('673671485', 2849, '0349', '34562032301044363','44944874'),
('673461977', 2871, 1728, '34562032400157090',46975780), ('673461977', 2871, '1728', '34562032400157090','46975780'),
('673461975', 2870, 4734, '34562032400157082',69628432), ('673461975', 2870, '4734', '34562032400157082','69628432'),
('673461972', 2867, 6276, '34562032400157058',53338365), ('673461972', 2867, '6276', '34562032400157058','53338365'),
('673461979', 2872, 6043, '34562032400157108',36525197), ('673461979', 2872, '6043', '34562032400157108','36525197'),
('673461958', 2859, 3164, '34562032400156977',58947831), ('673461958', 2859, '3164', '34562032400156977','58947831'),
('673461957', 2857, 8685, '34562032400156969',15826386), ('673461957', 2857, '8685', '34562032400156969','15826386'),
('673461944', 2853, 1073, '34562032400156910',20452195), ('673461944', 2853, '1073', '34562032400156910','20452195'),
('673461974', 2869, 7121, '34562032400157074',32044645), ('673461974', 2869, '7121', '34562032400157074','32044645'),
('673461973', 2868, 8022, '34562032400157066',29282044), ('673461973', 2868, '8022', '34562032400157066','29282044'),
('673461971', 2866, 3089, '34562032400157041',66149978), ('673461971', 2866, '3089', '34562032400157041','66149978'),
('673461969', 2865, 7555, '34562032400157033',78391293), ('673461969', 2865, '7555', '34562032400157033','78391293'),
('673461960', 2860, 5203, '34562032400156985',37138232), ('673461960', 2860, '5203', '34562032400156985','37138232'),
('673461952', 2855, 6915, '34562032400156936',62724661), ('673461952', 2855, '6915', '34562032400156936','62724661'),
('673461949', 2854, 8706, '34562032400156928',5594345), ('673461949', 2854, '8706', '34562032400156928','5594345'),
('673461966', 2863, 2496, '34562032400157017',93450666), ('673461966', 2863, '2496', '34562032400157017','93450666'),
('673461968', 2864, 3703, '34562032400157025',23208841), ('673461968', 2864, '3703', '34562032400157025','23208841'),
('673461963', 2862, 9364, '34562032400157009',29712130), ('673461963', 2862, '9364', '34562032400157009','29712130'),
('673462719', 2873, 9387, '34562032400156951',50434348), ('673462719', 2873, '9387', '34562032400156951','50434348'),
('673461962', 2861, 8441, '34562032400156993',39686909), ('673461962', 2861, '8441', '34562032400156993','39686909'),
('673461956', 2826, 5392, '34562032400156944',5496107), ('673461956', 2826, '5392', '34562032400156944','5496107'),
('673465284', 2694, 1523, '34562032400171349',14554994), ('673465284', 2694, '1523', '34562032400171349','14554994'),
('673465282', 2692, 4645, '34562032400171323',24871187), ('673465282', 2692, '4645', '34562032400171323','24871187'),
('673465283', 2693, 5253, '34562032400171331',28303238), ('673465283', 2693, '5253', '34562032400171331','28303238'),
('673465841', 2696, 0849, '34562032400171257',21673222), ('673465841', 2696, '0849', '34562032400171257','21673222'),
('673465258', 2679, 4140, '34562032400171174',39793881), ('673465258', 2679, '4140', '34562032400171174','39793881'),
('673465263', 2680, 6922, '34562032400171182',12253261), ('673465263', 2680, '6922', '34562032400171182','12253261'),
('673465265', 2681, 9112, '34562032400171190',93894366), ('673465265', 2681, '9112', '34562032400171190','93894366'),
('673465267', 2682, 3259, '34562032400171208',2342189), ('673465267', 2682, '3259', '34562032400171208','2342189'),
('673465268', 2683, 8540, '34562032400171216',63886925), ('673465268', 2683, '8540', '34562032400171216','63886925'),
('673465285', 2695, 4167, '34562032400171356',79227618), ('673465285', 2695, '4167', '34562032400171356','79227618'),
('673465270', 2684, 4292, '34562032400171224',19216349), ('673465270', 2684, '4292', '34562032400171224','19216349'),
('673465272', 2685, 4007, '34562032400171232',14396903), ('673465272', 2685, '4007', '34562032400171232','14396903'),
('673465273', 2686, 6894, '34562032400171240',13569394), ('673465273', 2686, '6894', '34562032400171240','13569394'),
('673465274', 2687, 5268, '34562032400171265',59453667), ('673465274', 2687, '5268', '34562032400171265','59453667'),
('673465275', 2688, 0232, '34562032400171273',62324713), ('673465275', 2688, '0232', '34562032400171273','62324713'),
('673465276', 2689, 2720, '34562032400171281',65977200), ('673465276', 2689, '2720', '34562032400171281','65977200'),
('673465843', 2698, 4773, '34562032400171364',78387158), ('673465843', 2698, '4773', '34562032400171364','78387158'),
('673465842', 2697, 3729, '34562032400171315',94201789), ('673465842', 2697, '3729', '34562032400171315','94201789'),
('673465280', 2691, 0503, '34562032400171307',12298533), ('673465280', 2691, '0503', '34562032400171307','12298533'),
('673465279', 2690, 8239, '34562032400171299',76183877); ('673465279', 2690, '8239', '34562032400171299','76183877');
UPDATE vn.deviceProductionUser UPDATE vn.deviceProductionUser
SET simFk = NULL SET simFk = NULL

48
db/versions/11368-whiteAspidistra/00-firstScript.sql Normal file
View File

@ -0,0 +1,48 @@
USE vn;
DROP TRIGGER IF EXISTS invoiceIn_beforeUpdate;
UPDATE invoiceIn
SET cplusRectificationTypeFk = NULL
WHERE cplusRectificationTypeFk = 1;
DELETE IGNORE FROM cplusRectificationType WHERE id = 1;
UPDATE cplusRectificationType
SET id = 1
WHERE id = 3;
DELIMITER $$
CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`invoiceIn_beforeUpdate`
BEFORE UPDATE ON `invoiceIn`
FOR EACH ROW
BEGIN
DECLARE vWithholdingSageFk INT;
IF NOT (NEW.supplierRef <=> OLD.supplierRef) AND NOT util.checkPrintableChars(NEW.supplierRef) THEN
CALL util.throw('The invoiceIn reference contains invalid characters');
END IF;
SET NEW.editorFk = account.myUser_getId();
IF (SELECT COUNT(*) FROM invoiceIn
WHERE supplierRef = NEW.supplierRef
AND supplierFk = NEW.supplierFk
AND YEAR(issued) = YEAR(NEW.issued)
AND id <> NEW.id
) THEN
CALL util.throw('reference duplicated');
END IF;
IF NEW.supplierFk != OLD.supplierFk THEN
CALL supplier_checkIsActive(NEW.supplierFk);
SELECT withholdingSageFk INTO vWithholdingSageFk
FROM supplier
WHERE id = NEW.supplierFk;
SET NEW.withholdingSageFk = vWithholdingSageFk;
END IF;
END$$
DELIMITER ;

23
db/versions/11368-whiteAspidistra/01-acls.sql Normal file
View File

@ -0,0 +1,23 @@
INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
VALUES('SiiTypeInvoiceIn', 'find', 'READ', 'ALLOW', 'ROLE', 'salesPerson');
DROP TABLE IF EXISTS vn.invoiceInCorrection;
CREATE TABLE `invoiceInCorrection` (
`correctingFk` mediumint(8) unsigned NOT NULL COMMENT 'Factura rectificativa',
`correctedFk` mediumint(8) unsigned NOT NULL COMMENT 'Factura rectificada',
`cplusRectificationTypeFk` int(10) unsigned NOT NULL,
`siiTypeInvoiceInFk` int(10) unsigned NOT NULL,
`invoiceCorrectionTypeFk` int(11) NOT NULL DEFAULT 3,
PRIMARY KEY (`correctingFk`),
KEY `invoiceInCorrection_correctedFk` (`correctedFk`),
KEY `invoiceInCorrection_cplusRectificationTypeFk` (`cplusRectificationTypeFk`),
KEY `invoiceInCorrection_siiTypeInvoiceIn` (`siiTypeInvoiceInFk`),
KEY `invoiceInCorrection_invoiceCorrectionTypeFk` (`invoiceCorrectionTypeFk`),
CONSTRAINT `invoiceInCorrection_correctedFk` FOREIGN KEY (`correctedFk`) REFERENCES `invoiceIn` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
CONSTRAINT `invoiceInCorrection_correctingFk` FOREIGN KEY (`correctingFk`) REFERENCES `invoiceIn` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
CONSTRAINT `invoiceInCorrection_cplusRectificationTypeFk` FOREIGN KEY (`cplusRectificationTypeFk`) REFERENCES `cplusRectificationType` (`id`) ON UPDATE CASCADE,
CONSTRAINT `invoiceInCorrection_invoiceCorrectionTypeFk` FOREIGN KEY (`invoiceCorrectionTypeFk`) REFERENCES `invoiceCorrectionType` (`id`) ON UPDATE CASCADE,
CONSTRAINT `invoiceInCorrection_siiTypeInvoiceIn` FOREIGN KEY (`siiTypeInvoiceInFk`) REFERENCES `siiTypeInvoiceIn` (`id`) ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;

3
db/versions/11384-grayAnthurium/00-firstScript.sql Normal file
View File

@ -0,0 +1,3 @@
ALTER TABLE vn.mistakeType
ADD `time` int(10) NULL COMMENT 'Segundos que se suelen tardar en arreglar el fallo',
ADD code varchar(50) DEFAULT NULL NULL AFTER id;

5
db/versions/11385-yellowOrchid/00-firstScript.sql Normal file
View File

@ -0,0 +1,5 @@
RENAME TABLE vn.inventoryFailure TO vn.inventoryFailure__;
ALTER TABLE vn.inventoryFailure__ COMMENT='@deprecated 2024-12-16';
RENAME TABLE vn.inventoryFailureCause TO vn.inventoryFailureCause__;
ALTER TABLE vn.inventoryFailureCause__ COMMENT='@deprecated 2024-12-16';

3
db/versions/11390-goldenPalmetto/00-firstScript.sql Normal file
View File

@ -0,0 +1,3 @@
ALTER TABLE vn.country
ADD CONSTRAINT country_unique_name UNIQUE KEY (name);

4
loopback/locale/en.json
View File

@ -248,6 +248,6 @@
"Payment method is required": "Payment method is required", "Payment method is required": "Payment method is required",
"Sales already moved": "Sales already moved", "Sales already moved": "Sales already moved",
"Holidays to past days not available": "Holidays to past days not available", "Holidays to past days not available": "Holidays to past days not available",
"There are tickets to be invoiced": "There are tickets to be invoiced for this zone, please delete them first", "Price cannot be blank": "Price cannot be blank",
"Price cannot be blank": "Price cannot be blank" "There are tickets to be invoiced": "There are tickets to be invoiced"
} }

4
loopback/locale/es.json
View File

@ -390,7 +390,6 @@
"The web user's email already exists": "El correo del usuario web ya existe", "The web user's email already exists": "El correo del usuario web ya existe",
"Sales already moved": "Ya han sido transferidas", "Sales already moved": "Ya han sido transferidas",
"The raid information is not correct": "La información de la redada no es correcta", "The raid information is not correct": "La información de la redada no es correcta",
"There are tickets to be invoiced": "Hay tickets para esta zona, borralos primero",
"No trips found because input coordinates are not connected": "No se encontraron rutas porque las coordenadas de entrada no están conectadas", "No trips found because input coordinates are not connected": "No se encontraron rutas porque las coordenadas de entrada no están conectadas",
"This request is not supported": "Esta solicitud no es compatible", "This request is not supported": "Esta solicitud no es compatible",
"Invalid options or too many coordinates": "Opciones invalidas o demasiadas coordenadas", "Invalid options or too many coordinates": "Opciones invalidas o demasiadas coordenadas",
@ -398,5 +397,6 @@
"An item type with the same code already exists": "Un tipo con el mismo código ya existe", "An item type with the same code already exists": "Un tipo con el mismo código ya existe",
"Holidays to past days not available": "Las vacaciones a días pasados no están disponibles", "Holidays to past days not available": "Las vacaciones a días pasados no están disponibles",
"All tickets have a route order": "Todos los tickets tienen orden de ruta", "All tickets have a route order": "Todos los tickets tienen orden de ruta",
"Price cannot be blank": "Price cannot be blank" "Price cannot be blank": "Price cannot be blank",
"There are tickets to be invoiced": "La zona tiene tickets por facturar"
} }

2
modules/account/back/methods/account/sync.js
View File

@ -36,7 +36,7 @@ module.exports = Self => {
if (!myOptions.transaction) { if (!myOptions.transaction) {
tx = await Self.beginTransaction({}); tx = await Self.beginTransaction({});
myOptions.transaction = tx; myOptions.transaction = tx;
}; }
try { try {
const user = await models.VnUser.findOne({ const user = await models.VnUser.findOne({

16
modules/claim/back/methods/claim/filter.js
View File

@ -80,6 +80,12 @@ module.exports = Self => {
description: 'The claimResponsible id', description: 'The claimResponsible id',
http: {source: 'query'} http: {source: 'query'}
}, },
{
arg: 'zoneFk',
type: 'string',
description: 'The zone name',
http: {source: 'query'}
},
{ {
arg: 'myTeam', arg: 'myTeam',
type: 'boolean', type: 'boolean',
@ -174,6 +180,8 @@ module.exports = Self => {
to.setHours(23, 59, 59, 999); to.setHours(23, 59, 59, 999);
return {'cl.created': {between: [value, to]}}; return {'cl.created': {between: [value, to]}};
case 'zoneFk':
return {'t.zoneFk': value};
case 'myTeam': case 'myTeam':
if (value) if (value)
return {'cl.workerFk': {inq: teamMembersId}}; return {'cl.workerFk': {inq: teamMembersId}};
@ -195,11 +203,15 @@ module.exports = Self => {
u.name AS workerName, u.name AS workerName,
cs.code stateCode, cs.code stateCode,
cs.description stateDescription, cs.description stateDescription,
cl.created cl.created,
z.name zoneName,
z.id zoneId
FROM claim cl FROM claim cl
LEFT JOIN client c ON c.id = cl.clientFk LEFT JOIN client c ON c.id = cl.clientFk
LEFT JOIN account.user u ON u.id = cl.workerFk LEFT JOIN account.user u ON u.id = cl.workerFk
LEFT JOIN claimState cs ON cs.id = cl.claimStateFk` LEFT JOIN claimState cs ON cs.id = cl.claimStateFk
LEFT JOIN ticket t ON t.id = cl.ticketFk
LEFT JOIN zone z ON z.id = t.zoneFk`
); );
stmt.merge(conn.makeSuffix(filter)); stmt.merge(conn.makeSuffix(filter));

2
modules/invoiceIn/back/locale/invoiceIn/en.yml
View File

@ -18,3 +18,5 @@ columns:
withholdingSageFk: withholding withholdingSageFk: withholding
expenseFkDeductible: expense deductible expenseFkDeductible: expense deductible
editorFk: editor editorFk: editor
siiTrasCendencyInvoiceInFk: SII tax regime
siiTypeInvoiceInFk: SII Type

4
modules/invoiceIn/back/locale/invoiceIn/es.yml
View File

@ -5,7 +5,7 @@ columns:
serial: serie serial: serie
supplierFk: proveedor supplierFk: proveedor
issued: fecha emisión issued: fecha emisión
supplierRef: referéncia proveedor supplierRef: referencia proveedor
isBooked: facturado isBooked: facturado
currencyFk: moneda currencyFk: moneda
created: creado created: creado
@ -18,3 +18,5 @@ columns:
withholdingSageFk: código de retención withholdingSageFk: código de retención
expenseFkDeductible: gasto deducible expenseFkDeductible: gasto deducible
editorFk: editor editorFk: editor
siiTrasCendencyInvoiceInFk: régimen fiscal SII
siiTypeInvoiceInFk: tipo SII

2
modules/invoiceIn/back/methods/invoice-in/corrective.js
View File

@ -44,7 +44,7 @@ module.exports = Self => {
correctingFk: clone.id, correctingFk: clone.id,
correctedFk: id, correctedFk: id,
cplusRectificationTypeFk: invoiceType, cplusRectificationTypeFk: invoiceType,
siiTypeInvoiceOutFk: invoiceClass, siiTypeInvoiceInFk: invoiceClass,
invoiceCorrectionTypeFk: invoiceReason invoiceCorrectionTypeFk: invoiceReason
}, myOptions); }, myOptions);

15
modules/invoiceIn/back/methods/invoice-in/filter.js
View File

@ -91,6 +91,10 @@ module.exports = Self => {
{ {
arg: 'supplierActivityFk', arg: 'supplierActivityFk',
type: 'string', type: 'string',
},
{
arg: 'companyFk',
type: 'number',
} }
], ],
returns: { returns: {
@ -161,8 +165,8 @@ module.exports = Self => {
: {'ii.id': {nin: correcteds.map(x => x.correctingFk)}}; : {'ii.id': {nin: correcteds.map(x => x.correctingFk)}};
case 'correctedFk': case 'correctedFk':
return {'ii.id': {inq: correctings.map(x => x.correctingFk)}}; return {'ii.id': {inq: correctings.map(x => x.correctingFk)}};
case 'supplierActivityFk': case 'companyFk':
return {'s.supplierActivityFk': value}; return {'ii.companyFk': value};
} }
}); });
@ -184,7 +188,9 @@ module.exports = Self => {
s.name supplierName, s.name supplierName,
s.account, s.account,
SUM(iid.amount) amount, SUM(iid.amount) amount,
sub.code awbCode sub.code awbCode,
c.code,
MIN(iid.dueDated) dueDated
FROM invoiceIn ii FROM invoiceIn ii
JOIN supplier s ON s.id = ii.supplierFk JOIN supplier s ON s.id = ii.supplierFk
LEFT JOIN invoiceInDueDay iid ON iid.invoiceInFk = ii.id LEFT JOIN invoiceInDueDay iid ON iid.invoiceInFk = ii.id
@ -199,7 +205,8 @@ module.exports = Self => {
GROUP BY de.duaFk GROUP BY de.duaFk
) sub ON sub.duaFk = d.id ) sub ON sub.duaFk = d.id
LEFT JOIN company co ON co.id = ii.companyFk LEFT JOIN company co ON co.id = ii.companyFk
LEFT JOIN dms dm ON dm.id = ii.docFk` LEFT JOIN dms dm ON dm.id = ii.docFk
JOIN company c ON c.id = ii.companyFk`,
); );
const sqlWhere = conn.makeWhere(filter.where); const sqlWhere = conn.makeWhere(filter.where);

6
modules/invoiceIn/back/methods/invoice-in/specs/corrective.spec.js
View File

@ -15,11 +15,11 @@ describe('invoiceIn corrective()', () => {
await tx.rollback(); await tx.rollback();
}); });
it('La función corrective debería devolver un id cuando se ejecuta correctamente', async() => { it('should return an id when executed correctly', async() => {
const originalId = 1; const originalId = 1;
const invoiceReason = 3; const invoiceReason = 3;
const invoiceType = 2; const invoiceType = 2;
const invoiceClass = 1; const invoiceClass = 8;
const cloneId = await models.InvoiceIn.corrective(ctx, const cloneId = await models.InvoiceIn.corrective(ctx,
originalId, invoiceReason, invoiceType, invoiceClass, options); originalId, invoiceReason, invoiceType, invoiceClass, options);
@ -30,7 +30,7 @@ describe('invoiceIn corrective()', () => {
}, options); }, options);
expect(correction.cplusRectificationTypeFk).toEqual(invoiceType); expect(correction.cplusRectificationTypeFk).toEqual(invoiceType);
expect(correction.siiTypeInvoiceOutFk).toEqual(invoiceClass); expect(correction.siiTypeInvoiceInFk).toEqual(invoiceClass);
expect(correction.invoiceCorrectionTypeFk).toEqual(invoiceReason); expect(correction.invoiceCorrectionTypeFk).toEqual(invoiceReason);
}); });
}); });

17
modules/invoiceIn/back/methods/invoice-in/specs/filter.spec.js
View File

@ -166,4 +166,21 @@ describe('InvoiceIn filter()', () => {
throw e; throw e;
} }
}); });
it('should return the invoice in matching companyFk', async() => {
const tx = await models.InvoiceIn.beginTransaction({});
const options = {transaction: tx};
try {
const company = await models.Company.findOne({}, options);
const invoicesByCompany = await models.InvoiceIn.find({where: {companyFk: company.id}}, options);
const filteredInvoices = await models.InvoiceIn.filter({args: {companyFk: company.id}}, {}, options);
expect(filteredInvoices.length).toEqual(invoicesByCompany.length);
await tx.rollback();
} catch (e) {
await tx.rollback();
throw e;
}
});
}); });

63
modules/invoiceIn/back/methods/invoice-in/specs/invoiceIn.spec.js Normal file
View File

@ -0,0 +1,63 @@
const models = require('vn-loopback/server/server').models;
describe('invoiceIn', () => {
let options;
let tx;
const invoiceId = 1;
const supplierId = 791;
const currencyId = 1;
const companyId = 442;
beforeEach(async() => {
tx = await models.InvoiceIn.beginTransaction({});
options = {transaction: tx};
});
afterEach(async() => {
await tx.rollback();
});
it('should allow insert for new instance', async() => {
const newInvoice = {
supplierFk: supplierId,
issued: Date.vnNew(),
operated: Date.vnNew(),
currencyFk: currencyId,
companyFk: companyId,
isBooked: false
};
const createdInvoice = await models.InvoiceIn.create(newInvoice, options);
expect(createdInvoice).toBeDefined();
expect(createdInvoice.id).toBeDefined();
});
it('should throw an error if trying to update a booked invoice', async() => {
const invoice = await models.InvoiceIn.findById(invoiceId, null, options);
await invoice.updateAttribute('isBooked', true, options);
let error;
try {
await invoice.updateAttribute('supplierFk', supplierId, options);
} catch (err) {
error = err;
}
expect(error.message).toBe('InvoiceIn is already booked');
});
it('should throw an error if trying to delete a booked invoice', async() => {
const invoice = await models.InvoiceIn.findById(invoiceId, null, options);
await invoice.updateAttribute('isBooked', true, options);
let error;
try {
await models.InvoiceIn.deleteById(invoiceId, options);
} catch (err) {
error = err;
}
expect(error.message).toBe('InvoiceIn is already booked');
});
});

74
modules/invoiceIn/back/methods/invoice-in/specs/invoiceInTax.spec.js Normal file
View File

@ -0,0 +1,74 @@
const models = require('vn-loopback/server/server').models;
describe('invoiceInTax', () => {
let options;
let tx;
const invoiceInId = 1;
const invoiceInTaxId = 1;
beforeEach(async() => {
tx = await models.InvoiceInTax.beginTransaction({});
options = {transaction: tx};
});
afterEach(async() => {
await tx.rollback();
});
it('should throw an error if trying to save a tax from a booked invoice', async() => {
const invoiceIn = await models.InvoiceIn.findById(invoiceInId, null, options);
await invoiceIn.updateAttributes({isBooked: true}, options);
const invoiceInTax = await models.InvoiceInTax.findById(invoiceInTaxId, null, options);
let error;
try {
await invoiceInTax.updateAttribute('taxableBase', 100, options);
} catch (err) {
error = err;
}
expect(error.message).toBe('InvoiceIn is already booked');
});
it('should allow save if the invoice is not booked', async() => {
const invoiceIn = await models.InvoiceIn.findById(invoiceInId, null, options);
await invoiceIn.updateAttribute('isBooked', false, options);
const invoiceInTax = await models.InvoiceInTax.findById(invoiceInTaxId, null, options);
await invoiceInTax.updateAttribute('taxableBase', 100, options);
const updatedInvoiceInTax = await models.InvoiceInTax.findById(invoiceInTaxId, null, options);
expect(updatedInvoiceInTax.taxableBase).toBe(100);
});
it('should throw an error if trying to delete a tax from a booked invoice', async() => {
const invoiceIn = await models.InvoiceIn.findById(invoiceInId, null, options);
await invoiceIn.updateAttribute('isBooked', true, options);
let error;
try {
await models.InvoiceInTax.destroyById(invoiceInTaxId, options);
} catch (err) {
error = err;
}
expect(error).toBeDefined();
expect(error.message).toBe('InvoiceIn is already booked');
});
it('should allow delete if the invoice is not booked', async() => {
const invoiceIn = await models.InvoiceIn.findById(invoiceInId, null, options);
await invoiceIn.updateAttribute('isBooked', false, options);
let error;
try {
await models.InvoiceInTax.destroyById(invoiceInTaxId, options);
} catch (err) {
error = err;
}
const deletedInvoiceInTax = await models.InvoiceInTax.findById(invoiceInTaxId, null, options);
expect(error).toBeUndefined();
expect(deletedInvoiceInTax).toBeNull();
});
});

59
modules/invoiceIn/back/methods/invoice-in/specs/updateInvoiceIn.spec.js Normal file
View File

@ -0,0 +1,59 @@
const models = require('vn-loopback/server/server').models;
const invoiceInId = 1;
const supplierId = 791;
describe('invoiceIn updateInvoiceIn()', () => {
const ctx = beforeAll.getCtx();
let options;
let tx;
beforeEach(async() => {
options = {transaction: tx};
tx = await models.Sale.beginTransaction({});
options.transaction = tx;
});
afterEach(async() => {
await tx.rollback();
});
it('should update the invoice', async() => {
const invoiceBefore = await models.InvoiceIn.findById(invoiceInId, null, options);
await update(ctx, options);
const invoiceAfter = await models.InvoiceIn.findById(invoiceInId, null, options);
expect(invoiceAfter.supplierFk).not.toBe(invoiceBefore.supplierFk);
expect(invoiceAfter.supplierFk).toBe(supplierId);
});
it('should not update the invoice if is booked', async() => {
let error;
try {
await models.InvoiceIn.toBook(ctx, invoiceInId, options);
await update(ctx, options);
} catch (e) {
error = e;
}
expect(error.message).toBe('InvoiceIn is already booked');
});
});
async function update(ctx, opts) {
const supplierRef = 'mockRef';
const currencyId = 1;
await models.InvoiceIn.updateInvoiceIn(ctx,
invoiceInId,
supplierId,
supplierRef,
undefined,
undefined,
undefined,
undefined,
undefined,
undefined,
currencyId,
undefined,
undefined,
opts);
}

8
modules/invoiceIn/back/methods/invoice-in/summary.js
View File

@ -37,7 +37,13 @@ module.exports = Self => {
{ {
relation: 'supplier', relation: 'supplier',
scope: { scope: {
fields: ['id', 'name'] fields: ['id', 'name', 'isVies', 'countryFk'],
include: [{
relation: 'country',
scope: {
fields: ['id', 'code']
}
}]
} }
}, },
{ {

3
modules/invoiceIn/back/methods/invoice-in/toUnbook.js
View File

@ -52,7 +52,8 @@ module.exports = Self => {
accountingEntries = await models.Xdiario.count({ASIEN: asien}, myOptions); accountingEntries = await models.Xdiario.count({ASIEN: asien}, myOptions);
await models.Xdiario.destroyAll({ASIEN: asien}, myOptions); await models.Xdiario.destroyAll({ASIEN: asien}, myOptions);
await Self.updateAll({id: invoiceInId}, {isBooked: false}, myOptions); const invoiceIn = await Self.findById(invoiceInId, myOptions);
await invoiceIn.updateAttribute('isBooked', false, myOptions);
} else { } else {
const linkedBookEntry = await models.Xdiario.findOne({ const linkedBookEntry = await models.Xdiario.findOne({
fields: ['ASIEN'], fields: ['ASIEN'],

3
modules/invoiceIn/back/methods/invoice-in/updateInvoiceIn.js
View File

@ -82,7 +82,7 @@ module.exports = Self => {
try { try {
const invoiceIn = await Self.findById(id, null, myOptions); const invoiceIn = await Self.findById(id, null, myOptions);
invoiceIn.updateAttributes({supplierFk, await invoiceIn.updateAttributes({supplierFk,
supplierRef, supplierRef,
issued, issued,
operated, operated,
@ -94,6 +94,7 @@ module.exports = Self => {
companyFk, companyFk,
withholdingSageFk withholdingSageFk
}, myOptions); }, myOptions);
if (tx) await tx.commit(); if (tx) await tx.commit();
return invoiceIn; return invoiceIn;
} catch (e) { } catch (e) {

9
modules/invoiceIn/back/models/invoice-in-correction.json
View File

@ -28,11 +28,10 @@
"model": "InvoiceCorrectionType", "model": "InvoiceCorrectionType",
"foreignKey": "invoiceCorrectionTypeFk" "foreignKey": "invoiceCorrectionTypeFk"
}, },
"siiTypeInvoiceOut": { "siiTypeInvoiceIn": {
"type": "belongsTo", "type": "belongsTo",
"model": "SiiTypeInvoiceOut", "model": "SiiTypeInvoiceIn",
"foreignKey": "siiTypeInvoiceOutFk" "foreignKey": "siiTypeInvoiceInFk"
} }
} }
} }

18
modules/invoiceIn/back/models/invoice-in-tax.js Normal file
View File

@ -0,0 +1,18 @@
const UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
Self.observe('before save', async function(ctx) {
if (ctx.isNewInstance) return;
const models = Self.app.models;
const invoiceIn = await models.InvoiceIn.findById(ctx.currentInstance.invoiceInFk, null, ctx.options);
if (invoiceIn.isBooked) throw new UserError('InvoiceIn is already booked');
});
Self.observe('before delete', async function(ctx) {
const models = Self.app.models;
const invoiceInTax = await Self.findById(ctx.where.id, null, ctx.options);
const invoiceIn = await models.InvoiceIn.findById(invoiceInTax.invoiceInFk, null, ctx.options);
if (invoiceIn.isBooked) throw new UserError('InvoiceIn is already booked');
});
};

3
modules/invoiceIn/back/models/invoice-in-tax.json
View File

@ -22,12 +22,11 @@
"type": "number" "type": "number"
}, },
"expenseFk": { "expenseFk": {
"type": "number" "type": "string"
}, },
"created": { "created": {
"type": "date" "type": "date"
} }
}, },
"relations": { "relations": {
"invoiceIn": { "invoiceIn": {

21
modules/invoiceIn/back/models/invoice-in.js
View File

@ -19,4 +19,25 @@ module.exports = Self => {
return new UserError(`This invoice has a linked vehicle.`); return new UserError(`This invoice has a linked vehicle.`);
return err; return err;
}); });
Self.observe('before save', async function(ctx) {
if (ctx.isNewInstance) return;
const changes = ctx.data || ctx.instance;
const orgData = ctx.currentInstance;
let isNotEditable = orgData.isBooked || (!orgData.isBooked && changes.isBooked);
if (isNotEditable) {
for (const [key, value] of Object.entries(changes)) {
if (key !== 'isBooked' && value !== orgData[key])
throw new UserError('InvoiceIn is already booked');
}
}
});
Self.observe('before delete', async function(ctx) {
const invoiceIn = await Self.findById(ctx.where.id, null, ctx.options);
if (invoiceIn.isBooked) throw new UserError('InvoiceIn is already booked');
});
}; };

13
modules/invoiceOut/back/methods/invoiceOut/getInvoiceDate.js
View File

@ -7,7 +7,12 @@ module.exports = Self => {
arg: 'companyFk', arg: 'companyFk',
type: 'number', type: 'number',
required: true required: true
} },
{
arg: 'serialType',
type: 'string',
required: true
},
], ],
returns: { returns: {
type: ['object'], type: ['object'],
@ -19,16 +24,16 @@ module.exports = Self => {
} }
}); });
Self.getInvoiceDate = async companyFk => { Self.getInvoiceDate = async(companyFk, serialType) => {
const models = Self.app.models; const models = Self.app.models;
const [invoiceDate] = await models.InvoiceOut.rawSql( const [invoiceDate] = await models.InvoiceOut.rawSql(
`SELECT MAX(io.issued) issued `SELECT MAX(io.issued) issued
FROM invoiceOut io FROM invoiceOut io
JOIN invoiceOutSerial ios ON ios.code = io.serial JOIN invoiceOutSerial ios ON ios.code = io.serial
WHERE ios.type = 'global' WHERE ios.type = ?
AND io.issued AND io.issued
AND io.companyFk = ?`, AND io.companyFk = ?`,
[companyFk] [serialType, companyFk]
); );
return invoiceDate; return invoiceDate;
}; };

39
modules/invoiceOut/back/methods/invoiceOut/specs/getInvoiceDate.spec.js Normal file
View File

@ -0,0 +1,39 @@
const models = require('vn-loopback/server/server').models;
const moment = require('moment');
describe('getInvoiceDate()', () => {
const companyFk = 442;
let tx;
let options;
beforeEach(async() => {
tx = await models.InvoiceOut.beginTransaction({});
options = {transaction: tx};
});
afterEach(async() => {
await tx.rollback();
});
it('should return a correct date for serialType "global"', async() => {
const serialType = 'global';
const result = await models.InvoiceOut.getInvoiceDate(companyFk, serialType, options);
expect(moment(result.issued).format('YYYY-MM-DD')).toEqual('2000-12-01');
});
it('should return null for serialType "multiple"', async() => {
const serialType = 'multiple';
const result = await models.InvoiceOut.getInvoiceDate(companyFk, serialType, options);
expect(result.issued).toBeNull();
});
it('should return correct date for serialType "quick"', async() => {
const serialType = 'quick';
const result = await models.InvoiceOut.getInvoiceDate(companyFk, serialType, options);
expect(moment(result.issued).format('YYYY-MM-DD')).toEqual('2001-01-01');
});
});

3
modules/invoiceOut/back/model-config.json
View File

@ -43,5 +43,8 @@
}, },
"SiiTypeInvoiceOut": { "SiiTypeInvoiceOut": {
"dataSource": "vn" "dataSource": "vn"
},
"SiiTypeInvoiceIn": {
"dataSource": "vn"
} }
} }

22
modules/invoiceOut/back/models/sii-type-invoice-in.json Normal file
View File

@ -0,0 +1,22 @@
{
"name": "SiiTypeInvoiceIn",
"base": "VnModel",
"options": {
"mysql": {
"table": "siiTypeInvoiceIn"
}
},
"properties": {
"id": {
"id": true,
"type": "number",
"description": "Identifier"
},
"code": {
"type": "string"
},
"description": {
"type": "string"
}
}
}

3
modules/invoiceOut/back/models/sii-type-invoice-out.json
View File

@ -17,9 +17,6 @@
}, },
"description": { "description": {
"type": "string" "type": "string"
},
"code": {
"type": "string"
} }
} }
} }

9
modules/monitor/back/methods/sales-monitor/salesFilter.js
View File

@ -98,6 +98,11 @@ module.exports = Self => {
arg: 'countryFk', arg: 'countryFk',
type: 'number', type: 'number',
description: 'The country id filter' description: 'The country id filter'
},
{
arg: 'payMethod',
type: 'string',
description: 'The payment method filter'
} }
], ],
returns: { returns: {
@ -165,6 +170,8 @@ module.exports = Self => {
case 'clientFk': case 'clientFk':
param = `t.${param}`; param = `t.${param}`;
return {[param]: value}; return {[param]: value};
case 'payMethod':
return {'c.payMethodFk': value};
} }
}); });
@ -205,6 +212,8 @@ module.exports = Self => {
u.name userName, u.name userName,
c.salesPersonFk, c.salesPersonFk,
c.credit, c.credit,
c.payMethodFk payMethodFk,
pm.id payMethodId,
pm.name payMethod, pm.name payMethod,
z.hour zoneLanding, z.hour zoneLanding,
z.name zoneName, z.name zoneName,

7
modules/ticket/back/methods/ticket/getTicketsAdvance.js
View File

@ -55,6 +55,11 @@ module.exports = Self => {
type: 'number', type: 'number',
description: 'Department identifier' description: 'Department identifier'
}, },
{
arg: 'onlyWithDestination',
type: 'Boolean',
description: 'True when only tickets with destination are returned'
},
{ {
arg: 'filter', arg: 'filter',
type: 'object', type: 'object',
@ -103,6 +108,8 @@ module.exports = Self => {
return {'f.isFullMovable': value}; return {'f.isFullMovable': value};
case 'departmentFk': case 'departmentFk':
return {'f.departmentFk': value}; return {'f.departmentFk': value};
case 'onlyWithDestination':
return {'f.id': value ? {neq: null} : null};
} }
}); });

65
modules/ticket/back/methods/ticket/specs/getTicketsAdvance.spec.js
View File

@ -8,6 +8,7 @@ describe('TicketFuture getTicketsAdvance()', () => {
tomorrow.setDate(today.getDate() + 1); tomorrow.setDate(today.getDate() + 1);
const salesDeptId = 43; const salesDeptId = 43;
const spain1DeptId = 95; const spain1DeptId = 95;
const warehouseId = 1;
beforeAll.mockLoopBackContext(); beforeAll.mockLoopBackContext();
it('should return the tickets passing the required data', async() => { it('should return the tickets passing the required data', async() => {
@ -19,7 +20,7 @@ describe('TicketFuture getTicketsAdvance()', () => {
const args = { const args = {
dateFuture: tomorrow, dateFuture: tomorrow,
dateToAdvance: today, dateToAdvance: today,
warehouseFk: 1, warehouseFk: warehouseId,
}; };
ctx.args = args; ctx.args = args;
@ -42,7 +43,7 @@ describe('TicketFuture getTicketsAdvance()', () => {
const args = { const args = {
dateFuture: tomorrow, dateFuture: tomorrow,
dateToAdvance: today, dateToAdvance: today,
warehouseFk: 1, warehouseFk: warehouseId,
isFullMovable: true isFullMovable: true
}; };
@ -67,7 +68,7 @@ describe('TicketFuture getTicketsAdvance()', () => {
const args = { const args = {
dateFuture: tomorrow, dateFuture: tomorrow,
dateToAdvance: today, dateToAdvance: today,
warehouseFk: 1, warehouseFk: warehouseId,
isFullMovable: false isFullMovable: false
}; };
@ -92,7 +93,7 @@ describe('TicketFuture getTicketsAdvance()', () => {
const args = { const args = {
dateFuture: tomorrow, dateFuture: tomorrow,
dateToAdvance: today, dateToAdvance: today,
warehouseFk: 1, warehouseFk: warehouseId,
ipt: 'V' ipt: 'V'
}; };
@ -117,7 +118,7 @@ describe('TicketFuture getTicketsAdvance()', () => {
const args = { const args = {
dateFuture: tomorrow, dateFuture: tomorrow,
dateToAdvance: today, dateToAdvance: today,
warehouseFk: 1, warehouseFk: warehouseId,
tfIpt: 'V' tfIpt: 'V'
}; };
@ -141,7 +142,7 @@ describe('TicketFuture getTicketsAdvance()', () => {
ctx.args = { ctx.args = {
dateFuture: tomorrow, dateFuture: tomorrow,
dateToAdvance: today, dateToAdvance: today,
warehouseFk: 1, warehouseFk: warehouseId,
}; };
await models.Ticket.updateAll({id: {inq: [12, 31]}}, {clientFk: 1}, options); await models.Ticket.updateAll({id: {inq: [12, 31]}}, {clientFk: 1}, options);
@ -167,4 +168,56 @@ describe('TicketFuture getTicketsAdvance()', () => {
throw e; throw e;
} }
}); });
it('should return the tickets with only destination', async() => {
const tx = await models.Ticket.beginTransaction({});
try {
const options = {transaction: tx};
const args = {
dateFuture: today,
dateToAdvance: today.setHours(23, 59, 59, 999),
warehouseFk: warehouseId,
};
ctx.args = args;
const allTickets = await models.Ticket.getTicketsAdvance(ctx, options);
ctx.args.onlyWithDestination = true;
const withDestinationTickets = await models.Ticket.getTicketsAdvance(ctx, options);
expect(allTickets.filter(ticket => ticket.id).length).toBe(withDestinationTickets.length);
await tx.rollback();
} catch (e) {
await tx.rollback();
throw e;
}
});
it('should return the tickets without only destination', async() => {
const tx = await models.Ticket.beginTransaction({});
try {
const options = {transaction: tx};
const args = {
dateFuture: today,
dateToAdvance: today.setHours(23, 59, 59, 999),
warehouseFk: warehouseId,
};
ctx.args = args;
const allTickets = await models.Ticket.getTicketsAdvance(ctx, options);
ctx.args.onlyWithDestination = false;
const withoutDestinationTickets = await models.Ticket.getTicketsAdvance(ctx, options);
expect(allTickets.filter(ticket => !ticket.id).length).toBe(withoutDestinationTickets.length);
await tx.rollback();
} catch (e) {
await tx.rollback();
throw e;
}
});
}); });

12
modules/travel/back/methods/travel/filter.js
View File

@ -83,6 +83,14 @@ module.exports = Self => {
arg: 'daysOnward', arg: 'daysOnward',
type: 'number', type: 'number',
description: 'The days onward' description: 'The days onward'
}, {
arg: 'shipped',
type: 'date',
description: 'The shipped date'
}, {
arg: 'landed',
type: 'date',
description: 'The landed date'
} }
], ],
returns: { returns: {
@ -108,6 +116,10 @@ module.exports = Self => {
: {'t.ref': {like: `%${value}%`}}; : {'t.ref': {like: `%${value}%`}};
case 'ref': case 'ref':
return {'t.ref': {like: `%${value}%`}}; return {'t.ref': {like: `%${value}%`}};
case 'shipped':
return {'t.shipped': value};
case 'landed':
return {'t.landed': value};
case 'shippedFrom': case 'shippedFrom':
return {'t.shipped': {gte: value}}; return {'t.shipped': {gte: value}};
case 'shippedTo': case 'shippedTo':

7
modules/worker/back/methods/worker/createAbsence.js
View File

@ -128,7 +128,10 @@ module.exports = Self => {
const account = await models.VnUser.findById(userId, null, myOptions); const account = await models.VnUser.findById(userId, null, myOptions);
const subordinated = await models.VnUser.findById(id, null, myOptions); const subordinated = await models.VnUser.findById(id, null, myOptions);
const worker = await models.Worker.findById(subordinated.id, null, myOptions); const worker = await models.Worker.findById(subordinated.id, null, myOptions);
const departmentBoss = await models.VnUser.findById(worker.bossFk, null, myOptions); const receiver = await models.EmailUser.findOne({
fields: ['email'],
where: {userFk: worker.bossFk}
}, myOptions);
const url = await Self.app.models.Url.getUrl(); const url = await Self.app.models.Url.getUrl();
const body = $t('Created absence', { const body = $t('Created absence', {
author: account.nickname, author: account.nickname,
@ -140,7 +143,7 @@ module.exports = Self => {
await models.Mail.create({ await models.Mail.create({
subject: $t('Absence change notification on the labour calendar'), subject: $t('Absence change notification on the labour calendar'),
body: body, body: body,
receiver: departmentBoss.email receiver: receiver.email
}, myOptions); }, myOptions);
if (tx) await tx.commit(); if (tx) await tx.commit();

2
modules/zone/back/methods/zone/deleteZone.js
View File

@ -51,7 +51,7 @@ module.exports = Self => {
}; };
const ticketList = await models.Ticket.find(filter, myOptions); const ticketList = await models.Ticket.find(filter, myOptions);
const hasRefFk = ticketList.some(ticket => ticket.refFk); const hasRefFk = ticketList.some(ticket => !ticket.refFk);
if (hasRefFk) if (hasRefFk)
throw new UserError('There are tickets to be invoiced'); throw new UserError('There are tickets to be invoiced');

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "salix-back", "name": "salix-back",
"version": "24.52.0", "version": "25.02.0",
"author": "Verdnatura Levante SL", "author": "Verdnatura Levante SL",
"description": "Salix backend", "description": "Salix backend",
"license": "GPL-3.0", "license": "GPL-3.0",