2111 Commits

Author	SHA1	Message	Date
Pako Natek	7b8476b42c	Merge pull request '8408-disponible-por-zonas' (!3495) from 8408-disponible-por-zonas into dev ... Reviewed-on: #3495 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-27 11:03:02 +00:00
Alex Moreno	011fb3a99a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-27 12:01:31 +01:00
Pako Natek	ed054bfb3d	Merge branch 'dev' into 8408-disponible-por-zonas	2025-02-27 09:59:14 +00:00
Pako Natek	d78288b778	fix(availabled): refs #8408 refs#8408 new price diference	2025-02-27 10:30:24 +01:00
Pako Natek	a80614a46d	feat(catalog_calculate): refs #8674 refs#8674	2025-02-26 12:18:55 +01:00
Juan Ferrer	a310b3e642	Merge branch 'dev' into 4409-binlog	2025-02-26 09:32:16 +01:00
Pako Natek	aa597870a4	feat(catalog_calculate): priceDelta.isHidden restriction ... refs#8674	2025-02-26 08:33:39 +01:00
Juan Ferrer	a88f41dd4b	Merge branch 'dev' into 4409-binlog	2025-02-25 11:18:19 +01:00
Pako Natek	722ce62d41	Merge branch 'dev' into 8408-disponible-por-zonas	2025-02-25 07:13:27 +01:00
Pako Natek	c30fc8dc2e	feat(available)!: refs #8408 new approach ... All the procedures involved has been refactorized BREAKING CHANGE: Refs: #8048	2025-02-25 07:04:48 +01:00
Javi Gallego	5eb981165e	refactor: refs #7937 improve transaction handling in report_print procedure and enhance claimEnd filter	2025-02-20 15:02:19 +01:00
Javi Gallego	e18e51aa92	refactor: refs #7937 improve error handling and transaction management in report_print procedure	2025-02-20 11:20:47 +01:00
Juan Ferrer	f2030492f4	fix: refs #4409 Allow buy life insert value	2025-02-19 14:16:55 +01:00
Ivan Mas	c61ea07b6a	Merge branch 'dev' into 8558-futureTicketsClaims	2025-02-19 11:30:08 +00:00
Juan Ferrer	bd8af6172d	fix: refs #4409 Default life value	2025-02-18 16:20:09 +01:00
Alex Moreno	7ec29d1972	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-02-18 13:38:10 +01:00
Carlos Andrés	5488a229c1	Merge pull request 'fix: priceOptimum error' (!3471) from PriceOptimum-error into master ... Reviewed-on: #3471 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-18 08:50:27 +00:00
Alex Moreno	664ba03425	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-18 09:26:30 +01:00
Alex Moreno	f83055057e	fix: expeditionTruck use editorFk	2025-02-18 09:14:08 +01:00
Alex Moreno	669b7cd67f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-18 08:45:19 +01:00
Alex Moreno	6e4667a563	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-02-18 08:45:11 +01:00
Alex Moreno	7d08c1796a	fix: update ticket_setState procedure to include created timestamp in ticketTracking insert	2025-02-18 08:44:07 +01:00
Carlos Andrés	a73199e70b	fix: priceOptimum error	2025-02-17 18:52:31 +01:00
Ivan Mas	60f31178cf	Merge branch 'dev' into 8558-futureTicketsClaims	2025-02-17 14:17:31 +00:00
Ivan Mas	0088460e63	feat: refs #8558 requested modifications	2025-02-17 15:15:11 +01:00
Pako Natek	991ed813e3	Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas	2025-02-17 12:15:48 +00:00
Pako Natek	bd1a4b35aa	fix(item_getBalance): refs #8408 alias for shipped field	2025-02-17 13:12:22 +01:00
Carlos Andrés	52c22608a5	Actualizar db/routines/vn/procedures/productionControl.sql	2025-02-17 11:38:48 +00:00
Ivan Mas	472e52bc8c	feat: refs #8558 use shipped	2025-02-14 15:03:58 +01:00
Ivan Mas	9cf6f8f031	feat: refs #8558 modify claim_beforeInsert	2025-02-14 14:50:39 +01:00
Carlos Andrés	a874b96c5e	revert a119d9f7fb ... revert feat: invoiceIn move deductible field from head to lines	2025-02-14 11:32:45 +00:00
Carlos Andrés	a119d9f7fb	feat: invoiceIn move deductible field from head to lines	2025-02-14 12:29:56 +01:00
Guillermo Bonet	309a287748	Merge branch 'test' into dev	2025-02-14 12:08:43 +01:00
Guillermo Bonet	aca49505bd	Merge branch 'test' into 8227-roadmapChanges	2025-02-14 10:52:40 +00:00
Guillermo Bonet	d6f08d7e27	feat: refs #8227 update roadmap triggers and views, remove obsolete trigger and column	2025-02-14 10:04:04 +01:00
Alex Moreno	44ed6254c3	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-14 07:02:45 +01:00
Carlos Andrés	4e9bcf530b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-02-13 18:59:26 +01:00
Carlos Andrés	7f32a10c06	fix: facturacion por consignatario en el cierre nocturno y unificación de backs	2025-02-13 15:22:37 +01:00
Guillermo Bonet	845ce8d6d8	feat: refs #8227 Minor changes	2025-02-13 14:36:09 +01:00
Guillermo Bonet	4042679c9b	feat: refs #8227 Grants	2025-02-13 14:12:44 +01:00
Pako Natek	86091571cd	Merge pull request 'fix(item_getBalance): refs #8408 availabled field prevails over landed' (!3449) from 8408-Disponible-por-zonas-y-horas into dev ... Reviewed-on: #3449 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-13 12:39:29 +00:00
Guillermo Bonet	bd53f7367c	Merge branch 'test' into 8227-roadmapChanges	2025-02-13 08:34:20 +00:00
Guillermo Bonet	92ab3648e7	feat: refs #8227 Fix tests	2025-02-13 09:22:45 +01:00
Pako Natek	3a1849326b	fix(item_getBalance): refs #8408 availabled field prevails over landed ... Refs: #8408	2025-02-13 08:41:13 +01:00
Pako Natek	317c152c66	Merge branch 'dev' into 8575-itemPackingType-Altillo	2025-02-13 06:41:43 +00:00
Guillermo Bonet	8959eb21f6	Merge branch 'test' into dev	2025-02-12 14:37:34 +01:00
Guillermo Bonet	5543da2c80	Merge branch 'master' into test	2025-02-12 14:37:10 +01:00
Guillermo Bonet	ba3909a984	refactor: refs #6944 Requested changes	2025-02-12 14:13:39 +01:00
Pako Natek	b95db2eff1	feat(productionControl and collection_new): refs #8575 new itempackingtype a ... Refs: #8575	2025-02-12 13:45:07 +01:00
Alex Moreno	5d155ef6bd	Merge branch 'test' into hotFix_daily_addressInvoice_2	2025-02-12 11:17:27 +00:00