25515 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Andrés	0870a1c3d6	refs#8087 Redadas en travel test	2024-11-21 15:09:58 +01:00
Carlos Andrés	dbf71b981e	Merge pull request 'refactor: refs #8210 ticket_splitItemPackingType' (!3217) from 8210-RefactorTicket_splitItemPackingType into dev ... Reviewed-on: #3217 Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-11-21 12:39:34 +00:00
Javi Gallego	80851e094d	Merge branch 'dev' into 7821-entryIsBooked	2024-11-21 13:28:54 +01:00
Javi Gallego	510fffb61a	Merge branch 'dev' into 7821-entryIsBooked	2024-11-21 13:09:01 +01:00
Carlos Andrés	762d4b9955	Merge branch 'dev' into 8210-RefactorTicket_splitItemPackingType	2024-11-21 11:53:59 +00:00
Sergio De la torre	07201f6448	Merge pull request 'fix: refs #7920 refs#7920 itemShelvingLog' (!3231) from 7920-itemShelvingLogs into test ... Reviewed-on: #3231 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-11-21 10:59:52 +00:00
Sergio De la torre	512b4a54df	fix: refs #7920 refs#7920 itemShelvingLog	2024-11-21 11:28:25 +01:00
Carlos Satorres	7b177fa09f	Merge pull request 'fix: hotfix errorMyTeam' (!3229) from hotfix-filterOrder into master ... Reviewed-on: #3229 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-21 09:23:14 +00:00
Carlos Satorres	2978af8341	fix: hotfix errorMyTeam	2024-11-21 10:18:17 +01:00
Ivan Mas	fee9bbe387	Merge pull request 'refactor: refs #7690 unify workerTimeControlParams with workerTimeControlConfig' (!3191) from 7690-renameConfigTables into dev ... Reviewed-on: #3191 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-11-21 09:13:49 +00:00
Ivan Mas	b2fa7e7caf	Merge branch 'dev' into 7690-renameConfigTables	2024-11-21 09:11:06 +00:00
Javi Gallego	b3ce3a0cc2	feat: refs #7821 with test	2024-11-21 09:12:04 +01:00
Jon Elias	9cd16981e6	Merge pull request '#6924 Notify absences only to department boss' (!3175) from 6924-NotifyOnlyToBoss into dev ... Reviewed-on: #3175 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-21 07:06:27 +00:00
Alex Moreno	0ac46882be	Merge branch 'dev' into 6924-NotifyOnlyToBoss	2024-11-21 06:54:00 +00:00
Alex Moreno	f5b16ca36d	Merge pull request 'fix: refs #7529 fix acls' (!3228) from 7529-worerPitFix into dev ... Reviewed-on: #3228 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-21 06:03:19 +00:00
Carlos Satorres	2098ea7163	Merge branch 'dev' into 7529-worerPitFix	2024-11-21 04:48:26 +00:00
Carlos Andrés	031c4398ae	refactor: refs #8210 ticket_splitItemPackingType	2024-11-20 19:19:03 +01:00
Jorge Penadés	e125dee691	refactor: refs #7229 desestructure	2024-11-20 16:51:14 +01:00
Jorge Penadés	940bc8caed	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7229-fixDownloadFile	2024-11-20 15:34:04 +01:00
Ivan Mas	0274c01c14	Merge branch 'dev' into 7690-renameConfigTables	2024-11-20 13:54:57 +00:00
Ivan Mas	830573e229	refactor: refs #7690 remove modifications printQueue_check.sql	2024-11-20 14:49:55 +01:00
Carlos Satorres	82f4815282	fix: refs #7529 fix acls	2024-11-20 14:16:26 +01:00
Guillermo Bonet	69bdf8efb2	Merge branch 'test' into dev	2024-11-20 14:08:42 +01:00
Sergio De la torre	a8dea64bc1	Merge pull request 'fix: refs #7920 refs#7920 itemShelvingLog' (!3227) from 7920-itemShelvingLog into test ... Reviewed-on: #3227 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-11-20 13:07:51 +00:00
Sergio De la torre	9fbffe8a6b	fix: refs #7920 refs#7920 itemShelvingLog	2024-11-20 14:03:23 +01:00
Jorge Penadés	16111220fb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7229-fixDownloadFile	2024-11-20 13:52:55 +01:00
Jorge Penadés	bbb7815765	fix: refs #7229 set right urls	2024-11-20 13:52:24 +01:00
Carlos Satorres	d46683cd31	Merge pull request 'refs #7529 back models acls' (!2563) from 7529-workerPIT into dev ... Reviewed-on: #2563 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-20 12:21:30 +00:00
Carlos Satorres	7ab1b7d171	Merge branch 'dev' of https: refs #7529//gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT	2024-11-20 13:14:26 +01:00
Carlos Satorres	df249b05d3	fix: refs #7529 fix acl	2024-11-20 13:10:43 +01:00
Pablo Natek	cde3c8c50a	Merge pull request 'feat: refs #8138 reduce credit on risk' (!3215) from 8138-feat-reduce-credit-on-risk into dev ... Reviewed-on: #3215 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-11-20 11:21:09 +00:00
Guillermo Bonet	42a27f3407	Merge branch 'test' into dev	2024-11-20 12:17:53 +01:00
Guillermo Bonet	d302a9c3ba	Merge branch 'master' into test	2024-11-20 12:17:30 +01:00
Guillermo Bonet	917e3128a9	Merge pull request 'fix: refs #8191 Deleted msg send rocket in getSales.js' (!3225) from 8191-getSales into master ... Reviewed-on: #3225 Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>	2024-11-20 11:13:28 +00:00
Guillermo Bonet	22ce7a4dd4	fix: refs #8191 Deleted unused traductions	2024-11-20 12:07:10 +01:00
Guillermo Bonet	a4b568e9b8	fix: refs #8191 Deleted msg send rocket in getSales.js	2024-11-20 12:03:30 +01:00
Carlos Satorres	91164624bc	Merge pull request 'fix: fix deleteZone' (!3224) from hotfix-deleteZoneShipped into master ... Reviewed-on: #3224 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-11-20 10:19:06 +00:00
Carlos Satorres	be311c0557	fix: fix deleteZone	2024-11-20 11:09:15 +01:00
Jorge Penadés	e4317a385c	Merge pull request 'fix: refs #6818 add config' (!3223) from 6818-warmfixxInsertConfig into test ... Reviewed-on: #3223 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-20 09:00:39 +00:00
Jorge Penadés	3cce342d9d	fix: refs #6818 add config	2024-11-20 09:52:42 +01:00
Pablo Natek	5e52b3b596	Merge branch 'dev' into 8138-feat-reduce-credit-on-risk	2024-11-20 06:46:46 +00:00
Carlos Andrés	ad345a0b91	Merge pull request 'feat: refs#8087 Redadas en travel' (!3177) from 8087-nuevosCamposTravel into dev ... Reviewed-on: #3177 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-19 16:57:15 +00:00
Carlos Andrés	43abb52efc	refactor: refs #8210 ticket_splitItemPackingType	2024-11-19 16:58:15 +01:00
Ivan Mas	715cea0670	Merge branch 'dev' into 7690-renameConfigTables	2024-11-19 15:07:03 +00:00
Ivan Mas	a9d45bde4c	refactor: refs #7690 modify printQueue_check and rename tables	2024-11-19 16:03:23 +01:00
Alex Moreno	46148d7ba3	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-11-19 14:09:58 +01:00
Alex Moreno	033e269a5d	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-11-19 14:09:46 +01:00
Carlos Andrés	63c0747304	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8087-nuevosCamposTravel	2024-11-19 13:52:12 +01:00
Carlos Andrés	953bc84a58	feat: refs#8087 Redadas en travel	2024-11-19 13:49:02 +01:00
Jon Elias	492c79de46	Merge branch 'dev' into 6924-NotifyOnlyToBoss	2024-11-19 12:42:53 +00:00