1716 Commits

Author	SHA1	Message	Date
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
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
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
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
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
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
Guillermo Bonet	e7c027a8b1	refactor: refs #6944 Update ticket_setState to improve state change logic and user tracking	2025-02-12 10:06:48 +01:00
Alex Moreno	3fbd740a2b	fix: address invoice daily	2025-02-11 14:31:26 +01:00
Guillermo Bonet	f682e3cfe6	Merge branch 'test' into dev	2025-02-11 13:26:18 +01:00
Guillermo Bonet	0a33e05bff	Merge branch 'master' into test	2025-02-11 13:26:02 +01:00
Guillermo Bonet	a387e3ae92	feat: refs #7162 Add packages and packagesList to ticket_doCmr procedure	2025-02-11 13:25:30 +01:00
Javier Segarra	095e561c82	Merge branch 'dev' into 6321_negative_tickets	2025-02-11 08:43:21 +00:00
Pako Natek	5d674139fa	Merge branch '8408-Disponible-por-zonas-y-horas' of https://gitea.verdnatura.es/verdnatura/salix into 8408-Disponible-por-zonas-y-horas	2025-02-10 14:00:36 +01:00
Pako Natek	ec5ef3d7f8	fix(item_getStock): refs #8408 field availabled used for itementryin selection ... Refs: #8408	2025-02-10 14:00:34 +01:00
Pako Natek	f7f221e2bc	Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas	2025-02-10 06:36:15 +00:00
Pako Natek	b60f251c56	fix(catalog_calculate): refs #8408 remove comments ... resf#8408	2025-02-10 07:34:15 +01:00
Guillermo Bonet	0ecf1f281a	Merge branch 'test' into dev	2025-02-10 07:27:04 +01:00
Guillermo Bonet	a002168f61	Merge branch 'master' into test	2025-02-10 07:26:53 +01:00
Guillermo Bonet	50a295d495	fix: refs #7162 Update JOIN condition for agencyMode in ticket_doCmr	2025-02-10 07:25:39 +01:00
Javier Segarra	fce6b13d2d	Merge branch 'dev' into 6321_negative_tickets	2025-02-07 16:19:58 +01:00
Pako Natek	adf416a086	fix: refs #8408 hour time on catalog_calculate	2025-02-07 14:29:50 +01:00
Pako Natek	466a0a58d9	fix(catalog_calculate): refs #8408 delete commented lines ... refs#8408	2025-02-07 12:59:41 +01:00
Pako Natek	74583d899a	Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas	2025-02-07 11:53:30 +00:00
Pako Natek	a4f3975340	feat(catalog_calculate): refs #8408 new concept availabled ... Refs: #8408	2025-02-07 10:40:00 +01:00
Javier Segarra	35bf9abcf4	Merge branch 'dev' into 7601_futureAgency	2025-02-06 16:15:27 +00:00
Javier Segarra	8398a30e4f	Merge branch 'dev' into 6321_negative_tickets	2025-02-06 14:58:55 +00:00
Guillermo Bonet	9f302fac24	Merge branch 'test' into dev	2025-02-06 13:47:36 +01:00
Guillermo Bonet	92ca3a2582	Merge branch 'master' into test	2025-02-06 13:47:17 +01:00
Javier Segarra	ab0667f85c	feat: retrive requested fields	2025-02-06 12:31:46 +00:00
Juanjo Breso	8df36f296a	feat: refs #269518 isFragile item and itemType	2025-02-06 09:11:48 +01:00
Javier Segarra	1f6f7b9975	feat: refs #6321 updates requested	2025-02-06 00:34:08 +01:00
Javier Segarra	da90d43f7a	Merge branch 'dev' into 6321_negative_tickets	2025-02-05 15:36:44 +01:00
Jon Elias	502b48718c	Merge pull request '#7965 - unifyProblems' (!2990) from 7965-unifyProblems into dev ... Reviewed-on: #2990 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-05 06:51:54 +00:00
Javier Segarra	0111373471	Merge branch 'dev' of https: refs #6321//gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets	2025-02-04 14:00:00 +01:00
Javier Segarra	550b0871f0	feat: refs #6321 changes	2025-02-04 13:45:59 +01:00
Alex Moreno	fe7a1c60cc	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-04 13:03:17 +01:00
Javier Segarra	410f3e73dc	Merge branch 'dev' of https: refs #6321//gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets	2025-02-04 09:54:41 +01:00