2101 Commits

Author	SHA1	Message	Date
Guillermo Bonet	779a75cd78	refactor: refs #7920 Major changes	2024-11-13 09:03:44 +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
Guillermo Bonet	127c6fced0	refactor: refs #8153 Optimized order_getTax	2024-11-12 13:25:51 +01:00
Guillermo Bonet	2ece748138	refactor: refs #7242 Deleted select column	2024-11-12 13:13:13 +01:00
Guillermo Bonet	d52f537f0c	refactor: refs #8153 Optimized order_getTax	2024-11-12 13:04:23 +01:00
Guillermo Bonet	aec4d0b1a4	Merge branch 'test' into dev	2024-11-12 11:28:32 +01:00
Pablo Natek	63425d31ae	fix: refs #7404 restore stockBuyed old proc	2024-11-12 08:51:03 +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
Pablo Natek	2dd3ae1c75	fix: refs #7404 empty commit	2024-11-12 07:23:46 +01:00
Alex Moreno	180b0b5b3f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-11-11 14:09:21 +01:00
Alex Moreno	c8d9cfd623	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-11-11 14:09:03 +01:00
Javi Gallego	eaad989b3a	fix: clean deletes also zoneEvent range records	2024-11-11 13:57:49 +01:00
Guillermo Bonet	0dc77851c0	fix: refs #4948 Tests	2024-11-11 11:34:37 +01:00
Pako Natek	35f4f161ab	fix(collection_new): remove agency condition for suitable tickets ... Refs: #0000	2024-11-11 09:02:04 +01:00
Guillermo Bonet	a254cb19cd	feat: refs #4948 Added ticket_selfConsumptionPackaging	2024-11-11 07:40:17 +01:00
Pablo Natek	f8c3d69c5d	fix: refs #7404 remove volume from ticket sold on holland	2024-11-08 13:44:20 +01:00
Sergio De la torre	cab2b7c93c	Merge pull request 'feat: refs #6845 userInterface' (!3161) from 6845-UserInterface into dev ... Reviewed-on: #3161 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-06 14:56:13 +00:00
Sergio De la torre	c113d83797	feat: refs #6845 userInterface	2024-11-05 16:42:51 +01:00
Sergio De la torre	37548e5e64	feat: refs #7266 buyFkForPrint	2024-11-04 08:59:10 +01:00
Sergio De la torre	4c0dec19d4	feat: refs #7266 buyFkForPrint	2024-11-04 07:48:28 +01:00
Robert Ferrús	f699f64caa	Merge branch 'dev' into 8071-travelWeeklyClone	2024-10-29 06:45:57 +00:00
Sergio De la torre	a8cc417fb4	Merge branch 'dev' into 7922-scanOrder	2024-10-29 06:32:32 +00:00
Robert Ferrús	8ab6bc39cc	Merge branch 'dev' into 8071-travelWeeklyClone	2024-10-29 06:31:21 +00:00
Carlos Andrés	66a5708efb	Merge pull request 'feat: refs #8087 Traspasar redadas a travels' (!3147) from 8087-nuevoCampoTravel into dev ... Reviewed-on: #3147 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-28 14:41:01 +00:00
Robert Ferrús	f05b6a46b0	feat: refs #8071 quitar esquema	2024-10-28 14:36:10 +01:00
Robert Ferrús	994b562823	Merge branch 'dev' into 8071-travelWeeklyClone	2024-10-28 13:34:54 +00:00
Carlos Andrés	61026d2d34	feat: refs #8087 Traspasar redadas a travels	2024-10-28 14:02:27 +01:00
Carlos Andrés	fb0764bc1f	feat: refs #8087 Traspasar redadas a travels	2024-10-25 14:34:51 +02:00
Guillermo Bonet	956e89475e	Merge branch 'dev' into 7006-itemTypeLog	2024-10-25 11:06:55 +00:00
Sergio De la torre	11e13fdb20	feat: refs #7922 refs #792 scanOrder	2024-10-25 06:40:06 +02:00
Carlos Andrés	1bf900f81b	feat: refs #8087 Traspasar redadas a travels	2024-10-24 12:33:47 +02:00
Guillermo Bonet	4d96b1df68	Merge branch '7266-itemLabels' of https://gitea.verdnatura.es/verdnatura/salix into 7266-itemLabels	2024-10-24 07:31:30 +02:00
Guillermo Bonet	4c529da620	feat: refs #7266 Requested changes and query optimization	2024-10-24 07:31:26 +02:00
Guillermo Bonet	4c9682e107	Merge branch 'dev' into 7266-itemLabels	2024-10-24 05:16:16 +00:00
Sergio De la torre	5a8f43d0ea	Merge pull request 'feat: refs #8020 machineWorkerDeprecated' (!3141) from 8020-mahineWorkerDeprecated into dev ... Reviewed-on: #3141 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-23 12:14:36 +00:00
Guillermo Bonet	db4b540958	Merge branch 'test' into dev	2024-10-23 12:44:55 +02:00
Guillermo Bonet	fc56dbc5fb	Merge branch 'master' into test	2024-10-23 12:44:35 +02:00
Guillermo Bonet	9eaa5a7585	Merge branch 'master' into 8119-itemCampaignQuantity	2024-10-23 10:38:00 +00:00
Sergio De la torre	3da08e3a23	feat: refs #8020 machineWorkerDeprecated	2024-10-23 11:33:45 +02:00
Guillermo Bonet	3cde6b6bc6	feat: refs #8119 Requested changes	2024-10-23 08:30:21 +02:00
Guillermo Bonet	31c89538bc	feat: refs #8119 Requested changes	2024-10-23 08:27:07 +02:00
Guillermo Bonet	37050361c2	feat: refs #8119 Requested changes	2024-10-23 08:26:36 +02:00
Guillermo Bonet	baec188ff5	feat: refs #8119 Requested changes	2024-10-23 08:23:28 +02:00
Javi Gallego	2f5f4ecc7c	Merge pull request 'feat: refs #7943 quitar lectura en metodos comunes' (!3136) from 7943-permisosWorker into dev ... Reviewed-on: #3136 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-23 05:53:03 +00:00
Alex Moreno	f47043cae4	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-10-22 15:07:24 +02:00
Guillermo Bonet	6227ef0821	Merge branch '8119-itemCampaignQuantity' of https://gitea.verdnatura.es/verdnatura/salix into 8119-itemCampaignQuantity	2024-10-22 15:00:17 +02:00
Guillermo Bonet	1afb33c306	feat: refs #8119 Requested changes	2024-10-22 15:00:16 +02:00