25900 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	e4289398f6	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into beta	2025-01-14 07:59:57 +01:00
Alex Moreno	b4686def94	Merge pull request 'build: refs #8389 dump db' (!3359) from 8389-dump into master ... Reviewed-on: #3359 Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-01-14 06:58:52 +00:00
Alex Moreno	6aa898ee59	build: refs #8389 dump db	2025-01-14 07:39:52 +01:00
Alex Moreno	d0e803421f	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into beta	2025-01-14 07:35:11 +01:00
Alex Moreno	43edb1f82e	Merge pull request '8389-testToMaster' (!3357) from 8389-testToMaster into master ... Reviewed-on: #3357 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-01-14 06:31:07 +00:00
Alex Moreno	00577056dd	build: refs #8389 changelog	2025-01-13 15:24:12 +01:00
Alex Moreno	6e56bdeeb1	fix: refs #8389 prevent error propagation	2025-01-13 15:24:01 +01:00
Alex Moreno	53f33aa89c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into beta	2025-01-13 14:49:53 +01:00
Alex Moreno	13455f6a20	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-01-13 09:19:19 +01:00
Alex Moreno	9d05b16404	fix: canBeInvoiced only in makeInvoice	2025-01-13 09:18:46 +01:00
Robert Ferrús	26a319832c	Merge pull request 'feat: sendCheckingPresence debug' (!3349) from sendCheckPresenceDebug into master ... Reviewed-on: #3349 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-10 09:13:58 +00:00
Sergio De la torre	5ce23ee122	Merge pull request 'fix: refs #6861 refs#6861 addPrevOK' (!3351) from 6861-addPrevOK into test ... Reviewed-on: #3351 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-01-10 07:57:56 +00:00
Sergio De la torre	1ac75d87ad	fix: refs #6861 refs#6861 addPrevOK	2025-01-10 08:55:45 +01:00
Robert Ferrús	ac48d5a406	Merge branch 'master' into sendCheckPresenceDebug	2025-01-10 06:43:39 +00: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
Robert Ferrús	446ffac7f8	feat: sendCheckingPresence debug	2025-01-09 13:44:59 +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	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	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
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
Jorge Penadés	c07e30a89c	fix: prevent deleting absences for past dates	2025-01-08 12:48:28 +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	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
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
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	1ead6944fa	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into beta	2025-01-07 07:50:34 +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