24191 Commits

All Branches

Search

Author	SHA1	Message	Date
Sergio De la torre	87182abf7e	fix: available refs #6861	2024-09-11 12:47:51 +02:00
Guillermo Bonet	07f7f87c28	Merge pull request 'fix: refs #7213 change rounding problems' (!2943) from 7213-changeRoundingProblem into master ... Reviewed-on: #2943 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-09-11 10:32:59 +00:00
Guillermo Bonet	011c16180d	fix: refs #7213 buyUltimate	2024-09-11 12:31:16 +02:00
Javier Segarra	ace4e6975d	Merge pull request 'refs #6156 new field' (!1718) from 6156-advanceTicketsNewField into dev ... Reviewed-on: #1718 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-11 10:27:05 +00:00
Guillermo Bonet	2a41fc6fc4	Merge branch 'dev' into 6727-logClean	2024-09-11 09:25:52 +00:00
Javi Gallego	10f7583587	feat: refs #7956 sin AS	2024-09-11 11:22:22 +02:00
Sergio De la torre	037e3fab23	Merge pull request 'fix: debugAdd refs #6861' (!2944) from 6861_debugAdd_hotFix into master ... Reviewed-on: #2944 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-11 09:02:18 +00:00
Alex Moreno	17fecf6dcb	Merge branch '7182-workerDms_optimization' of https://gitea.verdnatura.es/verdnatura/salix into 7182-workerDms_optimization	2024-09-11 10:31:44 +02:00
Alex Moreno	c21da8d258	fix: refs #7182 function name	2024-09-11 10:31:43 +02:00
Alex Moreno	e062088f1e	Merge branch 'dev' into 7182-workerDms_optimization	2024-09-11 08:29:38 +00:00
Pablo Natek	842c98edfc	Merge branch 'dev' into 6156-advanceTicketsNewField	2024-09-11 08:22:24 +00:00
Pablo Natek	92f305b9fd	fix: refs #6156 proc and version	2024-09-11 10:19:55 +02:00
Carlos Andrés	ad8f27ea81	fix: refs #7213 change rounding problems	2024-09-11 10:15:37 +02:00
Jorge Penadés	d699d9f60c	Merge pull request '#7663 setWeight' (!2817) from 7663-setWeight into dev ... Reviewed-on: #2817 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-11 07:40:31 +00:00
Jorge Penadés	2ee0c93e24	chore: refs #7663 fix test	2024-09-11 09:35:26 +02:00
Jorge Penadés	249646236a	Merge branch '7663-setWeight' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-09-11 09:30:31 +02:00
Jorge Penadés	558ab6eba2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-09-11 09:30:18 +02:00
Carlos Satorres	6c8c617837	Merge pull request 'fix: setDeleted' (!2947) from hotfix7960-setDeleted into master ... Reviewed-on: #2947 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-11 06:51:54 +00:00
Carlos Satorres	838b8f541f	fix: setDeleted	2024-09-11 08:45:00 +02:00
Carlos Satorres	ccaf56f842	fix: setDeleted	2024-09-11 08:35:19 +02:00
Alex Moreno	a65506aebd	Merge branch 'dev' into 7663-setWeight	2024-09-11 06:35:01 +00:00
Javier Segarra	0aadb6d70f	Merge pull request '#5938 - fine_ticketAdvance' (!2940) from 5938_fine_ticketAdvance into dev ... Reviewed-on: #2940 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-11 06:29:34 +00:00
Alex Moreno	63866a34da	Merge branch 'dev' into 6346-FixWagonModule	2024-09-11 06:21:31 +00:00
Alex Moreno	fbfbf21e06	fix: refs #7182 unnesesary file	2024-09-11 08:17:18 +02:00
Alex Moreno	8dc83e2444	feat: refs #7182 optimize workerDms filter	2024-09-11 08:16:21 +02:00
Javi Gallego	ed8cf628a5	feat: refs #7956 tabulaciones	2024-09-11 08:15:32 +02:00
Javi Gallego	6ae15a8e64	feat: refs #7956 definer	2024-09-11 08:13:28 +02:00
Javi Gallego	56e6a7e6aa	feat: refs #7956 parametro daysInForward	2024-09-11 08:10:21 +02:00
Alex Moreno	e7d3062208	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7182-workerDms_optimization	2024-09-11 08:07:29 +02:00
Sergio De la torre	b492a1e6a8	feat: refs #6868 refs# 6868 handleUser	2024-09-11 08:05:26 +02:00
Sergio De la torre	f7f7df55f5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6868_createLogin	2024-09-11 08:00:07 +02:00
Sergio De la torre	bebd49f08a	fix: debugAdd refs #6861	2024-09-11 07:08:36 +02:00
Jorge Penadés	b10ad7527a	Merge pull request 'feat: refs #7524 no apply limit' (!2921) from 7524-hotfix-addNoLimit into master ... Reviewed-on: #2921 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-09-10 14:48:20 +00:00
Jorge Penadés	e3b51c81f9	refactor: refs #7524 wrap it up in a fn	2024-09-10 16:37:46 +02:00
Javier Segarra	f487aed336	Merge branch 'dev' into 5938_fine_ticketAdvance	2024-09-10 14:16:56 +00:00
Jorge Penadés	ff61a7d88f	Merge pull request '#4074 useAcls' (!2827) from 4074-useAcls into dev ... Reviewed-on: #2827 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-10 11:50:34 +00:00
Jorge Penadés	85c50db19e	Merge branch 'dev' into 4074-useAcls	2024-09-10 11:45:09 +00:00
Jorge Penadés	1ff1a97f29	feat: refs #7524 check noLimit method key	2024-09-10 13:21:56 +02:00
Carlos Andrés	8fd7c1a8dd	fix: refs #7213 change rounding problems	2024-09-10 13:16:15 +02:00
Jorge Penadés	d98f0a2493	chore: refs #7524 rollback	2024-09-10 13:15:58 +02:00
Jorge Penadés	b16c2bed2b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7524-hotfix-addNoLimit	2024-09-10 13:09:33 +02:00
Carlos Andrés	0bbf10ca4f	fix: refs #7213 change rounding problems	2024-09-10 12:59:07 +02:00
Guillermo Bonet	68063fdc52	Merge branch 'test' into dev	2024-09-10 12:58:38 +02:00
Guillermo Bonet	01d591af53	fix: refs #7564 Deleted query	2024-09-10 12:58:16 +02:00
Carlos Satorres	ff328c9f0d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2024-09-10 11:34:50 +02:00
Alex Moreno	bb27f0f1f5	build: init version 2440	2024-09-10 10:34:28 +02:00
Jorge Penadés	91abf2eefe	refactor: refs #7663 accurate error	2024-09-10 09:50:02 +02:00
Jorge Penadés	e2ef3472b5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-09-10 09:41:46 +02:00
Alex Moreno	8e5d088797	Merge pull request '7953-devToTest_2438' (!2942) from 7953-devToTest_2438 into test ... Reviewed-on: #2942 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-09-10 07:22:29 +00:00
Javi Gallego	1c0e148233	fix: cau #217599	2024-09-10 09:08:43 +02:00