25987 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	15ac9bfd0a	Merge branch 'master' into test	2025-01-09 07:30:04 +01:00
Robert Ferrús	7593edeabc	Merge branch 'dev' into 8077-sumDefaulter	2025-01-09 06:28:37 +00:00
Guillermo Bonet	d0d1950e75	fix: refs #7912 Changed week num param to to be similar vn.time	2025-01-09 07:28:14 +01:00
Robert Ferrús	eba9a1e38c	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2025-01-09 06:11:26 +00:00
Jorge Penadés	50a95ed3c4	fix: correct variable name in canModifyAbsenceInPast method	2025-01-08 18:30:33 +01:00
Jorge Penadés	b12c3bb72f	fix: enable tests for createAbsence and deleteAbsence methods	2025-01-08 18:28:00 +01:00
Jorge Penadés	412638d590	fix: refactor access control for modifying past absences	2025-01-08 18:27:23 +01:00
Jorge Penadés	838617e3f6	fix: update access control for modifying absences in the past	2025-01-08 15:47:53 +01:00
Jorge Penadés	f557b41feb	fix: tests	2025-01-08 13:52:50 +01:00
Ivan Mas	f9666b8e60	Merge pull request 'feat: refs #7343 delete sending to user' (!3334) from 7343-modifyDriverRouteEmail into dev ... Reviewed-on: #3334 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-01-08 12:17:49 +00:00
Ivan Mas	14b88b1ad6	Merge branch 'dev' into 7343-modifyDriverRouteEmail	2025-01-08 12:16:01 +00:00
Jorge Penadés	c07e30a89c	fix: prevent deleting absences for past dates	2025-01-08 12:48:28 +01:00
Robert Ferrús	954d9b5ca7	Merge branch 'dev' into 8077-sumDefaulter	2025-01-08 11:33:47 +00:00
Robert Ferrús	d831b5197d	feat: refs #8077 create testo to sumAmount	2025-01-08 12:30:15 +01:00
Robert Ferrús	bdbc02e1b7	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2025-01-08 10:46:45 +00:00
Alex Moreno	f1b45a3903	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-08 11:43:00 +01:00
Alex Moreno	e57e9ee9dd	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-01-08 11:42:49 +01:00
Alex Moreno	60933216f7	fix: hotFix getMondayWeekYear	2025-01-08 11:42:32 +01:00
Alex Moreno	a4e22485c0	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-01-08 11:41:17 +01:00
Alex Moreno	ecc877e07d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-08 11:35:30 +01:00
Alex Moreno	9842f70bec	fix: hotFix getMondayWeekYear	2025-01-08 11:25:07 +01:00
Sergio De la torre	71006797af	Merge pull request 'fix: refs #6861 refs·6861 ticketOrderReserve' (!3344) from 6861-ticketOrderReserves into master ... Reviewed-on: #3344 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-01-08 09:31:21 +00:00
Sergio De la torre	70ad6e2624	fix: refs #6861 refs·6861 ticketOrderReserve	2025-01-08 10:25:08 +01:00
Alex Moreno	c0c75c1bee	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-01-08 09:41:31 +01:00
Alex Moreno	5ab06ef6e4	fix: hotFix getStartDateOfWeekNumber	2025-01-08 09:39:55 +01:00
Robert Ferrús	5287b8a492	Merge branch 'dev' into 8077-sumDefaulter	2025-01-08 06:32:55 +00:00
Robert Ferrús	94ccdabe89	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2025-01-08 06:23:04 +00:00
Ivan Mas	0940a31288	Merge branch 'dev' into 7343-modifyDriverRouteEmail	2025-01-07 16:47:43 +00:00
Javi Gallego	dbd8d816c0	fix: refs #8361 streamline transaction handling in exchangeRateUpdate	2025-01-07 14:53:26 +01:00
Guillermo Bonet	2572182a89	Merge pull request 'feat: refs #8357 Agregados triggers para manejar exclusiones de trabajadores en la tabla workerMana' (!3341) from 8357-workerManaExcludedTriggers into dev ... Reviewed-on: #3341 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-07 13:38:47 +00:00
Robert Ferrús	8417030438	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2025-01-07 12:43:57 +00:00
Guillermo Bonet	c83e6a8bbd	Merge branch 'dev' into 8357-workerManaExcludedTriggers	2025-01-07 12:28:23 +00:00
Ivan Mas	b68ffb0819	Merge pull request 'feat: refs #8073 #refs 8073 create vn.productionCountryVolume' (!3321) from 8073-newTableProductionCountryVolume into dev ... Reviewed-on: #3321 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-01-07 12:19:13 +00:00
Ivan Mas	23fb04876c	Merge branch 'dev' into 8073-newTableProductionCountryVolume	2025-01-07 12:16:20 +00:00
Guillermo Bonet	065f13557b	feat: refs #8357 Agregados triggers para manejar exclusiones de trabajadores en la tabla workerMana	2025-01-07 11:58:36 +01:00
Javi Gallego	786f1fe661	test: refs #8361 enhance exchangeRateUpdate specs to validate day1 and day2 entries without backfilling day3	2025-01-07 11:06:09 +01:00
Javi Gallego	73d5d508ce	test: refs #8361 enhance exchangeRateUpdate specs with additional scenarios	2025-01-07 10:45:51 +01:00
Jon Elias	b1dda9f82b	Merge pull request '#7202 added new field in InvoiceOut module' (!3034) from 7202-AddCustomAgentFkColumn into dev ... Reviewed-on: #3034 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-01-07 09:03:14 +00:00
Jon Elias	c06f2c4e6f	Merge branch 'dev' into 7202-AddCustomAgentFkColumn	2025-01-07 09:00:26 +00:00
Alex Moreno	1d8dcdf63f	build: add new version	2025-01-07 09:44:50 +01:00
Alex Moreno	b83499c180	Merge pull request '8356-devToTest' (!3339) from 8356-devToTest into test ... Reviewed-on: #3339 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2025-01-07 08:37:56 +00:00
Robert Ferrús	f04f88d2fc	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2025-01-07 08:00:54 +00:00
Javi Gallego	399081f83c	Merge pull request '#7832 - ticketServiceModifyConcept' (!3332) from 7832-ticketServiceModifyConcept into dev ... Reviewed-on: #3332 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-01-07 07:45:41 +00:00
Javi Gallego	4f3c101e42	Merge branch 'dev' into 7832-ticketServiceModifyConcept	2025-01-07 07:43:19 +00:00
Alex Moreno	1cd083ac68	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-07 08:16:43 +01:00
Alex Moreno	a713ef64e8	Merge pull request 'build: refs #8355 dump db' (!3338) from 8355-dump into master ... Reviewed-on: #3338 Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-01-07 07:16:27 +00:00
Alex Moreno	48d4bab706	build: refs #8355 dump db	2025-01-07 08:01:44 +01:00
Alex Moreno	72bf27f08d	Merge pull request '8355-testToMaster' (!3336) from 8355-testToMaster into master ... Reviewed-on: #3336 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-01-07 06:44:56 +00:00
Jon Elias	c3a5a5da27	Merge pull request '#8246: added new field's relation' (!3337) from 8246-ZoneListNewField into dev ... Reviewed-on: #3337 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-07 06:40:49 +00:00
Jon Elias	ecee47f859	Merge branch 'dev' into 8246-ZoneListNewField	2025-01-07 06:22:31 +00:00