24014 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	441c41e1cc	feat: refs #6695 try	2024-09-11 14:40:07 +02:00
Alex Moreno	72cab3cc58	feat: refs #6695 try	2024-09-11 14:39:02 +02:00
Alex Moreno	72eceb685c	feat: refs #6695 try	2024-09-11 14:36:20 +02:00
Alex Moreno	df74ffcb50	feat: refs #6695 try	2024-09-11 14:27:37 +02:00
Alex Moreno	6dd35aa783	feat: refs #6695 try	2024-09-11 14:24:10 +02:00
Alex Moreno	849a3d7fbc	feat: refs #6695 try	2024-09-11 14:20:17 +02:00
Alex Moreno	33ad80ff33	feat: refs #6695 try	2024-09-11 14:16:22 +02:00
Alex Moreno	f76acd74ae	feat: refs #6695 try	2024-09-11 14:14:51 +02:00
Alex Moreno	f847e6a95a	feat: refs #6695 try	2024-09-11 14:13:07 +02:00
Alex Moreno	dfdf9aa2ca	feat: refs #6695 try	2024-09-11 14:04:30 +02:00
Alex Moreno	24a9943b0c	feat: refs #6695 try	2024-09-11 14:01:16 +02:00
Alex Moreno	b77cc6a360	feat: refs #6695 try	2024-09-11 13:54:58 +02:00
Alex Moreno	3b5c944336	feat: refs #6695 try	2024-09-11 13:54:26 +02:00
Alex Moreno	251f06962b	feat: refs #6695 try	2024-09-11 13:24:49 +02:00
Alex Moreno	07ce1e033f	feat: refs #6695 try	2024-09-11 13:23:34 +02:00
Alex Moreno	e4400dd3e2	feat: refs #6695 try	2024-09-11 13:08:46 +02:00
Alex Moreno	3cca426eba	feat: refs #6695 try	2024-09-11 13:07:54 +02:00
Alex Moreno	17bf720220	feat: refs #6695 try	2024-09-11 13:04:53 +02:00
Alex Moreno	dfcf4ce78a	feat: refs #6695 try	2024-09-11 12:58:14 +02:00
Alex Moreno	3274f7ac58	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6695-docker_push	2024-09-11 11:21:56 +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
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
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
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
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
Alex Moreno	e74da7cbab	feat: refs #7953 pullinfo	2024-09-10 08:17:47 +02:00
Jorge Penadés	eadff638f9	chore: refs #4074 drop focus	2024-09-09 15:59:40 +02:00
Jorge Penadés	45649359be	chore: refs #4074 fix test	2024-09-09 15:59:17 +02:00
Jorge Penadés	579ac481f3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-useAcls	2024-09-09 15:13:52 +02:00
Javier Segarra	a5f6fe95ea	feat(salix): refs #5938 #5938 add futureAlertLevel	2024-09-09 14:58:02 +02:00
Guillermo Bonet	f8b3db7023	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-09-09 14:25:53 +02:00
Guillermo Bonet	946806c98e	Merge branch 'test' into dev	2024-09-09 14:25:51 +02:00
Guillermo Bonet	331ac05a17	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2024-09-09 14:25:15 +02:00
Guillermo Bonet	52f368e4f7	fix: refs #7346 Global invoice	2024-09-09 14:25:13 +02:00
Javier Segarra	89c2d2705c	feat(salix): refs #5938 #5938 change value-field	2024-09-09 14:21:59 +02:00
Javier Segarra	f15b33778c	feat(salix): refs #5938 #5938 replace variables	2024-09-09 14:21:42 +02:00
Jorge Penadés	26be5b292b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-useAcls	2024-09-09 14:18:01 +02:00
Javier Segarra	1a0fb2fecd	Merge pull request 'feat(salix): #7671 define isDestiny field in model' (!2681) from 7671_dense_itemFixedPrices into dev ... Reviewed-on: #2681 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-09 12:17:56 +00:00
Javier Segarra	03d4427bcd	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-09-09 12:16:15 +00:00