6800 Commits

Author	SHA1	Message	Date
Javi Gallego	a40a5a22ab	fix: refs #7821 fixtures without raid	2024-11-18 14:27:38 +01:00
Carlos Satorres	6b0d7762b4	Merge branch '7529-workerPIT' of https://gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT	2024-11-18 13:57:42 +01:00
Carlos Satorres	2790e92741	fix: refs #7529 fix acl	2024-11-18 13:57:40 +01:00
Guillermo Bonet	8d4769d74d	feat: refs #8057 More precision in getGeo	2024-11-18 13:34:20 +01:00
Guillermo Bonet	cdcc5051d2	feat: refs #8057 Fix version	2024-11-18 13:09:33 +01:00
Guillermo Bonet	2b770c0201	feat: refs #8057 Fix version	2024-11-18 12:56:37 +01:00
Guillermo Bonet	aed4bc89c7	feat: refs #8057 Fix version	2024-11-18 12:53:36 +01:00
Javi Gallego	72415a4348	Merge branch 'dev' into 7821-entryIsBooked	2024-11-18 12:49:59 +01:00
Guillermo Bonet	66009ee0dd	Merge branch 'dev' into 8057-geoFk	2024-11-18 09:52:55 +00:00
Guillermo Bonet	754c0cb9ab	Merge branch '8057-geoFk' of https://gitea.verdnatura.es/verdnatura/salix into 8057-geoFk	2024-11-18 10:52:44 +01:00
Guillermo Bonet	a64f9b74ec	feat: refs #8057 Requested changes	2024-11-18 10:52:41 +01:00
Robert Ferrús	329488d700	Merge branch 'dev' into 8127-entry_updateComission	2024-11-18 08:46:49 +00:00
Sergio De la torre	7d5928bc3d	Merge pull request 'feat: refs #8135 refs#8135 updateTicketACL' (!3210) from 8135-ticketACL into dev ... Reviewed-on: #3210 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-18 08:21:18 +00:00
Guillermo Bonet	e81727f3f8	Merge branch 'dev' into 8057-geoFk	2024-11-18 07:58:51 +00:00
Guillermo Bonet	353ca659cd	feat: refs #8057 Requested changes	2024-11-18 08:58:38 +01:00
Ivan Mas	2a1c0ef2af	Merge branch 'dev' into 7690-renameConfigTables	2024-11-15 13:35:14 +00:00
Guillermo Bonet	b529ccfe29	feat: refs #7920 Added ItemShelving in shelvingLog	2024-11-15 12:43:15 +01:00
Robert Ferrús	923296e85e	Merge branch 'dev' into 8127-entry_updateComission	2024-11-15 10:34:34 +00:00
Guillermo Bonet	a3945070f2	refactor: refs #7920 No changes in itemShelvingLog table	2024-11-15 11:34:18 +01:00
Robert Ferrús	c5f1b05671	feat: refs #8127 quitar esquemas	2024-11-15 11:32:20 +01:00
Robert Ferrús	f7a5fc7e31	Merge branch 'dev' into 8127-entry_updateComission	2024-11-15 10:06:45 +00:00
Sergio De la torre	07318656b7	feat: refs #8135 refs#8135 updateTicketACL	2024-11-15 08:47:30 +01:00
Guillermo Bonet	e1a091535e	refactor: refs #7920 Fix version	2024-11-15 08:45:28 +01:00
Guillermo Bonet	b5463e5560	refactor: refs #7920 Fix version	2024-11-15 07:54:33 +01:00
Guillermo Bonet	e49285ace8	refactor: refs #7920 Fix version	2024-11-15 07:51:37 +01:00
Guillermo Bonet	e344ae3bf2	refactor: refs #7920 Fix version	2024-11-15 07:48:17 +01:00
Guillermo Bonet	48ffb80094	Merge branch 'dev' into 7920-itemShelving	2024-11-15 06:40:41 +00:00
Guillermo Bonet	d1c528c8fd	Merge branch 'dev' into 7950-cmrModelUnify	2024-11-15 06:03:36 +00:00
Guillermo Bonet	0fbef4c88a	Merge pull request 'fix: refs #7244 Added collection ACL' (!3198) from 7244-collectionAcl into dev ... Reviewed-on: #3198 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-15 06:01:48 +00:00
Jorge Penadés	4b659c0b48	fix: refs #6818 use right col type	2024-11-14 16:39:35 +01:00
Jorge Penadés	f96b914649	fix: refs #6818 use right col type	2024-11-14 16:39:26 +01:00
Jorge Penadés	86c95e185c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6818-addDefaultChannel	2024-11-14 16:32:40 +01:00
Jorge Penadés	eff251fbb5	feat: refs #7874 add default type	2024-11-14 15:46:51 +01:00
Alex Moreno	a8cb0b9eb8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-11-14 12:21:13 +01:00
Jorge Penadés	a37332f7be	fix: refs #6818 add defaultChannel	2024-11-14 11:18:38 +01:00
Jorge Penadés	25b05637a6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6818-addDefaultChannel	2024-11-14 11:17:11 +01:00
Jorge Penadés	c8ab5d4344	fix: refs #6818 add defaultChannel	2024-11-14 11:16:45 +01:00
Guillermo Bonet	d387486ea8	refactor: refs #7920 Requested changes	2024-11-14 09:59:01 +01:00
Guillermo Bonet	8449a6c6d3	feat: refs #7244 Requested changes	2024-11-14 09:42:59 +01:00
Guillermo Bonet	5f50d84213	feat: refs #7244 Requested changes	2024-11-14 09:42:49 +01:00
Guillermo Bonet	b9397c527d	feat: refs #8057 Added data updates	2024-11-14 09:32:02 +01:00
Guillermo Bonet	bde192966e	feat: refs #8057 Added data updates	2024-11-14 09:30:36 +01:00
Guillermo Bonet	cba1abad68	feat: refs #8057 Added data updates	2024-11-14 09:27:38 +01:00
Guillermo Bonet	d4b0da50d0	feat: refs #8057 Added data updates	2024-11-14 09:00:19 +01:00
Guillermo Bonet	b7655b4f92	feat: refs #8057 Added geoFk columns	2024-11-14 08:24:42 +01:00
Guillermo Bonet	97e53b2ef8	Merge branch 'dev' into 7950-cmrModelUnify	2024-11-14 06:57:26 +00:00
Ivan Mas	e1b0fc298c	feat: refs #8143 deprecate recoverPass and sync from account.user	2024-11-13 20:26:54 +01:00
Ivan Mas	21693cfd71	feat: refs #7994 new version script fix	2024-11-13 14:33:52 +01:00
Guillermo Bonet	477fb7ded9	feat: refs #8149 Group by CuentaIvaRepercutido	2024-11-13 14:27:54 +01:00
Guillermo Bonet	72e067ff81	fix: refs #7244 Added collection ACL	2024-11-13 12:53:18 +01:00
Pablo Natek	5f3b1ff601	Merge pull request 'fix: refs #7404 filter an rounding issues' (!3196) from 7404-fix-stockBoughtDetailFilter into master ... Reviewed-on: #3196 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-13 11:24:18 +00:00
Guillermo Bonet	782563f67d	Merge branch 'test' into dev	2024-11-13 12:19:42 +01:00
Guillermo Bonet	aa1c017f22	fix: refs #7779 ticket_splitItemPackingType	2024-11-13 12:17:58 +01:00
Guillermo Bonet	5a134668da	refactor: refs #7920 itemShelvingLog	2024-11-13 12:04:47 +01:00
Guillermo Bonet	9d5ef3eeb0	Merge branch 'dev' into 7920-itemShelving	2024-11-13 10:16:57 +00:00
Guillermo Bonet	b3bf0024e3	refactor: refs #7920 Major changes	2024-11-13 11:15:31 +01:00
Robert Ferrús	9b079a8bb2	Merge branch 'master' into 8169-itemTextureTag	2024-11-13 09:45:23 +00:00
Guillermo Bonet	2273dc636e	refactor: refs #7920 Major changes	2024-11-13 09:56:38 +01:00
Guillermo Bonet	172b4d8e05	Merge branch 'test' into dev	2024-11-13 09:40:30 +01:00
Guillermo Bonet	1086981b53	fix: refs #7779 ticket_splitItemPackingType	2024-11-13 09:35:06 +01:00
Jorge Penadés	f52041eeff	Merge branch 'dev' into 6818-saySimpleIntegration	2024-11-13 08:22:40 +00:00
Pablo Natek	b025a8b804	fix: refs #7404 filter an rounding issues	2024-11-13 09:10:18 +01:00
Guillermo Bonet	779a75cd78	refactor: refs #7920 Major changes	2024-11-13 09:03:44 +01:00
Guillermo Bonet	c2381f0feb	refactor: refs #7920 Main change	2024-11-13 07:42:58 +01:00
Guillermo Bonet	ab2e35b64c	fix: refs #8153 Version	2024-11-13 07:12:49 +01:00
Guillermo Bonet	628b67e1e5	fix: refs #8153 Version	2024-11-13 07:10:52 +01:00
Guillermo Bonet	a426e9c7c6	Merge pull request 'refactor: refs #8153 Optimized order_getTax' (!3188) from 8153-order_getTaxOptimize into dev ... Reviewed-on: #3188 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-11-13 06:07:38 +00:00
Pako Natek	ebc0420531	fix: problem calculation updated	2024-11-13 06:50:21 +01:00
Ivan Mas	4add10f3dd	feat: refs #7994 remove comment script	2024-11-12 17:52:51 +01:00
Ivan Mas	870882cdc1	Merge branch 'dev' into 7690-renameConfigTables	2024-11-12 16:27:19 +00:00
Ivan Mas	20bd426704	refactor: refs #7690 unify workerTimeControlParams with workerTimeControlConfig	2024-11-12 17:25:05 +01:00
Carlos Andrés	b8f2e0b906	feat: refs#8087 Redadas en travel	2024-11-12 16:50:46 +01:00
Carlos Andrés	358ed2513d	feat: refs#8087 Redadas en travel	2024-11-12 16:26:30 +01:00
Carlos Andrés	69d6e4a104	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8087-nuevosCamposTravel	2024-11-12 16:24:05 +01:00
Guillermo Bonet	127c6fced0	refactor: refs #8153 Optimized order_getTax	2024-11-12 13:25:51 +01:00
Guillermo Bonet	6427a90c44	Merge branch 'dev' into 7950-cmrModelUnify	2024-11-12 12:25:11 +00:00
Guillermo Bonet	2ece748138	refactor: refs #7242 Deleted select column	2024-11-12 13:13:13 +01:00
Guillermo Bonet	a67ea6b15f	Merge pull request 'refactor: refs #7715 Deleted hasNewLabelMrwMethod column' (!3184) from 7715-byeMrwOld into dev ... Reviewed-on: #3184 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-12 12:09:54 +00:00
Guillermo Bonet	f45460b0e1	Merge branch 'dev' into 8153-order_getTaxOptimize	2024-11-12 12:04:59 +00:00
Guillermo Bonet	d52f537f0c	refactor: refs #8153 Optimized order_getTax	2024-11-12 13:04:23 +01:00
Robert Ferrús	d925a5d7fa	Merge branch 'master' into 8169-itemTextureTag	2024-11-12 11:55:50 +00:00
Pako Natek	a9def89e01	Merge branch 'dev' into fixturesLocal	2024-11-12 11:27:35 +00:00
Guillermo Bonet	dd3a854ec5	Merge pull request 'feat: refs #8080 Added column comment' (!3185) from 8080-duaComment into dev ... Reviewed-on: #3185 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-11-12 10:48:17 +00:00
Guillermo Bonet	aec4d0b1a4	Merge branch 'test' into dev	2024-11-12 11:28:32 +01:00
Guillermo Bonet	f989b72fab	feat: refs #8080 Added column comment	2024-11-12 10:18:00 +01:00
Guillermo Bonet	a921e51023	refactor: refs #7715 Deleted hasNewLabelMrwMethod column	2024-11-12 09:51:48 +01:00
Jorge Penadés	0f5ca107f0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6818-saySimpleIntegration	2024-11-12 09:45:19 +01:00
Javi Gallego	ea45d1da0a	Merge branch 'dev' into 7821-entryIsBooked	2024-11-12 09:30:40 +01:00
Pablo Natek	69999125c7	Merge branch 'master' into 7404-recoverStockBuyedProcs	2024-11-12 07:51:59 +00:00
Pablo Natek	63425d31ae	fix: refs #7404 restore stockBuyed old proc	2024-11-12 08:51:03 +01:00
Alex Moreno	d442593823	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-11-12 08:49:17 +01:00
Alex Moreno	07e59ccdbf	build: refs #8179 dump	2024-11-12 08:45:40 +01:00
Robert Ferrús	55fced363e	Merge branch 'master' into 8169-itemTextureTag	2024-11-12 07:42:58 +00:00
Pako Natek	eb3d0e837f	Merge branch 'dev' into fixturesLocal	2024-11-12 07:29:08 +00:00
Pako Natek	76d072e00f	fix: more data for fixture.before	2024-11-12 08:28:26 +01:00
Guillermo Bonet	90e7ab1ec1	refactor: refs #7950 Created cmr model	2024-11-12 08:25:23 +01:00
Guillermo Bonet	5bbcf5005f	Merge branch 'test' into dev	2024-11-12 08:04:30 +01:00
Guillermo Bonet	3158644032	fix: refs #7994 commented alter	2024-11-12 07:59:07 +01:00
Pablo Natek	82bcb48101	Merge pull request 'test' (!3179) from test into dev ... Reviewed-on: #3179 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-12 06:37:16 +00:00
Pablo Natek	3d3bc0dbaa	Merge branch 'test' into 7404-fix-remove-tickets-volume	2024-11-12 06:24:06 +00:00