Commit Graph

13830 Commits

Author SHA1 Message Date
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
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 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
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 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 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
Alexandre Riera c06c3dc6a7 refs #4957 saleChecked deleted
gitea/salix/pipeline/head This commit looks good Details
2022-12-27 11:50:58 +01:00
Alexandre Riera 7d1b8c8c56 refs #4971 itemSearchFunc added
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 12:11:24 +01:00
Joan Sanchez c13b49c7cd Added next version & changelog
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 10:07:19 +01:00
Joan Sanchez 39699114e3 Changed version
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-23 10:01:08 +01:00
Joan Sanchez ff0243db8f Fixed SQL files 2022-12-23 09:55:15 +01:00
Pau 1978d228ff Merge pull request 'Closes #288 translation for vn.state using i18n' (!1152) from #288-traducir-state-i18n into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1152
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2022-12-23 08:15:36 +00:00
Pau fc86e913c4 Merge branch 'dev' into #288-traducir-state-i18n
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 08:09:38 +00:00
Alexandre Riera bd6935c28e Merge pull request 'fixes #3302 log front modificaciones' (!1198) from 3302-logFormat into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1198
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2022-12-23 08:03:59 +00:00
Alexandre Riera c34c239375 refs #3302 corrections
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 08:13:08 +01:00
Alexandre Riera eefc5ab80d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat 2022-12-23 08:01:52 +01:00
Joan Sanchez e15d724db5 Merge pull request 'closes #3681 move-sign_save-to-salix' (!1151) from 3681-move-sign_save-to-salix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1151
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-22 12:44:01 +00:00
Joan Sanchez 4ae77d7f51 Merge pull request 'fix(pagination): duplicated rows on paginate' (!1214) from 4531-monitor_duplicates into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1214
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2022-12-22 10:45:15 +00:00
Joan Sanchez 7c33cd2691 Merge pull request '4649-bookEntriesIncorrectly_notification' (!1188) from 4649-bookEntriesIncorrectly_notification into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1188
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-22 10:43:20 +00:00
Joan Sanchez 606bacbad7 Merge branch 'dev' into 4531-monitor_duplicates
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 10:37:48 +00:00
Guillermo Bonet 6660c568e5 Merge pull request 'refs #4898 Added barcode and changes in structure' (!1220) from 4898-expedition-pallet-label-barcode into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1220
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-22 09:54:06 +00:00
Guillermo Bonet 861cdb2863 Merge branch 'dev' into 4898-expedition-pallet-label-barcode
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 09:46:50 +00:00
Pau 6ded11a4c2 requested changes refs #3681 @3h
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 10:35:11 +01:00
Vicent Llopis 9e045e15b7 Merge pull request '4794-mdb_block' (!1170) from 4794-mdb_block into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1170
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2022-12-22 09:19:15 +00:00
Vicent Llopis 7f80c7ed2c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 09:30:35 +01:00
Pau aa716634db Merge branch 'dev' into 3681-move-sign_save-to-salix
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 08:30:36 +01:00
Pau ea6d399cf1 Merge branch 'dev' into #288-traducir-state-i18n
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 07:25:38 +00:00
Pau c0d285856b move sql files
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 08:24:54 +01:00
Pau f57201c8c3 add requested changes 2022-12-22 08:20:59 +01:00
Pau bf70ba43a3 Merge branch '#288-traducir-state-i18n' of https://gitea.verdnatura.es/verdnatura/salix into #288-traducir-state-i18n
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 08:07:41 +01:00
Pau fed4cc8534 Merge branch 'dev' into #288-traducir-state-i18n 2022-12-22 08:07:25 +01:00
Guillermo Bonet d391946f57 refs #4898 Added barcode and changes in structure
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-22 08:04:03 +01:00
Vicent Llopis 7731ca143e Merge pull request '4804-ticket.descriptor_sms' (!1217) from 4804-ticket.descriptor_sms into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1217
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2022-12-21 11:29:59 +00:00
Vicent Llopis 630890cd04 fix: colum name in model
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 12:23:16 +01:00
Vicent Llopis a45ef27e3f move changes sql
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-21 12:15:33 +01:00
Vicent Llopis 06075aa17b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4804-ticket.descriptor_sms 2022-12-21 12:15:21 +01:00
Vicent Llopis e4f4e70cc6 Merge branch 'dev' into 4649-bookEntriesIncorrectly_notification
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 08:26:53 +00:00
Vicent Llopis 6634ebcec5 fix: id duplicado en util.notification
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 09:25:52 +01:00
Alexandre Riera ebb81a3377 Merge pull request 'fixes #3963 Adelantar la fecha de preparacion de tickets' (!1155) from 3963-ticket-advance into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1155
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-21 07:37:19 +00:00
Alexandre Riera 081ef7fc99 Merge branch 'dev' into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 07:30:17 +00:00
Vicent Llopis b0595dd0da Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-21 08:12:59 +01:00
Vicent Llopis 144a1cb105 Merge pull request '3951-invoiceOut.index_downloadZip' (!1215) from 3951-invoiceOut.index_downloadZip into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1215
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-21 07:12:14 +00:00
Vicent Llopis 1d7145d74b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 08:05:19 +01:00
Vicent Llopis 5a4a78d045 Merge branch 'dev' into 3951-invoiceOut.index_downloadZip
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 07:02:12 +00:00