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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Alex Moreno 2022-01-04 13:55:36 +01:00
parent 2a9cc2f465 2a2c54e06a
commit e4db123672
5 changed files with 7368 additions and 2374 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
db/dump/dumpedFixtures.sql
View File

File diff suppressed because one or more lines are too long

12
db/dump/fixtures.sql
View File

@ -1076,11 +1076,15 @@ INSERT INTO `vn`.`itemPlacement`(`id`, `itemFk`, `warehouseFk`, `code`)
(3, 1, 3, 'A33'), (3, 1, 3, 'A33'),
(4, 2, 1, 'A44'); (4, 2, 1, 'A44');
INSERT INTO `vn`.`train`(`id`, `name`)
INSERT INTO `vn`.`collection`(`id`, `workerFk`, `stateFk`, `created`)
VALUES VALUES
(1, 1106, 5, DATE_ADD(CURDATE(),INTERVAL +1 DAY)), (1, 'Train1'),
(2, 1106, 14, CURDATE()); (2, 'Train2');
INSERT INTO `vn`.`collection`(`id`, `workerFk`, `stateFk`, `created`, `trainFk`)
VALUES
(1, 1106, 5, DATE_ADD(CURDATE(),INTERVAL +1 DAY), 1),
(2, 1106, 14, CURDATE(), 1);
INSERT INTO `vn`.`ticketCollection`(`id`, `ticketFk`, `collectionFk`) INSERT INTO `vn`.`ticketCollection`(`id`, `ticketFk`, `collectionFk`)
VALUES VALUES

9682
db/dump/structure.sql
View File

File diff suppressed because it is too large Load Diff

2
front/core/styles/icons/salixfont.css
View File

@ -145,7 +145,7 @@
.icon-credit:before { .icon-credit:before {
content: "\e923"; content: "\e923";
} }
.icon-deletedTicketCross:before { .icon-deletedTicket:before {
content: "\e924"; content: "\e924";
} }
.icon-deleteline:before { .icon-deleteline:before {

2
modules/invoiceOut/back/methods/invoiceOut/specs/download.spec.js
View File

@ -23,6 +23,6 @@ describe('InvoiceOut download()', () => {
const result = await models.InvoiceOut.download(ctx, invoiceId); const result = await models.InvoiceOut.download(ctx, invoiceId);
expect(result[1]).toEqual('application/pdf'); expect(result[1]).toEqual('application/pdf');
expect(result[2]).toEqual('filename="2021T1111111.pdf"'); expect(result[2]).toMatch(/filename="\d{4}T1111111.pdf"/);
}); });
}); });