25936 Commits

All Branches

Search

Author	SHA1	Message	Date
Robert Ferrús	f6f8f2214c	Merge pull request 'feat: refs #7584 workerTimeControl_afterDelete' (!3307) from 7584-workerTimeControl_afterDelete into dev ... Reviewed-on: #3307 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2025-01-10 10:05:59 +00:00
Robert Ferrús	1c30de5eee	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2025-01-10 09:36:09 +00:00
Robert Ferrús	bdaaffbbd7	feat: refs #7584 changes request	2025-01-10 10:33:19 +01:00
Guillermo Bonet	e01d7c1fc6	Merge branch 'test' into dev	2025-01-09 14:51:40 +01:00
Guillermo Bonet	e2763a4da9	Merge branch 'master' into test	2025-01-09 14:51:27 +01:00
Guillermo Bonet	6a85272085	fix: refs #7644 Corrected size of buy-label-supplier	2025-01-09 14:45:20 +01:00
Guillermo Bonet	4e608eccc8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-09 11:34:59 +01:00
Guillermo Bonet	2f0a79da3f	Merge branch 'test' into dev	2025-01-09 11:34:53 +01:00
Guillermo Bonet	18adbf9c69	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-01-09 11:34:44 +01:00
Guillermo Bonet	1787cd3102	Merge branch 'master' into test	2025-01-09 11:34:41 +01:00
Guillermo Bonet	2141d7d95d	fix: refs #7912 Major corrections waste_addSales	2025-01-09 11:29:07 +01:00
Alex Moreno	c8cfbf8d40	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-09 09:59:26 +01:00
Alex Moreno	1783f6f7e0	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-01-09 09:54:43 +01:00
Jorge Penadés	bd5610afb6	Merge pull request 'fix: prevent deleting absences for past dates' (!3346) from hotfix-restrictAbsencePrivs into master ... Reviewed-on: #3346 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-09 08:53:24 +00:00
Jorge Penadés	1bca1eb8e6	Merge branch 'hotfix-restrictAbsencePrivs' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-restrictAbsencePrivs	2025-01-09 09:48:20 +01:00
Jorge Penadés	7391beb29e	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-restrictAbsencePrivs	2025-01-09 09:47:51 +01:00
Carlos Satorres	e17eb518dd	Merge pull request 'fix: lang any' (!3348) from hotfix-7355accountLang into master ... Reviewed-on: #3348 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-09 07:07:50 +00:00
Carlos Satorres	cafe6d812a	Merge branch 'master' into hotfix-7355accountLang	2025-01-09 07:03:29 +00:00
Carlos Satorres	d258de1194	fix: lang any	2025-01-09 07:58:59 +01:00
Alex Moreno	2becb20d01	Merge branch 'master' into hotfix-restrictAbsencePrivs	2025-01-09 06:46:18 +00:00
Guillermo Bonet	6b39e5c651	Merge branch 'test' into dev	2025-01-09 07:30:14 +01:00
Guillermo Bonet	15ac9bfd0a	Merge branch 'master' into test	2025-01-09 07:30:04 +01: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	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	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
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