3820 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	b1b0f4efed	Merge branch 'dev' into 6243-fixColumnWidth	2024-06-18 07:49:46 +00:00
Carlos Satorres	e6bf73c8d1	Merge pull request 'refs #6897 remove code fix section' (!415) from 6897-EntryMigration into dev ... Reviewed-on: #415 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-18 06:16:18 +00:00
Carlos Satorres	1cf630378b	Merge branch 'dev' into 6897-EntryMigration	2024-06-18 06:15:12 +00:00
Carlos Satorres	af59da33aa	Merge pull request '7366-travelMigration' (!430) from 7366-travelMigration into dev ... Reviewed-on: #430 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-18 06:03:41 +00:00
Carlos Satorres	0940872625	Merge branch '6897-EntryMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-EntryMigration	2024-06-18 07:18:47 +02:00
Carlos Satorres	bc30531d42	refs #6897 fix trad	2024-06-18 07:18:44 +02:00
Jorge Penadés	f64f42f473	fix: refs #6243 load warehouses & iron out column width	2024-06-17 10:46:51 +02:00
Carlos Satorres	f4b7d34a7f	refs #7366 fix redirect	2024-06-17 08:39:39 +02:00
Carlos Satorres	8002f0a94b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration	2024-06-14 12:59:16 +02:00
Carlos Satorres	7fccd0ae81	Merge branch '7366-travelMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration	2024-06-14 10:47:03 +02:00
Javier Segarra	914a9afb92	Merge pull request 'Fix worker department: Create modal did not open' (!441) from hyervoni/salix-front-mindshore:bugfix/WorkerDepartment into dev ... Reviewed-on: #441 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-06-13 12:57:40 +00:00
Javier Segarra	7d73cd0e33	Merge branch 'dev' into bugfix/WorkerDepartment	2024-06-13 14:56:34 +02:00
Javier Segarra	648546888d	fix: DeleteDepartment VnConfirm	2024-06-13 14:56:19 +02:00
Carlos Satorres	548fc374c8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration	2024-06-13 09:22:45 +02:00
Carlos Satorres	8c5ea42be2	Merge branch 'dev' into 6897-EntryMigration	2024-06-13 06:51:02 +00:00
Carlos Satorres	3958d5ab08	Merge branch 'dev' into 7366-travelMigration	2024-06-13 06:50:28 +00:00
Pablo Natek	78042ab109	Merge pull request 'fix: refs #7499 id article' (!428) from 7499-refactorEntrys into dev ... Reviewed-on: #428 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-13 05:41:26 +00:00
Pablo Natek	e10755d8fe	Merge branch 'dev' into 7499-refactorEntrys	2024-06-13 05:39:13 +00:00
Javier Segarra	ffd4109dc7	Merge branch 'dev' into bugfix/WorkerDepartment	2024-06-12 20:23:30 +00:00
Carlos Satorres	6e4843563c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-EntryMigration	2024-06-12 14:42:06 +02:00
Carlos Satorres	34e92d130a	refs #7366 fix basic-data	2024-06-12 14:31:18 +02:00
William Buezas	b0e4dc99b0	Fix worker department create modal did not open	2024-06-12 08:47:32 -03:00
Guillermo Bonet	9388cb3599	Merge branch 'test' into dev	2024-06-12 12:02:12 +02:00
Guillermo Bonet	135e05b139	hotfix: refs #6636 EN i18n	2024-06-12 12:00:43 +02:00
Javier Segarra	ef24a5cd2f	Merge pull request '#7323 FIX default model value depends on route' (!437) from 7323_fix_workerTimeControl into dev ... Reviewed-on: #437 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-12 07:33:27 +00:00
Javier Segarra	11c0154c48	Merge branch 'dev' into 7323_fix_workerTimeControl	2024-06-12 07:31:51 +00:00
Alex Moreno	11d1fdd80e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-06-12 08:41:03 +02:00
Alex Moreno	6a19687066	Merge pull request 'feat(jenkinsfile): use build_id' (!438) from jenkinsFile_useBuildIdInVersion into master ... Reviewed-on: #438 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-06-12 06:21:36 +00:00
Pablo Natek	b7a097fd13	Merge branch 'dev' into 7499-refactorEntrys	2024-06-12 06:16:48 +00:00
Alex Moreno	937f75ec63	feat(jenkinsfile): use build_id	2024-06-12 07:40:04 +02:00
Jon Elias	79e84175a6	Merge pull request '#7154 new item descriptor field' (!436) from 7154-ItemDescriptor into dev ... Reviewed-on: #436 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-12 05:05:33 +00:00
Jon Elias	df364dca4a	Merge branch 'dev' into 7154-ItemDescriptor	2024-06-12 05:04:16 +00:00
Javier Segarra	e9051f1ee8	Merge pull request 'Account views: Accounts, Ldap, Samba' (!426) from hyervoni/salix-front-mindshore:feature/AccountFormsView into dev ... Reviewed-on: #426 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-06-11 19:14:29 +00:00
Javier Segarra	d0759cb654	Merge branch 'dev' into feature/AccountFormsView	2024-06-11 21:12:13 +02:00
Pablo Natek	a65f5dfe44	fix: refs #7499 use current colors	2024-06-11 16:38:12 +02:00
Jon Elias	4045a3a631	Merge branch 'dev' into 7154-ItemDescriptor	2024-06-11 12:56:52 +00:00
Javi Gallego	cb0559fee8	Merge pull request '7548-ticketSummaryCollection' (!432) from 7548-ticketSummaryCollection into dev ... Reviewed-on: #432 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-11 12:53:42 +00:00
Pablo Natek	6789f3d1cb	fix: refs #7499 fix style	2024-06-11 14:32:01 +02:00
Jon Elias	2d0b33c626	Merge branch '7154-ItemDescriptor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7154-ItemDescriptor	2024-06-11 14:29:44 +02:00
Jon Elias	de18b670ea	feat: refs #7154 changed label	2024-06-11 14:29:42 +02:00
Pablo Natek	be919f97b1	Merge branch '7499-refactorEntrys' of https://gitea.verdnatura.es/verdnatura/salix-front into 7499-refactorEntrys	2024-06-11 14:28:20 +02:00
Pablo Natek	80adeede81	fix: refs #7499 fix item reference	2024-06-11 14:28:19 +02:00
Javier Segarra	7ac2aed326	fix: default model value depends on route	2024-06-11 14:09:42 +02:00
Jon Elias	989ea3d82c	Merge branch 'dev' into 7154-ItemDescriptor	2024-06-11 11:49:25 +00:00
Jon Elias	e5a590a9f9	feat: refs #7154 new item descriptor field	2024-06-11 13:48:15 +02:00
Javier Segarra	57eadbc74e	Merge pull request 'Account connections' (!424) from hyervoni/salix-front-mindshore:feature/AccountConnections into dev ... Reviewed-on: #424 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-06-11 08:53:26 +00:00
Carlos Satorres	ba0364e799	refs #6897 fix BasicData	2024-06-11 10:30:42 +02:00
Javier Segarra	fac9b6a439	Merge branch 'dev' into feature/AccountConnections	2024-06-11 07:39:41 +00:00
Javier Segarra	fde004af3c	Merge pull request 'Worker descriptor menu' (!433) from hyervoni/salix-front-mindshore:feature/WorkerDescriptorMenu into dev ... Reviewed-on: #433 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-11 07:39:05 +00:00
Javier Segarra	adbc9dee2c	Merge branch 'dev' into feature/WorkerDescriptorMenu	2024-06-11 07:37:06 +00:00