8713-testToMaster #3523

Merged

alexm merged 383 commits from 8713-testToMaster into master 2025-03-04 06:52:15 +00:00

Conversation 0 Commits 383 Files Changed 108 +5418 -2775

383 Commits

Author	SHA1	Message	Date
Alex Moreno	75f5888741	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-03-03 14:44:21 +01:00
Guillermo Bonet	156b965c24	Merge branch 'master' into test	2025-02-28 12:22:51 +01:00
Carlos Satorres	6dac5cc9ce	Merge pull request 'fix: refs #6553 workerBusiness v3' (!3508) from 6553-workerBusinessV3 into test ... Reviewed-on: #3508 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-28 10:10:08 +00:00
Carlos Satorres	434c3ac2f9	fix: refs #6553 workerBusiness v3	2025-02-28 10:32:16 +01:00
Alex Moreno	7715a50724	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-02-27 12:01:13 +01:00
Pako Natek	b5e8bfa8af	Merge pull request 'feat(catalog_calculate): refs #8674 refs#8674' (!3499) from 8674-restringir-acceso-a-familias into test ... Reviewed-on: #3499 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-26 11:29:26 +00:00
Pako Natek	a80614a46d	feat(catalog_calculate): refs #8674 refs#8674	2025-02-26 12:18:55 +01:00
Alex Moreno	e4a9ada838	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-02-26 07:31:18 +01:00
Carlos Satorres	380d1f69e5	Merge pull request 'fix: refs #6553 workerBusiness, workerDescriptor' (!3484) from 6553-workerBusinessV2 into test ... Reviewed-on: #3484 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-25 08:14:13 +00:00
Carlos Satorres	d6a520d81a	Merge branch 'test' into 6553-workerBusinessV2	2025-02-25 08:10:54 +00:00
Alex Moreno	d12553bbd4	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-02-24 12:35:46 +01:00
Carlos Satorres	aace7fc8ad	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusinessV2	2025-02-21 15:19:02 +01:00
Carlos Satorres	35cfce552b	fix: refs #6553 getWorkerBusiness	2025-02-21 15:14:46 +01:00
Carlos Satorres	ebfba823b0	fix: refs #6553 workerBusiness, workerDescriptor	2025-02-21 14:59:02 +01:00
Guillermo Bonet	c254f31da2	Merge branch 'master' into test	2025-02-20 07:49:39 +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
Alex Moreno	40492d6489	Merge pull request '8627-devToTest' (!3474) from 8627-devToTest into test ... Reviewed-on: #3474 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-02-18 12:33:29 +00:00
Alex Moreno	dc989cb075	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8627-devToTest	2025-02-18 10:35:00 +01:00
Jorge Penadés	e29e5e28ed	Merge pull request 'fix: refs #8388 update booking status in toUnbook method' (!3462) from 8388-fixUnbook into dev ... Reviewed-on: #3462 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-18 09:31:22 +00:00
Alex Moreno	2386874a96	fix: refs #8627 add claim in getSales	2025-02-18 10:28:00 +01:00
Alex Moreno	06c123d7f2	fix: refs #8627 ticket isTaxDataChecked	2025-02-18 10:15:28 +01:00
Alex Moreno	a8c03548d9	fix: refs #8627 update stateFk assignment to use code instead of id	2025-02-18 09:51:08 +01: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	ca8bc43262	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-18 08:53:24 +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
Juan Ferrer	5a5da0a863	fix: refs #6695 Code refactor	2025-02-17 19:46:14 +01:00
Juan Ferrer	d6c8d96d52	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-17 19:40:14 +01:00
Juan Ferrer	17410202ad	fix: refs #6695 Code refactor	2025-02-17 19:40:12 +01:00
PAU ROVIRA ROSALENY	f687ad35fd	Merge pull request 'feat: #8497 added availabled on travel module' (!3469) from 8497-travelAvailabled into dev ... Reviewed-on: #3469 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-17 15:11:50 +00:00
Juan Ferrer	fbc185fe00	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-17 15:48:11 +01:00
Juan Ferrer	2d765913ff	fix: refs #6695 Code refactor	2025-02-17 15:48:09 +01:00
Javier Segarra	7e2129c94f	Merge pull request 'fix: getSuggestedTickets' (!3454) from fix_getSuggestedTickets_byFixtures into dev ... Reviewed-on: #3454 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-17 14:41:39 +00:00
Javier Segarra	dbd298b7d8	Merge branch 'dev' into fix_getSuggestedTickets_byFixtures	2025-02-17 14:39:01 +00:00
PAU ROVIRA ROSALENY	2bac7cbd09	Merge branch 'dev' into 8497-travelAvailabled	2025-02-17 13:51:17 +00:00
PAU ROVIRA ROSALENY	e7cc754f53	feat: refs #8497 added availabled on travel module	2025-02-17 14:50:22 +01:00
Alex Moreno	e4c1ed1d5c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-17 14:50:09 +01:00
Alex Moreno	97198591f9	build: add build-essential in back dockerfile	2025-02-17 14:01:41 +01:00
Pablo Natek	38fa5cb823	Merge pull request 'fix(item_getBalance): refs #8408 alias for shipped field' (!3468) from 8408-Disponible-por-zonas-y-horas into dev ... Reviewed-on: #3468 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2025-02-17 12:18:25 +00: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
Alex Moreno	2e36d9b116	Merge pull request 'feat: refs #6695 add Dockerfile for MariaDB and update Jenkinsfile for database build stage' (!3464) from 6695-save_builds_and_Db into dev ... Reviewed-on: #3464 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2025-02-17 12:04:23 +00:00
Juan Ferrer	9e564a951a	Merge branch '6695-save_builds_and_Db' of https://gitea.verdnatura.es/verdnatura/salix into 6695-save_builds_and_Db	2025-02-17 13:00:34 +01:00
Juan Ferrer	40ed75450d	ci: refs #6695 Jenkinsfile code refactor	2025-02-17 13:00:32 +01:00
Alex Moreno	2d7c677f0a	Merge branch 'dev' into 6695-save_builds_and_Db	2025-02-17 11:57:55 +00:00
Juan Ferrer	19df0d3cb0	ci: refs #6695 Jenkinsfile debug code removed	2025-02-17 12:55:48 +01:00
Juan Ferrer	939181bd79	ci: refs #6695 Jenkinsfile fixes	2025-02-17 12:50:22 +01:00
Carlos Andrés	52c22608a5	Actualizar db/routines/vn/procedures/productionControl.sql	2025-02-17 11:38:48 +00:00
Juan Ferrer	b7342eace2	ci: refs #6695 Jenkinsfile fixes	2025-02-17 12:38:06 +01:00
Juan Ferrer	45e8a0bd8b	ci: refs #6695 Jenkinsfile fixes	2025-02-17 12:34:00 +01:00
Juan Ferrer	2e4fb91d77	ci: refs #6695 Jenkinsfile fixes	2025-02-17 12:20:36 +01:00
Juan Ferrer	2d94c8df39	ci: refs #6695 Jenkinsfile fixes	2025-02-17 12:17:49 +01:00
Juan Ferrer	7e7ee1ff12	ci: refs #6695 Jenkinsfile fixes	2025-02-17 11:33:56 +01:00
Juan Ferrer	64eefa95f5	ci: refs #6695 Jenkinsfile fixes	2025-02-17 11:32:38 +01:00
Juan Ferrer	8b05bfb59f	ci: refs #6695 Jenkinsfile fixes	2025-02-17 11:31:10 +01:00
Juan Ferrer	034c76c05f	Merge branch '6695-save_builds_and_Db' of https: refs #6695//gitea.verdnatura.es/verdnatura/salix into 6695-save_builds_and_Db	2025-02-17 11:29:50 +01:00
Pablo Natek	e0c2a497d2	Merge pull request 'fix: refs #6897 change user field to nickname in getStockBought method' (!3465) from 6897-fixE2eAndStockBought into dev ... Reviewed-on: #3465 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-02-17 10:29:27 +00:00
Juan Ferrer	8387dad3d8	ci: refs #6695 Docker build changes	2025-02-17 11:28:01 +01:00
Alex Moreno	bfddbfaa22	fix: refs #6695 update Jenkinsfile and docker-compose.yml for environment variable usage	2025-02-17 10:54:38 +01:00
Pablo Natek	3093f8aef8	fix: refs #6897 change user field to nickname in getStockBought method	2025-02-17 10:50:21 +01:00
Alex Moreno	4aa56a71cb	refactor: refs #6695 uncommnet	2025-02-17 08:56:55 +01:00
Alex Moreno	8ef13e3d9c	feat: refs #6695 add Dockerfile for MariaDB and update Jenkinsfile for database build stage	2025-02-17 08:34:04 +01:00
Alex Moreno	b4bcfb2886	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-17 07:55:13 +01:00
Jorge Penadés	f9d1a8c0c2	fix: refs #8388 update booking status in toUnbook method	2025-02-14 14:23:43 +01:00
Guillermo Bonet	c79867188a	Merge branch 'test' into dev	2025-02-14 12:36:24 +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	28deadfbad	fix: refs #8573 version	2025-02-14 10:37:08 +01:00
Javier Segarra	609060f100	Merge branch 'dev' into fix_getSuggestedTickets_byFixtures	2025-02-14 08:45:27 +00:00
Alex Moreno	8110e88aa7	fix: vnUser, default false	2025-02-14 08:29:55 +01:00
Ivan Mas	9000becf07	Merge pull request 'refactor: refs #8573 add fk to expedition.hostFk' (!3447) from 8573-addFkExpeditionHost into dev ... Reviewed-on: #3447 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-02-14 07:06:21 +00:00
Ivan Mas	5a37bd332e	Merge branch 'dev' into 8573-addFkExpeditionHost	2025-02-14 06:55:47 +00:00
Alex Moreno	44ed6254c3	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-14 07:02:45 +01:00
Javier Segarra	9dd3f7198c	fix: getSuggestedTickets	2025-02-13 22:56:43 +01:00
Ivan Mas	13a76e5c70	Merge branch 'dev' into 8573-addFkExpeditionHost	2025-02-13 15:43:56 +00:00
Ivan Mas	caa921020d	refactor: refs #8573 update before alter table	2025-02-13 16:41:29 +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
Pablo Natek	4b7c20075b	Merge pull request 'feat: refs #6897 add search method and enhance ACL permissions for Entry model' (!3448) from 6897-addItemSearch into dev ... Reviewed-on: #3448 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-13 07:59:58 +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	d773aec0f5	Merge pull request 'feat(productionControl and collection_new): refs #8575 new itempackingtype a' (!3444) from 8575-itemPackingType-Altillo into dev ... Reviewed-on: #3444 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-13 06:45:37 +00:00
Pako Natek	317c152c66	Merge branch 'dev' into 8575-itemPackingType-Altillo	2025-02-13 06:41:43 +00:00
Pablo Natek	514ddf1045	feat: refs #6897 add search method and enhance ACL permissions for Entry model	2025-02-12 19:40:22 +01:00
Ivan Mas	f12c47cdf8	Merge branch 'dev' into 8573-addFkExpeditionHost	2025-02-12 16:11:53 +00:00
Ivan Mas	5404f895b2	refactor: refs #8573 add fk to expedition.hostFk	2025-02-12 17:08:45 +01:00
Javier Segarra	0b8a54d057	Merge pull request 'Fix TicketNegative' (!3446) from fix_ticketNegative into dev ... Reviewed-on: #3446 Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-02-12 15:43:59 +00:00
Jon Elias	307c8d92df	Merge branch 'dev' into fix_ticketNegative	2025-02-12 15:30:09 +00:00
Javier Segarra	f631aa1314	fix: remotMethodCtx	2025-02-12 16:26:01 +01:00
Guillermo Bonet	8959eb21f6	Merge branch 'test' into dev	2025-02-12 14:37:34 +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
Javi Gallego	1c8ad94ab8	fix: update SQL fixture values and enhance getVideoList method with transaction handling	2025-02-12 09:51:56 +01:00
Pablo Natek	8d0fec4ffd	Merge pull request 'feat: refs #6897 add EntryConfig model and enhance entry filtering with new parameters' (!3366) from 6897-refactorEntryBuyList into dev ... Reviewed-on: #3366 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-12 06:37:43 +00:00
Pablo Natek	c0b1f3337c	Merge branch 'dev' into 6897-refactorEntryBuyList	2025-02-11 15:50:28 +00:00
Pablo Natek	f347d9668f	refactor: refs #6897 improve variable scope and query parameters in recalcEntryPrices.js	2025-02-11 16:50:00 +01:00
Guillermo Bonet	f682e3cfe6	Merge branch 'test' into dev	2025-02-11 13:26:18 +01:00
Pablo Natek	96248132a1	refactor: refs #6897 sql fixture data for improved readability and consistency	2025-02-11 13:02:50 +01:00
Pablo Natek	454fbcb7ce	Merge branch 'dev' of https: refs #6897//gitea.verdnatura.es/verdnatura/salix into 6897-refactorEntryBuyList	2025-02-11 12:38:42 +01:00
Javier Segarra	5df24d0e70	Merge pull request '#6321 - Negative tickets' (!1945) from 6321_negative_tickets into dev ... Reviewed-on: #1945 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-11 08:45:32 +00:00
Javier Segarra	095e561c82	Merge branch 'dev' into 6321_negative_tickets	2025-02-11 08:43:21 +00:00
Pako Natek	0bd345b6de	Merge pull request '8408-Disponible-por-zonas-y-horas' (!3432) from 8408-Disponible-por-zonas-y-horas into dev ... Reviewed-on: #3432 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-11 07:50:15 +00:00
Pako Natek	b4fe620f2e	Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas	2025-02-11 07:47:16 +00:00
Pako Natek	5a8f7b2c1a	Merge branch '8408-Disponible-por-zonas-y-horas' of https://gitea.verdnatura.es/verdnatura/salix into 8408-Disponible-por-zonas-y-horas	2025-02-11 08:46:26 +01:00
Pako Natek	fbf56ff0cf	fix(available_refresh): refs #8408 more availabled cases ... refs#8408	2025-02-11 08:46:24 +01:00
Pablo Natek	5ab45831e7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-refactorEntryBuyList	2025-02-11 08:19:31 +01:00
Pako Natek	cdb91c06c2	Merge pull request '8408-Disponible-por-zonas-y-horas' (!3431) from 8408-Disponible-por-zonas-y-horas into dev ... Reviewed-on: #3431 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-11 07:16:38 +00:00
Pako Natek	1a92a00cce	Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas	2025-02-11 07:12:25 +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
Pablo Natek	6110295cc2	fix: refs #6897 update entry_clone method to return newEntryId instead of result	2025-02-10 11:40:54 +01:00
Pako Natek	4d5d38592f	Merge pull request 'feat(catalog_calculate): refs #8408 new concept availabled' (!3425) from 8408-Disponible-por-zonas-y-horas into dev ... Reviewed-on: #3425 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-10 06:47:01 +00:00
Pako Natek	f7f221e2bc	Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas	2025-02-10 06:36:15 +00:00
Pako Natek	17749b0ced	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 07:34:19 +01: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
Pablo Natek	2f0cd27ed8	Merge branch 'dev' of https: refs #6897//gitea.verdnatura.es/verdnatura/salix into 6897-refactorEntryBuyList	2025-02-09 18:26:52 +01:00
Pablo Natek	6ea4e3096e	feat: refs #6897 add maxLockTime parameter to entryConfig insert statement	2025-02-09 18:24:39 +01:00
Javier Segarra	e748c3ea68	feat: refs #6321 minor changes	2025-02-07 22:40:00 +01:00
Javier Segarra	fce6b13d2d	Merge branch 'dev' into 6321_negative_tickets	2025-02-07 16:19:58 +01:00
Javier Segarra	9bb273807d	feat: refs #6321 i18n negativeReplaced	2025-02-07 16:18:26 +01:00
Guillermo Bonet	08140894a8	Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas	2025-02-07 14:06:28 +00:00
Guillermo Bonet	d7a25b06bf	Merge branch 'test' into dev	2025-02-07 15:05:41 +01:00
Pako Natek	e22a21290b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8408-Disponible-por-zonas-y-horas	2025-02-07 14:37:20 +01:00
Pako Natek	adf416a086	fix: refs #8408 hour time on catalog_calculate	2025-02-07 14:29:50 +01:00
Guillermo Bonet	ec3210a5c0	Merge branch 'test' into dev	2025-02-07 14:28:28 +01:00
Pako Natek	ca39edd010	fix: refs #8408 test	2025-02-07 14:04:17 +01:00
Jon Elias	f04933a9c1	Merge pull request 'Fix[ItemFixedPrice]: Fixed item name filter' (!3427) from Hotfix-FixedPriceNameFilter into dev ... Reviewed-on: #3427 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-07 12:44:42 +00:00
Jon Elias	516f409ae5	Merge branch 'dev' into Hotfix-FixedPriceNameFilter	2025-02-07 12:42:20 +00:00
Jon Elias	d76db10e67	fix: fixed item name filter	2025-02-07 13:39:53 +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	ba323bb7bf	fix(fixtures.before): refs #8408 rollback changes ... refs#8408	2025-02-07 12:53:15 +01:00
Guillermo Bonet	21d9369250	fix: refs #8172 Version fix	2025-02-07 11:04:10 +01:00
Pako Natek	a4f3975340	feat(catalog_calculate): refs #8408 new concept availabled ... Refs: #8408	2025-02-07 10:40:00 +01:00
Guillermo Bonet	1a274648a7	Merge pull request 'refactor: refs #8172 Created table parkingCoordinates' (!3320) from 8172-parkingCoordinates into dev ... Reviewed-on: #3320 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-02-07 09:38:55 +00:00
Guillermo Bonet	6fd1c35819	Merge branch 'dev' into 8172-parkingCoordinates	2025-02-07 10:36:35 +01:00
Javier Segarra	f4dbddbe15	fix: refs #6321 dates in fixtures.before	2025-02-07 09:54:55 +01:00
Javier Segarra	ef4d639499	Merge pull request '#7601 - Different agency fot future tickets' (!3420) from 7601_futureAgency into dev ... Reviewed-on: #3420 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-07 08:32:47 +00:00
Javier Segarra	9322360979	fix: refs #6321 dates in fixtures.before	2025-02-07 08:41:49 +01:00
Javier Segarra	47c3878a74	Merge branch 'dev' into 7601_futureAgency	2025-02-07 07:06:54 +00:00
Javier Segarra	e035a73e06	feat: refs #6321 i18n es negativeReplaced	2025-02-07 07:57:10 +01:00
Javier Segarra	d185530839	Merge branch 'dev' into 6321_negative_tickets	2025-02-07 07:56:05 +01:00
Javier Segarra	9390c0efed	test: refs #6321 getSimilar.spec.js	2025-02-07 07:53:00 +01:00
Robert Ferrús	860d86d19e	Merge pull request '6702-missageSaleCloned' (!3404) from 6702-missageSaleCloned into dev ... Reviewed-on: #3404 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-07 06:51:05 +00:00
Javier Segarra	c4e64db9b9	Merge branch '6321_negative_tickets' of https://gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets	2025-02-06 23:23:00 +01:00
Javier Segarra	ba58746a03	fix: refs #6321 test	2025-02-06 23:22:58 +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
Javier Segarra	4e4d6c3b6a	fix: refs #6321 fixtures	2025-02-06 15:20:44 +01:00
Javier Segarra	9626b6c0ff	feat: refs #6321 update itemLackDetail	2025-02-06 15:19:39 +01:00
Javier Segarra	338e833c0b	feat: refs #6321 i18n	2025-02-06 15:19:23 +01:00
Javier Segarra	8170eafa36	feat: refs #6321 remove ticketConfig var	2025-02-06 15:19:07 +01:00
Robert Ferrús	aa44d0e727	Merge branch 'dev' of https: refs #6702//gitea.verdnatura.es/verdnatura/salix into 6702-missageSaleCloned	2025-02-06 14:31:37 +01:00
Guillermo Bonet	9f302fac24	Merge branch 'test' into dev	2025-02-06 13:47:36 +01:00
Javier Segarra	ab0667f85c	feat: retrive requested fields	2025-02-06 12:31:46 +00:00
Guillermo Bonet	110a5212c0	fix: refs #8535 deploy	2025-02-06 12:55:01 +01:00
Javier Segarra	4c786be3af	Merge branch 'dev' into 6321_negative_tickets	2025-02-06 12:34:41 +01:00
Javier Segarra	4c7b8212da	feat: refs #6321 changes	2025-02-06 12:27:59 +01:00
Javier Segarra	3dd64e4257	feat: refs #6321 sql lackDetail step3	2025-02-06 10:31:43 +01:00
Javier Segarra	e736c95fb6	feat: refs #6321 sql lackDetail step2	2025-02-06 10:29:48 +01:00
Javier Segarra	1af01ad747	feat: refs #6321 sql lackDetail step1	2025-02-06 10:26:38 +01:00
Jorge Penadés	97be16b344	Merge pull request 'feat: refs #7119 add VehicleState model with data source configuration' (!3328) from 7119-createVehicle into dev ... Reviewed-on: #3328 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-06 09:24:09 +00:00
Jorge Penadés	9ba517b648	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2025-02-06 10:20:22 +01:00
Javier Segarra	24411f9af1	fix: refs #6321 revert change	2025-02-06 08:17:03 +01:00
Javier Segarra	b2cbded2dc	feat: refs #6321 defaultAlertLevelCode	2025-02-06 01:06:02 +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
Javier Segarra	e02dcf23b7	feat: refs #6321 add columns ticketConfigs	2025-02-05 15:36:01 +01:00
Jose Antonio Tubau	abf73f5705	Merge pull request 'feat: refs #8304 add ACL entry for WorkerDms with high privileges' (!3353) from 8304-workerChangesAndFixes into dev ... Reviewed-on: #3353 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-05 12:23:04 +00:00
Jose Antonio Tubau	0a25595ed5	Merge branch 'dev' into 8304-workerChangesAndFixes	2025-02-05 13:00:44 +01:00
Alex Moreno	1ee5af96a5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-05 11:16:32 +01:00
Alex Moreno	f216166806	fix: refs #7943 better "relation": "business",	2025-02-05 10:16:14 +01:00
Pablo Natek	26faaad5b4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-refactorEntryBuyList	2025-02-05 08:03:48 +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
Pablo Natek	e4cd30bc27	feat: refs #6897 add groupingMode and hasMinPrice parameters to getBuyList method	2025-02-05 07:34:47 +01:00
Javier Segarra	55eb882754	Merge branch 'dev' into 6321_negative_tickets	2025-02-04 23:42:47 +01:00
Javier Segarra	272c7c0289	perf: refs #6321 minor changes	2025-02-04 23:42:16 +01:00
Jon Elias	55063e488c	Merge pull request '#7127 modify days when adding lines to a claim' (!3195) from 7127-ModifyDaysToAddSales into dev ... Reviewed-on: #3195 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-04 13:45:20 +00:00
Alex Moreno	da36016f5b	build: init version	2025-02-04 14:43:31 +01:00
Javier Segarra	5d209314f6	feat: refs #6321 use Date.vnNew	2025-02-04 14:09:48 +01:00
Jon Elias	b3aaac2f52	Merge branch 'dev' into 7127-ModifyDaysToAddSales	2025-02-04 13:00:07 +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
Jon Elias	5258e5ba2a	refactor: refs #7127 modified checkAccessAcl instead of using VnRole	2025-02-04 13:55:01 +01:00
Javier Segarra	550b0871f0	feat: refs #6321 changes	2025-02-04 13:45:59 +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
Pablo Natek	13d9cac340	test: refs #6897 update expected results in item and tag filter tests	2025-02-03 14:19:39 +01:00
Robert Ferrús	14a48bf4c6	Merge branch 'dev' into 6702-missageSaleCloned	2025-02-03 12:37:12 +00:00
Pablo Natek	8f3bf46165	Merge branch 'dev' of https: refs #6897//gitea.verdnatura.es/verdnatura/salix into 6897-refactorEntryBuyList	2025-02-03 13:36:20 +01:00
Pablo Natek	e7dd1f6a58	feat: refs #6897 add recalcEntryPrices method and enhance ACL permissions for entry operations	2025-02-03 13:16:48 +01:00
Robert Ferrús	d79c19d92a	feat: refs #6702 delete line	2025-02-03 12:42:38 +01:00
Robert Ferrús	0646d2e817	feat: refs #6702 changes request	2025-02-03 12:41:51 +01:00
Robert Ferrús	d98476b777	Merge branch 'dev' into 6702-missageSaleCloned	2025-02-03 06:11:47 +00:00
Robert Ferrús	1a8ce32833	Merge branch 'dev' into 6702-missageSaleCloned	2025-01-31 12:17:08 +00:00
Robert Ferrús	9d3a4257b7	feat: refs #6702 translations	2025-01-31 12:53:48 +01:00
Robert Ferrús	f484c3e653	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6702-missageSaleCloned	2025-01-31 11:59:00 +01:00
Javier Segarra	49c6df42a7	Merge branch 'dev' into 6321_negative_tickets	2025-01-31 10:20:42 +00:00
Robert Ferrús	948bdbd2c6	feat: refs #6702 refs #6701 changes	2025-01-31 08:19:39 +01:00
Robert Ferrús	ce447b7de6	Merge branch 'dev' of https: refs #6702//gitea.verdnatura.es/verdnatura/salix into 6702-missageSaleCloned	2025-01-31 07:14:10 +01:00
Robert Ferrús	1e18e48f8c	feat: refs #6702 es.json delete changes	2025-01-31 07:09:42 +01:00
Javier Segarra	767c891317	perf: refs #6321 remove comments	2025-01-31 01:17:23 +01:00
Javier Segarra	2574e59c71	Merge branch 'dev' into 6321_negative_tickets	2025-01-31 01:07:53 +01:00
Javier Segarra	cd7add3497	feat: refs #6321 debug	2025-01-31 01:07:39 +01:00
Javier Segarra	7fdd3d1eb8	feat: refs #6321 fix methods	2025-01-31 01:07:28 +01:00
Javier Segarra	9791f3b935	fix: refs #6321 fixtures	2025-01-31 01:06:57 +01:00
Javier Segarra	b8894ca67d	feat: refs #6321 i18n replaceItem	2025-01-31 01:04:34 +01:00
Javier Segarra	75b4202a7b	feat: refs #6321 remove origin	2025-01-31 01:04:14 +01:00
Jorge Penadés	77623b489b	feat: refs #7119 add new vehicle	2025-01-30 10:55:36 +01:00
Jorge Penadés	a0dc8f8104	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2025-01-30 10:26:40 +01:00
Javier Segarra	dc6f93c241	Merge branch 'dev' into 6321_negative_tickets	2025-01-30 08:54:04 +01:00
Javier Segarra	811feb9fee	feat: refs #6321 tour	2025-01-29 23:46:19 +01:00
Jorge Penadés	2f364ebc76	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2025-01-29 16:40:37 +01:00
Jorge Penadés	a463a8f4d8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2025-01-29 14:49:07 +01:00
Javier Segarra	ac053814e6	test: refs #6321 fixing test	2025-01-29 12:26:42 +01:00
Jorge Penadés	2b443266b2	Merge branch 'dev' of https: refs #7119//gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2025-01-29 11:51:21 +01:00
Javier Segarra	a93e8b28db	fix: refs #6321 getSimilar	2025-01-28 23:37:56 +01:00
Jorge Penadés	051c6ffcbc	refactor(vehicle filter): refs #7119 simplify search condition to use logical OR for ID and number plate	2025-01-28 12:23:24 +01:00
Jorge Penadés	2eabfaaa8f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2025-01-28 11:44:59 +01:00
Javier Segarra	10eef6d1b6	feat: refs #6321 updates	2025-01-28 08:45:00 +01:00
Javier Segarra	1a0992da78	feat: refs #6321 changes	2025-01-27 12:04:18 +01:00
Pablo Natek	ef5c2ab3a2	feat: refs #6897 add cloneEntry and deleteEntry methods with corresponding ACL permissions	2025-01-27 08:11:41 +01:00
Javier Segarra	bd54eacda1	feat: refs #6321 alternative alertLevel	2025-01-26 02:36:39 +01:00
Javier Segarra	36192c14ec	Merge branch 'dev' into 6321_negative_tickets	2025-01-25 09:10:45 +01:00
Jorge Penadés	fb653c1eca	fix: refs #7119 rollback	2025-01-24 16:42:10 +01:00
Jorge Penadés	ec7bbd13b1	refactor: refs #7119 update vehicle filter logic and improve test cases	2025-01-24 16:37:35 +01:00
Jorge Penadés	2346205072	Merge branch 'dev' of https: refs #7119//gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2025-01-24 16:14:09 +01:00
Jorge Penadés	3fba81b41e	feat: refs #7119 add 'id' filter option and enhance bank policy model with dmsFk field	2025-01-24 10:46:35 +01:00
Jorge Penadés	f8e4561a59	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2025-01-24 09:37:10 +01:00
Jorge Penadés	3a449896cd	feat: refs #7119 update vehicle permissions and enhance vehicle model with new fields	2025-01-23 18:02:53 +01:00
Jose Antonio Tubau	e22a472e97	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8304-workerChangesAndFixes	2025-01-23 15:06:03 +01:00
Javier Segarra	c3361fd49b	Merge branch 'dev' into 6321_negative_tickets	2025-01-23 14:48:28 +01:00
Jorge Penadés	3ea67675da	feat: refs #7119 add VehicleType model and update vehicle permissions for delivery roles	2025-01-23 10:53:53 +01:00
Jorge Penadés	0440582e2b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2025-01-23 10:09:47 +01:00
Jose Antonio Tubau	d3b22ce6c9	Merge branch '8304-workerChangesAndFixes' of https://gitea.verdnatura.es/verdnatura/salix into 8304-workerChangesAndFixes	2025-01-22 16:17:38 +01:00
Jose Antonio Tubau	e05f740c3d	Merge branch 'dev' into 8304-workerChangesAndFixes	2025-01-22 16:17:35 +01:00
Jose Antonio Tubau	171296f2db	Merge branch 'dev' into 8304-workerChangesAndFixes	2025-01-22 11:43:14 +00:00
Jorge Penadés	49e08fbf45	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2025-01-22 12:42:25 +01:00
Javier Segarra	2a4bad5034	Merge branch 'dev' into 6321_negative_tickets	2025-01-21 23:43:07 +01:00
Jorge Penadés	2ae0097fa8	feat: refs #7119 add vehicle type management and delivery role permissions	2025-01-21 15:48:20 +01:00
Jose Antonio Tubau	7f5224ebca	feat: refs #8304 add ACL entries for Business and Worker models and update worker model relationships	2025-01-21 14:45:13 +01:00
Jose Antonio Tubau	b20dee8382	feat: refs #8304 add notes field to business model	2025-01-21 12:28:34 +01:00
Jorge Penadés	55a0a5bc9a	feat: refs #7119 add delivery role permissions	2025-01-21 11:52:09 +01:00
Jorge Penadés	e343e457ee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2025-01-21 10:48:08 +01:00
Jorge Penadés	3d2a7cfb66	feat: refs #7119 update ACLs for vehicle management and refine vehicle filter logic	2025-01-20 18:05:33 +01:00
Jorge Penadés	946d08e543	feat: refs #7119 update ACLs and remove unused models for vehicle management	2025-01-20 17:29:18 +01:00
Javier Segarra	1560c48af2	feat: refs #6321 improve query	2025-01-20 14:32:26 +01:00
Jorge Penadés	ecedc84164	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2025-01-20 14:28:30 +01:00
Pablo Natek	f8a156b7ab	feat: refs #6897 add EntryConfig model and enhance entry filtering with new parameters	2025-01-17 08:11:18 +01:00
Carlos Andrés	f79bc2a665	Merge branch 'dev' into 7965-unifyProblems	2025-01-15 17:37:32 +00:00
Carlos Andrés	948ad3a752	Merge branch 'dev' into 7965-unifyProblems	2025-01-15 10:16:25 +00:00
Javier Segarra	84dfdcb79a	Merge branch 'dev' into 6321_negative_tickets	2025-01-14 12:43:25 +01:00
Jose Antonio Tubau	0e8d9137ed	feat: refs #8304 add privilege check for WorkerDms filter method	2025-01-10 13:48:03 +01:00
Jose Antonio Tubau	a167e7fada	feat: refs #8304 add ACL entry for WorkerDms with high privileges	2025-01-10 13:42:29 +01:00
Carlos Andrés	2d8bda2b56	fix: refs #7965 UnifyProblems	2025-01-09 15:46:04 +01:00
Carlos Andrés	09b4b2cf1b	fix: refs #7965 UnifyProblems	2025-01-09 11:52:30 +01:00
Carlos Andrés	638a8e344d	fix: refs #7965 UnifyProblems	2025-01-09 10:34:49 +01:00
Carlos Andrés	8f99b14510	fix: refs #7965 UnifyProblems	2025-01-09 08:43:14 +01:00
Carlos Andrés	71fcce4ed7	Merge branch 'dev' into 7965-unifyProblems	2025-01-09 08:13:42 +01:00
Robert Ferrús	eca2ff84ef	feat: refs #6702 changes	2025-01-02 07:49:49 +01:00
Jorge Penadés	bc495ed51e	feat: refs #7119 add VehicleNotes model and update vehicle filter SQL query	2024-12-30 17:55:27 +01:00
Jorge Penadés	68e42206c8	feat: refs #7119 enhance vehicle filter method with additional parameters and improve SQL query structure	2024-12-30 17:31:56 +01:00
Jorge Penadés	e9b0b1b7a3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2024-12-30 15:56:57 +01:00
Jorge Penadés	8a6482ada5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2024-12-30 09:31:19 +01:00
Jorge Penadés	921edb238c	feat: refs #7119 add Ppe model and establish relationships in Vehicle model	2024-12-27 16:55:59 +01:00
Jorge Penadés	0de4ce9b3c	feat: refs #7119 add BankPolicy and FuelType models	2024-12-27 15:36:19 +01:00
Jorge Penadés	9731d13a9a	feat: refs #7119 add updateAttributes ACL	2024-12-27 12:21:46 +01:00
Jorge Penadés	4d7387af18	feat: refs #7119 add deleteById permission for deliveryBoss role in ACL for Vehicle model	2024-12-26 17:52:36 +01:00
Jorge Penadés	b01e4894c9	feat: refs #7119 remove vehicleStateFk argument from filter method and simplify search logic	2024-12-26 17:02:37 +01:00
Jorge Penadés	f8c1e2aacf	feat: refs #7119 add search and filter capabilities to Vehicle model and update related SQL fixtures	2024-12-26 16:36:50 +01:00
Jorge Penadés	fffd095ab3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2024-12-26 09:43:39 +01:00
Jorge Penadés	9aa790ecfd	feat: refs #7119 add isKmTruckRate field to Vehicle model and filter	2024-12-24 13:27:32 +01:00
Jorge Penadés	39fc196464	feat: refs #7119 add VehicleEvent and VehicleState models with associated methods and SQL fixtures	2024-12-24 13:01:23 +01:00
Jorge Penadés	086b7aed4b	feat: refs #7119 add VehicleState model with data source configuration	2024-12-24 10:40:17 +01:00
Robert Ferrús	9b2fb7a430	feat: refs #6702 sale fix Self.ticketWeekly	2024-12-19 11:32:15 +01:00
Robert Ferrús	0652d11112	feat: refs #6702 updatePrice message	2024-12-19 10:29:50 +01:00
Guillermo Bonet	a8cf01ca19	refactor: refs #8172 Removed column and row columns	2024-12-18 14:36:59 +01:00
Guillermo Bonet	6300795e52	refactor: refs #8172 Created table parkingCoordinates	2024-12-18 13:17:47 +01:00
Robert Ferrús	46c4f4786a	feat: refs #6702 saleCloned	2024-12-18 12:03:48 +01:00
Javier Segarra	53298bd9ca	Merge branch 'dev' into 6321_negative_tickets	2024-12-09 14:24:34 +01:00
Jon Elias	8fedd78938	fix: refs #7965 filter and sales back tests	2024-11-29 12:47:24 +01:00
Jon Elias	568661021a	feat: refs #7965 added #6242 back to unify PR	2024-11-29 11:54:53 +01:00
Jon Elias	632c1b2fc7	Merge branch 'dev' of https: refs #7965//gitea.verdnatura.es/verdnatura/salix into 7965-unifyProblems	2024-11-29 11:51:21 +01:00
Jon Elias	9113f2e3e5	feat: refs #7127 modify days when adding lines to a claim	2024-11-13 08:30:09 +01:00
Carlos Andrés	4e0a81464c	fix: test	2024-10-02 15:12:57 +02:00
Carlos Andrés	99c70a533a	fix: test	2024-10-02 14:25:27 +02:00
Carlos Andrés	5f230ff122	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7965-unifyProblems	2024-10-02 14:23:53 +02:00
Carlos Andrés	6a5cf1a57f	fix: refs #7965 UnifyProblems	2024-10-01 15:46:51 +02:00
Carlos Andrés	bb1695eac6	fix: refs #7965 UnifyProblems	2024-09-30 16:39:55 +02:00
Carlos Andrés	af4d1ad513	Merge branch 'dev' into 7965-unifyProblems	2024-09-30 14:31:48 +02:00
Carlos Andrés	69cafd5a04	fix: refs #7965 UnifyProblems	2024-09-30 14:30:15 +02:00
Javier Segarra	62dd5cb675	Merge branch 'dev' into 6321_negative_tickets	2024-09-24 22:12:21 +02:00
Javier Segarra	c6490f6740	feat(salix): refs #6321 #6321 fixtures.before	2024-09-24 22:12:11 +02:00
Javier Segarra	c876022fe5	feat(salix): refs #6321 #6321 TODO	2024-09-24 13:54:32 +02:00
Javier Segarra	2cb57225ff	perf(salix): refs #6321 #7677 itemLackDetail	2024-09-21 00:26:55 +02:00
Carlos Andrés	712bfe7368	fix: refs #7965 UnifyProblems	2024-09-19 20:15:38 +02:00
Javier Segarra	5e38d18fed	Merge branch 'dev' into 6321_negative_tickets	2024-09-19 09:34:55 +02:00
Javier Segarra	a93dd79fe2	Merge branch 'dev' into 6321_negative_tickets	2024-09-19 00:00:42 +02:00
Javier Segarra	36297009e1	perf(salix): refs #6321 #7677 itemLackDetail	2024-09-17 16:43:09 +02:00
Carlos Andrés	750b83bb45	fix: refs #7760 tmp.ticketIPT	2024-09-16 19:03:12 +02:00
Carlos Andrés	91fac11fa0	fix: refs #7760 tmp.ticketIPT	2024-09-16 18:21:12 +02:00
Javier Segarra	03fcabd7f6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets	2024-09-16 09:58:20 +02:00
Javier Segarra	e76e2a15f2	feat(salix): refs #6321 #6321 TODO	2024-09-13 09:44:09 +02:00
Javier Segarra	09a7918ab3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets	2024-09-13 08:51:28 +02:00
Javier Segarra	fb851c3bdd	feat: refs #6321 implement VnTable	2024-09-12 13:33:22 +02:00
Javier Segarra	94f99ccee1	fix(salix): refs #6321 #6321 remove ticketMethod clone	2024-09-11 11:58:58 +02:00
Javier Segarra	844e96583b	Merge branch 'dev' of https: refs #6321//gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets	2024-09-11 08:45:42 +02:00
Javier Segarra	f77163102c	Merge branch 'dev' into 6321_negative_tickets	2024-07-23 10:43:12 +02:00
Javier Segarra	b2d58a1d6f	Merge branch 'dev' into 6321_negative_tickets	2024-07-22 17:30:25 +02:00
Javier Segarra	0e97c453ed	Merge branch 'dev' into 6321_negative_tickets	2024-07-22 16:47:05 +02:00
Javier Segarra	7ec47f2f80	Merge branch 'dev' into 6321_negative_tickets	2024-07-22 10:21:50 +02:00
Javier Segarra	c9c9d5973d	test(salix): refs #6321 #6321 fix test	2024-07-20 00:36:59 +02:00
Javier Segarra	7e8c2eebe5	feat: refs #6321 restore fixtures.before.sql	2024-07-19 19:38:21 +02:00
Javier Segarra	212f84aa9b	revert commit	2024-07-19 11:41:33 +02:00
Javier Segarra	48b8bda49a	Merge branch 'dev' into 6321_negative_tickets	2024-07-19 09:42:42 +02:00
Javier Segarra	ac7c28cd27	Merge branch 'dev' into 6321_negative_tickets	2024-07-18 22:02:22 +02:00
Javier Segarra	99efdffe58	feat(salix): refs #6321 #6321 retrieve observationType	2024-07-04 09:39:06 +02:00
Javier Segarra	8b72b7211e	feat(salix): refs #7380 #7380 new typeObservation	2024-07-03 23:06:13 +02:00
Javier Segarra	14e14eea2a	feat(salix): refs #7380 #7380 client.substitutionAllowed new field	2024-07-03 23:06:06 +02:00
Javier Segarra	b5ea2f12ff	Merge remote-tracking branch 'origin/dev' into 6321_negative_tickets	2024-07-03 23:05:42 +02:00
Javier Segarra	37de252e15	Merge branch 'dev' into 6321_negative_tickets	2024-07-02 12:22:35 +02:00
Javier Segarra	a1c48974c9	Merge branch 'dev' into 6321_negative_tickets	2024-06-20 12:21:24 +02:00
Javier Segarra	e87c8ee5a7	feat(Salix): refs #6321 #6427 change url endpoint	2024-06-18 13:17:29 +02:00
Javier Segarra	dba76a4f6b	test(Salix): refs #6321 #6321 add default items as Proposal	2024-06-17 12:38:36 +02:00
Javier Segarra	e45ac6424c	perf(salix): refs #6321 #6321 updates	2024-06-14 11:43:06 +02:00
Javier Segarra	ab85b8e703	Merge branch 'dev' into 6321_negative_tickets	2024-06-12 22:37:14 +02:00
Javier Segarra	2cbd610bc2	perf(salix): refs #6321 #7563 add ink.showOrder to procedure	2024-06-12 22:19:59 +02:00
Javier Segarra	02bc3afcda	Merge branch 'dev' into 6321_negative_tickets	2024-06-11 13:53:30 +02:00
Javier Segarra	64a4a78308	feat(salix): refs #6321 updates	2024-06-10 17:09:25 +02:00
Javier Segarra	149aeac54e	Merge branch 'dev' into 6321_negative_tickets	2024-06-04 09:26:15 +02:00
Javier Segarra	7468f87808	feat(salix): refs #6321 #6321 improve split mehtod	2024-05-30 07:46:10 +02:00
Javier Segarra	aab7a7ec73	Merge branch 'dev' into 6321_negative_tickets	2024-05-28 12:45:50 +02:00
Javier Segarra	4fe1d80e7c	feat(salix): refs #6321 default value when days is not present	2024-05-24 14:00:41 +02:00
Javier Segarra	8366cfa348	Merge branch 'dev' into 6321_negative_tickets	2024-05-24 11:12:52 +02:00
Javier Segarra	70f245fd2d	Merge branch 'dev' into 6321_negative_tickets	2024-05-15 16:25:44 +02:00
Javier Segarra	3401f0d745	Merge branch 'dev' into 6321_negative_tickets	2024-05-15 08:55:10 +02:00
Javier Segarra	befc128950	feat(salix): refs #6321 Sale_itemReplace	2024-05-15 08:36:13 +02:00
Javier Segarra	5c0b25bb30	Merge branch '6321_negative_tickets' of https://gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets	2024-05-13 13:51:20 +02:00
Javier Segarra	888f15049a	feat(salix): refs #6321 #6321 New arg	2024-05-13 13:51:04 +02:00
Jorge Penadés	cfea648103	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets	2024-05-13 13:25:52 +02:00
Javier Segarra	e30c66313f	Merge branch 'dev' into 6321_negative_tickets	2024-05-08 12:29:06 +02:00
Javier Segarra	de7469419a	feat(salix): refs #6321 #6321 getSimilar minor update	2024-05-03 07:23:12 +02:00
Javier Segarra	7caea44427	feat(salix): refs #6321 #6321 getSimilar	2024-05-02 13:53:28 +02:00
Javier Segarra	63d07cb082	Merge branch 'dev' into 6321_negative_tickets	2024-05-02 12:47:59 +02:00
Javier Segarra	cb76075bf8	Merge branch 'dev' into 6321_negative_tickets	2024-04-29 11:55:39 +02:00
Javier Segarra	d638e31a1a	Merge branch 'dev' into 6321_negative_tickets	2024-04-23 19:15:45 +02:00
Javier Segarra	caaa4fdd30	Merge remote-tracking branch 'origin/dev' into 6321_negative_tickets	2024-04-23 11:45:59 +02:00
Javier Segarra	68158f341d	feat(salix): refs #6321 #6331 publish negativeOrigin model	2024-04-22 14:09:27 +02:00
Javier Segarra	5a5032f6e6	Merge remote-tracking branch 'origin/dev' into 6321_negative_tickets	2024-04-22 13:34:06 +02:00
Javier Segarra	41f0b6aa93	Merge branch 'dev' into 6321_negative_tickets	2024-04-16 05:13:35 +00:00
Javier Segarra	e0712645a2	refs #6321 test: fix	2024-04-08 12:17:32 +02:00
Javier Segarra	3dd162b683	refs #6321 test: fix	2024-04-08 12:16:07 +02:00
Javier Segarra	25fc39ef2b	refs #6321 perf: change descriptions	2024-04-08 11:33:32 +02:00
Javier Segarra	134c468589	Merge branch 'dev' into 6321_negative_tickets	2024-04-08 11:30:48 +02:00
Javier Segarra	c4f8734d44	refs #6321 fix: param	2024-04-03 09:48:56 +02:00
Javier Segarra	cc3f2da639	refs #6321 perf: minor change	2024-04-02 15:02:33 +02:00
Javier Segarra	586f37afd2	refs #6321 perf: add arguments into procedure	2024-04-02 13:28:26 +02:00
Juanjo Breso	9a80f8c2ce	minor change	2024-04-02 10:45:29 +02:00
Javier Segarra	d08535ac18	refs #6321 minor changes	2024-04-02 08:04:27 +02:00
Javier Segarra	5d24844256	refs #6321 test: debug use TIMEOUT	2024-04-01 16:12:52 +02:00
Javier Segarra	601f5db080	refs #6321 test: spliy	2024-04-01 16:11:30 +02:00
Javier Segarra	59498179ec	refs #6321 test: itemLackDetail	2024-04-01 14:05:45 +02:00
Javier Segarra	d225821a41	refs #6321 test: itemLack	2024-04-01 13:59:35 +02:00
Javier Segarra	d62c55dc9f	refs #6321 test: negativeOrigin	2024-04-01 13:11:58 +02:00
Javier Segarra	2cff160c6a	Merge branch 'dev' into 6321_negative_tickets	2024-03-28 23:50:51 +00:00
Javier Segarra	65a6174e2b	refs #6321 updates	2024-03-28 12:01:06 +01:00
Javier Segarra	e6fe245b27	refs #6321 feat: new split method	2024-03-27 14:09:25 +01:00
Javier Segarra	d8d0ced918	Merge branch 'dev' into 6321_negative_tickets	2024-03-27 09:54:02 +01:00
Javier Segarra	a943e39ba7	refs #6321 feat: negativeOrigin	2024-03-22 22:44:37 +01:00
Javier Segarra	e085bc7f1e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets	2024-03-21 07:47:39 +01:00
Javier Segarra	44c4e6a16e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets	2024-03-15 09:47:10 +01:00
Javier Segarra	6c0706cc56	refs #6321 perf: query to retrieve results	2024-03-15 09:33:06 +01:00
Javier Segarra	f83f7808c8	refs #6321 feat: negativeOrigin method	2024-03-15 09:32:36 +01:00
Javier Segarra	6a12af2eb9	refs #6321 feat: add producerFk	2024-03-14 15:26:30 +01:00
Javier Segarra	ed6b25455b	refs #5858 feat: improve itemLackDetail	2024-03-13 14:27:45 +01:00
Javier Segarra	c8446eb9a1	refs #6321 perf: updatemethod	2024-03-13 09:20:32 +01:00
Javier Segarra	d1e7e13333	refs #6321 feat: acl	2024-03-06 14:37:28 +01:00
Javier Segarra	7c8fa52da0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets	2024-03-06 14:30:02 +01:00
Javier Segarra	871447cc6e	refs #6321 feat: updates	2024-03-05 08:07:54 +01:00
Javier Segarra	bc09ad7da7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets	2024-01-29 11:07:31 +01:00
Javier Segarra	1a21dda00b	refs #6321 feat itemLackDetail	2024-01-29 09:55:44 +01:00
Javier Segarra	895d9bff64	refs #6321 feat itemLAck with SQL	2024-01-29 09:55:34 +01:00
Javier Segarra	f49444c19f	Merge branch '6321_negative_tickets' of https://gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets	2024-01-23 09:42:59 +01:00
Javier Segarra	48d9a3934a	Merge branch 'dev' into 6321_negative_tickets	2024-01-22 19:29:47 +00:00
Javier Segarra	2bcb6366b2	refs #6321 feat: vCustomWhere	2024-01-22 10:10:38 +01:00
Javier Segarra	0111aa1b75	refs #6321 feat: fixtures and update procedure	2024-01-22 09:56:10 +01:00
Javier Segarra	91f5ee3b93	refs #6321 feat: new remoteMethod	2024-01-20 12:29:41 +01:00