25912 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	fff6979921	Merge pull request 'feat: refs #7531 Added address_hasDelivery' (!3361) from 7531-addressHasDelivery into master ... Reviewed-on: #3361 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-20 06:51:18 +00:00
Guillermo Bonet	7a5ed0ff23	Merge branch 'master' into 7531-addressHasDelivery	2025-01-20 06:49:42 +00:00
Guillermo Bonet	934507569e	feat: refs #7531 Added comment	2025-01-20 07:48:43 +01:00
Guillermo Bonet	e6abb1d759	feat: refs #7531 Minor change	2025-01-20 07:41:41 +01:00
Guillermo Bonet	044a22bc3e	feat: refs #7531 Deleted address_hasDelivery	2025-01-20 07:13:04 +01:00
Guillermo Bonet	e636d43f04	feat: refs #7531 Added address_hasDelivery	2025-01-17 09:42:15 +01:00
Guillermo Bonet	a666cfa4cd	feat: refs #7531 Added address_hasDelivery	2025-01-17 09:40:07 +01:00
Guillermo Bonet	1aa1fbda6c	feat: refs #7531 Added address_hasDelivery	2025-01-17 08:10:26 +01:00
Guillermo Bonet	69b78b6bf1	feat: refs #7531 Added address_hasDelivery	2025-01-16 15:04:21 +01:00
Robert Ferrús	03c974db12	Merge pull request 'feat: refs #257275 defaulterFilter' (!3356) from hotFixDefaulterFilter into master ... Reviewed-on: #3356 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-01-16 07:00:48 +00:00
Robert Ferrús	0e8b4d92bf	Merge branch 'master' into hotFixDefaulterFilter	2025-01-16 06:53:00 +00:00
Carlos Andrés	c24b008567	Actualizar modules/travel/back/methods/travel/filter.js	2025-01-15 16:34:44 +00:00
Guillermo Bonet	c2ca9cfbe5	feat: refs #7531 Added address_hasDelivery	2025-01-15 12:26:16 +01:00
Robert Ferrús	620d14355c	Merge branch 'master' into hotFixDefaulterFilter	2025-01-15 09:12:45 +00:00
Carlos Satorres	d95482ea54	Merge pull request 'fix: hotfix 7366 6943' (!3360) from hotfix-7366-6943CreditBillingDataAWB into master ... Reviewed-on: #3360 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-15 07:00:40 +00:00
Carlos Satorres	d9716154bb	Merge branch 'master' into hotfix-7366-6943CreditBillingDataAWB	2025-01-14 11:54:20 +00:00
Carlos Satorres	01072f7cbc	fix: hotfix 7366 6943	2025-01-14 11:36:54 +01:00
Robert Ferrús	2585cce627	Merge branch 'master' into hotFixDefaulterFilter	2025-01-14 07:17:17 +00: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
Robert Ferrús	0891fc6665	Merge branch 'master' into hotFixDefaulterFilter	2025-01-14 06:31:23 +00: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
Robert Ferrús	c4870d52de	feat: refs #257275 defaulterFilter	2025-01-13 14:37:27 +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