6449 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	c4c4285b4b	fix: remove unnecessary console.log	2024-09-03 08:16:01 +02:00
Javier Segarra	6e2630c69e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 7897_masterTest_24_36	2024-09-03 08:07:57 +02:00
Javier Segarra	84076309a5	feat: update changelog.md	2024-09-03 08:04:42 +02:00
Pablo Natek	2fb974af0f	Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought	2024-09-03 08:01:19 +02:00
Jon Elias	d18ca14b4e	fix: refs #7553 merge changes	2024-09-03 07:45:46 +02:00
Jon Elias	3d683c1da3	Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-03 07:45:23 +02:00
Javier Segarra	61721b84b9	Merge pull request '#7897 - Solve conflicts masterTest_24_36' (!670) from 7897_masterTest_24_36 into test ... Reviewed-on: #670 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-03 05:40:47 +00:00
Jon Elias	b622f6ef96	fix: refs #7553 fixed QChips like Salix	2024-09-03 07:36:40 +02:00
Pablo Natek	18ded3b6f5	Merge pull request 'feat: refs #7129 add km start and end on create form' (!666) from 7129-someFixesAfterMigration into dev ... Reviewed-on: #666 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-03 05:28:09 +00:00
Pablo Natek	f6fe05a47a	Merge branch 'dev' into 7129-someFixesAfterMigration	2024-09-03 05:26:37 +00:00
Jon Elias	e2674e0cd8	Merge pull request '#7354 end Zone migration' (!539) from 7354_ZoneMigration_End into dev ... Reviewed-on: #539 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-03 04:48:17 +00:00
Jon Elias	a2eb298733	Merge branch 'dev' into 7354_ZoneMigration_End	2024-09-03 04:36:22 +00:00
Javier Segarra	e9da8d44f0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 7897_masterTest_24_36	2024-09-02 19:31:54 +02:00
Jorge Penadés	1824d9a0e9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight	2024-09-02 17:02:58 +02:00
Jorge Penadés	3df86d20d2	chore: refs #6900 drop useless locale	2024-09-02 16:48:15 +02:00
Jorge Penadés	b42385d7d6	refactor: refs #6900 create new expense form	2024-09-02 16:47:54 +02:00
Javier Segarra	9063f5e5a8	perf: change directive location	2024-09-02 15:26:06 +02:00
Javier Segarra	e4bd19b02d	Merge branch 'dev' into plus_key_shortcut	2024-09-02 15:25:42 +02:00
Jorge Penadés	6c113e33fd	Merge pull request 'test To Dev' (!665) from testToDev into dev ... Reviewed-on: #665 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-02 13:12:20 +00:00
Jorge Penadés	a382d8278c	Merge branch 'dev' into testToDev	2024-09-02 13:11:08 +00:00
Carlos Satorres	e73930a4eb	refs #7407 Medical Section remove table	2024-09-02 15:11:04 +02:00
Carlos Satorres	7bd3c0802e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7407-MedicalWorker2	2024-09-02 15:05:51 +02:00
Javier Segarra	05f89d9774	Merge branch 'plus_key_shortcut' of https://gitea.verdnatura.es/verdnatura/salix-front into plus_key_shortcut	2024-09-02 15:05:41 +02:00
Javier Segarra	c495698cac	Merge branch 'dev' into plus_key_shortcut	2024-09-02 15:05:38 +02:00
Javier Segarra	7892e68e1b	feat: updates	2024-09-02 15:03:47 +02:00
Javier Segarra	d65b52804d	Merge pull request '#7889 - Implmenet main shortcuts' (!655) from 7889_main_shortcuts into dev ... Reviewed-on: #655 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-02 13:03:19 +00:00
Javier Segarra	5d511c7b1b	Merge branch 'dev' into 7889_main_shortcuts	2024-09-02 13:02:07 +00:00
Carlos Satorres	0475083a2b	refs #7407 Medical Section	2024-09-02 14:57:01 +02:00
Javier Segarra	c51af96ca7	fix: module icon	2024-09-02 12:56:44 +00:00
Pablo Natek	77d306ffeb	Merge branch 'dev' into 7129-someFixesAfterMigration	2024-09-02 12:46:26 +00:00
Pablo Natek	9cd941a01c	feat: refs #7129 add km start and end on create form	2024-09-02 14:45:43 +02:00
Jon Elias	8ffbe400d5	refactor: refs #7354 modified VnInputTime	2024-09-02 14:21:58 +02:00
Jorge Penadés	0faa42867d	chore: refs #6900 drop comment	2024-09-02 13:52:13 +02:00
Jon Elias	127d5c9fd3	Merge branch '7354_ZoneMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End	2024-09-02 13:44:26 +02:00
Jon Elias	ea1e82939a	fix: refs #7354 e2e tests	2024-09-02 13:44:25 +02:00
Jorge Penadés	136f9abeff	chore: refs #6900 rollback	2024-09-02 13:39:13 +02:00
Jorge Penadés	8ea9742068	chore: refs #6900 rollback	2024-09-02 13:32:20 +02:00
Jorge Penadés	200481414f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into testToDev	2024-09-02 13:21:40 +02:00
Jorge Penadés	f24daa4ebd	feat: refs #6900 hide menu item	2024-09-02 13:15:06 +02:00
Javier Segarra	4415216ea2	Merge branch 'dev' into plus_key_shortcut	2024-09-02 11:14:29 +00:00
Jon Elias	1af4a559fc	Merge branch 'dev' into 7354_ZoneMigration_End	2024-09-02 10:50:22 +00:00
Jon Elias	709f434e5d	refactor: refs #7354 changed icon color in table and notification when deleting a zone	2024-09-02 12:49:15 +02:00
Jon Elias	76a7f8a1b3	refactor: refs #7500 refactor vnimg when storage is dms	2024-09-02 12:09:48 +02:00
Jon Elias	e4e9496cac	Merge branch '7500_ChangeEntryDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 7500_ChangeEntryDms	2024-09-02 11:33:15 +02:00
Jon Elias	5fc33cb4c3	Merge branch 'dev' of https: refs #7500//gitea.verdnatura.es/verdnatura/salix-front into 7500_ChangeEntryDms	2024-09-02 11:33:10 +02:00
Javier Segarra	970c8473a2	fet: updates	2024-09-02 11:28:13 +02:00
Jon Elias	8bcecb91c6	Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-02 11:25:11 +02:00
Jon Elias	45d9322892	feat: refs #7553 added icons, descriptors and missing columns in TicketList and minor changes	2024-09-02 11:24:06 +02:00
Robert Ferrús	a3b253c9eb	feat: refs #211153 businessDataLinkGrafana	2024-09-02 11:14:46 +02:00
Jorge Penadés	63f5f85e8d	Merge pull request 'fix: refs #7524 dynamic fetching' (!662) from 7524-warmfix-useLimit into test ... Reviewed-on: #662 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-02 08:54:27 +00:00