1171 Commits

Author	SHA1	Message	Date
Jon Elias	4bdbb3b08e	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-07-03 07:13:21 +00:00
Sergio De la torre	5992d7f53f	Merge branch 'dev' into 6861-Reservas-front	2024-07-01 14:39:19 +00:00
Jon Elias	0e84749c07	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-07-01 10:22:11 +00:00
Jorge Penadés	2b0df02f20	Merge branch 'dev' into 6286-setRightWorkerTimeControlAcls	2024-06-27 08:34:53 +00:00
Sergio De la torre	cbc00b90b9	feat front-reservas refs #6861	2024-06-26 14:02:25 +02:00
Jorge Penadés	1f6fd8d6d1	feat: refs #6286 check if is teamBoss	2024-06-25 17:27:00 +02:00
Jorge Penadés	93f2995d39	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls	2024-06-25 16:26:13 +02:00
Carlos Satorres	d1ed4b4459	refs #7409 fix back	2024-06-25 16:03:59 +02:00
Carlos Satorres	ffff851d1a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome	2024-06-25 14:49:32 +02:00
Alex Moreno	95a23ad9fc	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-06-25 11:43:42 +00:00
Carlos Satorres	424e0c430c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome	2024-06-21 09:50:29 +02:00
Carlos Satorres	a80b0c3b4c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation	2024-06-21 08:36:50 +02:00
Jon Elias	419de69690	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6436_jasmine_beforeAll	2024-06-20 12:24:06 +02:00
Alex Moreno	f84e85e443	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-06-20 09:48:34 +02:00
Jorge Penadés	6967aa9811	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls	2024-06-19 13:40:09 +02:00
Alex Moreno	e8c7b55329	fix(WorkerIncome): refs #7409 fix models	2024-06-17 14:17:43 +02:00
Carlos Satorres	fa8c1b3879	acls, fixtures, models	2024-06-17 13:50:07 +02:00
Jorge Penadés	4bc62a30bd	fix: refs #6744 back test	2024-06-17 12:23:01 +02:00
Jorge Penadés	89ea931d9c	feat: refs #6744 add locale & drop verification	2024-06-17 12:19:59 +02:00
Carlos Satorres	54b6ef491f	refs #7409 back	2024-06-17 10:23:30 +02:00
Guillermo Bonet	9b80ef73a8	Merge branch 'test' into dev	2024-06-14 12:48:00 +02:00
Carlos Satorres	189c67bd2d	warmFix change if	2024-06-14 09:43:10 +02:00
Jon Elias	61a588b57c	refactor: refs #6436 fixed test	2024-06-14 08:39:57 +02:00
Jorge Penadés	784bd91e04	fix: refs #6286 update WorkerTimeControl permissions	2024-06-13 13:43:28 +02:00
Jorge Penadés	7480f5ecb3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls	2024-06-12 16:54:03 +02:00
Jon Elias	84a51d3e8d	feat: refs #6436 changed tests	2024-06-12 12:23:37 +02:00
Jon Elias	944355d54f	refactor: refs #6436 end first wave of changes in modules	2024-06-11 13:17:19 +02:00
Alex Moreno	3b44bdd2bf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation	2024-06-11 12:56:56 +02:00
Jon Elias	7df7382346	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6436_jasmine_beforeAll	2024-06-11 09:41:26 +02:00
Jon Elias	f0ad012835	refactor: refs #6436 first wave	2024-06-11 09:39:06 +02:00
Jorge Penadés	479e4f3f8a	feat: refs #6273 required payMethod for internals	2024-06-07 13:55:56 +02:00
Jorge Penadés	310c2383cb	fix: refs #6286 replace id for reason	2024-06-07 09:08:21 +02:00
Jorge Penadés	1912fdd45d	refactor: refs #6286 replace name	2024-06-06 17:26:23 +02:00
Jorge Penadés	14afd8246a	feat: refs #6273 add back test	2024-06-05 17:38:48 +02:00
Jorge Penadés	8188bdbcb0	fix: refs #6273 use userId	2024-06-05 17:12:37 +02:00
Jorge Penadés	a79285cd3d	feat: refs #6273 register freelance	2024-06-05 16:27:00 +02:00
Alex Moreno	bbf027ede5	fix(operator): neq error	2024-06-03 15:01:06 +02:00
Robert Ferrús	85c328e522	fix: refs #7039 hotFixcountry	2024-05-31 10:07:27 +02:00
Carlos Satorres	b95009899c	refs #7406 fix back	2024-05-28 12:22:11 +02:00
Alex Moreno	8ec2a10cbf	deploy: dump	2024-05-28 12:05:09 +02:00
Carlos Satorres	578b8a2c71	refs #7406 changes sql, modelconfig model	2024-05-27 14:28:13 +02:00
Carlos Satorres	208409acb2	refs #7406 add relation	2024-05-27 11:50:15 +02:00
Carlos Satorres	723327918b	refs #7406 worker formation	2024-05-24 15:55:23 +02:00
Pablo Natek	86a6211cd8	fix: refs #7187 fix duplicate	2024-05-23 12:23:31 +02:00
Pablo Natek	2142b78deb	feat: refs #7187 Add support for multiple PDAs per user	2024-05-21 19:25:18 +02:00
Pablo Natek	8e5d12a6cb	Merge branch 'dev' into 7187-redirect	2024-05-21 07:18:06 +00:00
Pablo Natek	1fef00789f	fix: refs #7187 remove bindings	2024-05-21 08:54:53 +02:00
Pablo Natek	335b9caaa4	fix: refs #7187 got summary before lilium	2024-05-21 01:10:53 +02:00
Carlos Satorres	cbbd488674	Merge pull request 'refs #7396 fix worker model' (!2474) from 7396-addBasicDataWorker into dev ... Reviewed-on: #2474 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-20 06:27:33 +00:00
Carlos Satorres	05f09d0b87	refs #7187 fix workerPda	2024-05-17 14:56:40 +02:00