24328 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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
Jon Elias	3fd9b8195b	Merge branch 'dev' into 6346-FixWagonModule	2024-09-10 05:53:49 +00:00
Jon Elias	9759715609	fix: refs #6346 created test	2024-09-10 07:52:09 +02:00
Jon Elias	0593ea9a30	Merge branch '6346-FixWagonModule' of https://gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule	2024-09-10 07:50:42 +02:00
Jon Elias	125c0c9b3b	refactor: refs #6346 requested changes	2024-09-10 07:50:40 +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
Javier Segarra	c407dde7a0	feat(salix): refs #6156 #6156 remove redundant condition	2024-09-09 15:14:01 +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	615f57b2e6	feat(salix): refs #6156 #6156 simplify CONCAT_WS	2024-09-09 15:13:32 +02:00
Javier Segarra	f9a25617f0	feat(salix): refs #6156 #6156 add missing values	2024-09-09 15:13:08 +02:00
Javier Segarra	f70f475223	feat(salix): refs #6156 #6156 change user definer	2024-09-09 15:12:44 +02:00
Javier Segarra	773933ca3c	feat(salix): refs #6156 #6156 change config sql	2024-09-09 15:11:55 +02:00
Alex Moreno	1aa888b1a3	feat(WorkerDms_filter): refs #7182 split code. fix: filter	2024-09-09 15:11:09 +02:00
Javier Segarra	a5f6fe95ea	feat(salix): refs #5938 #5938 add futureAlertLevel	2024-09-09 14:58:02 +02:00
Guillermo Bonet	bf1a43a23e	refactor: refs #7900 Deleted sectorProdPriority column	2024-09-09 14:43:16 +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
Javier Segarra	38ee76f7c9	Merge branch 'dev' into 6156-advanceTicketsNewField	2024-09-09 12:20:02 +00: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
Jorge Penadés	6e511f00c0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-useAcls	2024-09-09 13:58:46 +02:00
Alex Moreno	5a04083d31	Merge pull request 'feat(AccessToken&ACL): refs #7547 upgrade security' (!2630) from 7547-accessToken-security into dev ... Reviewed-on: #2630 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-09-09 11:02:06 +00:00
Carlos Andrés	804d10894b	Merge pull request 'fix: ticket 218504 ticket_close' (!2938) from Hotfix-Ticket-218504-ticket_Close into master ... Reviewed-on: #2938 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-09-09 10:53:19 +00:00
Javier Segarra	2fef104954	Merge branch 'dev' into 6156-advanceTicketsNewField	2024-09-09 10:48:20 +00:00
Guillermo Bonet	689315bab8	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2024-09-09 12:42:21 +02:00
Guillermo Bonet	d9a4b3e6fb	fix: refs #7346 Global invoice	2024-09-09 12:42:19 +02:00
Alex Moreno	0949112b13	Merge branch 'dev' of https: refs #7547//gitea.verdnatura.es/verdnatura/salix into 7547-accessToken-security	2024-09-09 12:42:13 +02:00
Carlos Andrés	88a8b4975b	fix: ticket 218504 ticket_close	2024-09-09 12:37:49 +02:00
Juan Ferrer	d2ead9d936	Merge pull request 'fix: refs #7931 Merge available fix into master' (!2936) from test into master ... Reviewed-on: #2936 Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-09-09 10:20:42 +00:00
Javier Segarra	31b04cba75	feat(salix): refs #6156 #6156 Move to myt version	2024-09-09 12:08:12 +02:00
Carlos Satorres	a25dac140e	Merge pull request 'refs #6898 fix supplier remove' (!2605) from 6998-supplierMigration into dev ... Reviewed-on: #2605 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-09 09:56:41 +00:00
Carlos Satorres	01690ed081	Merge branch 'dev' into 6998-supplierMigration	2024-09-09 09:39:15 +00:00