Commit Graph

14179 Commits

Author SHA1 Message Date
Vicent Llopis fa58ac2462 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 09:13:47 +01:00
Vicent Llopis fe7f388f3d Merge branch 'dev' into 4846-claim.search-panel
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 08:07:31 +00:00
Joan Sanchez d1150d0965 Updated changelog
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 09:01:06 +01:00
Joan Sanchez 674fe49058 fix(icons): prevent icon translation when using google translator
gitea/salix/pipeline/head There was a failure building this commit Details
Refs: 5044
2023-01-03 08:41:58 +01:00
Alexandre Riera 81c7fff7e2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3571-refactor-e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 08:35:49 +01:00
Alexandre Riera 9887f87dd3 refs #5051 pending added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 08:34:46 +01:00
Alex Moreno 46c3d87dab feat(worker_create): add vn-acl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 08:09:46 +01:00
Alex Moreno aa5cfde1ae test(worker_new): add back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-02 14:52:03 +01:00
Alexandre Riera 96f2e4b542 refs #5051 skipped tests and changed fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-01-02 13:35:33 +01:00
Alexandre Riera 7fcc787a69 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4930-add-zone
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-02 07:14:59 +01:00
Alexandre Riera c01292bec7 Merge branch '4937-marcar-verRecibo' of https://gitea.verdnatura.es/verdnatura/salix into 4937-marcar-verRecibo
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-02 07:12:39 +01:00
Alexandre Riera f027a7b07f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4937-marcar-verRecibo 2023-01-02 07:12:10 +01:00
Alexandre Riera 7c45ac158c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4926-add-itemPackingOut
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-02 07:09:30 +01:00
Pau 21cd2e2a63 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-29 09:03:05 +00:00
Pau edcc55df26 refs #4875 @3h disable random to be able to test with some kind of reliability
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-29 10:01:38 +01:00
Alexandre Riera 81e1f88611 Merge branch 'dev' into 4937-marcar-verRecibo
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 13:20:12 +00:00
Alex Moreno 9ec5e1c53d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-12-28 14:18:35 +01:00
Alex Moreno a5ab5d613a Merge pull request 'refactor(login): split in differents folder' (!1234) from 4995-split_folder into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1234
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2022-12-28 13:18:22 +00:00
Alex Moreno 27e19234f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-12-28 14:12:15 +01:00
Alex Moreno 90acbac2ad refactor(login): split in differents folder
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 14:06:51 +01:00
Alex Moreno 323776e50c Merge pull request '#4995 feat(app): only use ui-view for routing' (!1232) from 4995-app_use_ui-view into dev
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 12:47:40 +00:00
Alexandre Riera 502461fde5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4926-add-itemPackingOut
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 13:25:10 +01:00
Alexandre Riera 101be86448 Merge branch 'dev' into 3571-refactor-e2e
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 12:20:35 +00:00
Alexandre Riera b2af21ba01 refs #3571 fdescribed removed
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 13:17:47 +01:00
Alexandre Riera 3b717e54fa refs #3571 refactor e2e worker
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 13:06:00 +01:00
Vicent Llopis d5b626434b refactor: add translations, change css...
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 12:42:51 +01:00
Vicent Llopis ab0af27f8b refactor: delete changes in ticket.sale-checked
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 12:23:41 +01:00
Vicent Llopis d0ae97e41b refactor: move changes from ticket.sale-checked to ticket.sale-tracking
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 12:16:23 +01:00
Vicent Llopis ba7e5d6a91 refator: se usa loopback cuando se puede
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 11:56:34 +01:00
Alex Moreno 2c5e42d408 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-28 11:49:16 +01:00
Alex Moreno c93c276968 Merge branch '4995-app_use_ui-view' of https://gitea.verdnatura.es/verdnatura/salix into 4995-app_use_ui-view
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 11:40:14 +01:00
Alex Moreno fc72a6e2f5 changelog 2022-12-28 11:40:13 +01:00
Alex Moreno 31ad0555fe Merge branch 'dev' into 4995-app_use_ui-view
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 10:28:21 +00:00
Alex Moreno f4a60d3b35 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4995-app_use_ui-view 2022-12-28 11:27:49 +01:00
Alex Moreno 990bcc0f6e feat(app): only use ui-view for routing
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 11:18:53 +01:00
Alexandre Riera 9971611a0b Merge branch 'dev' into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 09:31:33 +00:00
Alexandre Riera d1eb3b97ea Merge pull request 'fixes #4971 Filtrar Artículo en la pantalla de compras' (!1224) from 4971-filtrar-articulo into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1224
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2022-12-28 09:22:12 +00:00
Alexandre Riera b6e17d3489 Merge branch 'dev' into 4971-filtrar-articulo
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 09:16:14 +00:00
Alexandre Riera 30197e9e15 Merge branch 'dev' into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 09:07:26 +00:00
Alexandre Riera 33fbe8cc7b Merge pull request 'fixes #4957 saleChecked kkear' (!1231) from 4957-saleChecked-kkear into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1231
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2022-12-28 09:06:25 +00:00
Vicent Llopis ec3e60fddd Merge pull request 'TEST_4825-intrastat' (!1221) from test_4825-intrastat into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1221
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2022-12-28 08:51:28 +00:00
Vicent Llopis eed6d05e23 delete console.log
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 08:51:39 +01:00
Vicent Llopis eb4cb318ed refactor: evitar join innecesarios en el filter general
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 08:43:02 +01:00
Alex Moreno bee65f9c69 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2 2022-12-28 07:24:08 +01:00
Vicent Llopis 3dd0c79629 feat: add ItemShelvingSales/filter
gitea/salix/pipeline/head This commit looks good Details
2022-12-27 15:00:49 +01:00
Alexandre Riera c06c3dc6a7 refs #4957 saleChecked deleted
gitea/salix/pipeline/head This commit looks good Details
2022-12-27 11:50:58 +01:00
Pau 48073f1be8 Merge pull request 'solve fixture error' (!1228) from Hotfix-crear-report-Factura-Electronica into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1228
2022-12-27 08:32:36 +00:00
Pau 73a4a193b0 Merge branch 'master' into Hotfix-crear-report-Factura-Electronica
gitea/salix/pipeline/head This commit looks good Details
2022-12-27 08:22:39 +00:00
Pau deb730aae7 solve fixture error 2022-12-27 09:21:02 +01:00
Pau 6e6dc73d59 Merge pull request 'Fix missing report for the invoice electronic notification' (!1216) from Hotfix-crear-report-Factura-Electronica into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1216
2022-12-27 08:04:27 +00:00