10902 Commits

Author	SHA1	Message	Date
Javier Segarra	8398a30e4f	Merge branch 'dev' into 6321_negative_tickets	2025-02-06 14:58:55 +00:00
Javier Segarra	9626b6c0ff	feat: refs #6321 update itemLackDetail	2025-02-06 15:19:39 +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
Guillermo Bonet	92ca3a2582	Merge branch 'master' into test	2025-02-06 13:47:17 +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	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
Carlos Andrés	37b735b988	feat: refs #8535 sistema de warnings	2025-02-05 17:21:36 +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	0a25595ed5	Merge branch 'dev' into 8304-workerChangesAndFixes	2025-02-05 13:00:44 +01:00
Alex Moreno	e89c12f753	fix: refs #7943 better "relation": "business",	2025-02-05 10:52:20 +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
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
Alex Moreno	fe7a1c60cc	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-04 13:03:17 +01:00
Guillermo Bonet	ee5a93ba81	Merge branch 'dev' into 8515-fixTestOptimizePriority	2025-02-04 10:54:06 +00: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
Guillermo Bonet	49e5da5547	fix: refs #8515 Fix test optimizePriority	2025-02-04 07:48:56 +01:00
Guillermo Bonet	fb8973a358	fix: refs #8515 Fix test optimizePriority	2025-02-04 07:47:28 +01:00
Guillermo Bonet	9cecdab5a8	refactor: refs #8227 Fix tests	2025-02-04 07:17:11 +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
Guillermo Bonet	a408af2467	Merge branch 'dev' into 8227-roadmap	2025-02-03 13:23:18 +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
Guillermo Bonet	c1dd0eeb32	refactor: refs #8512 Add 'master' branch check in description condition	2025-02-03 10:54:17 +01:00
Javi Gallego	55ec4aaba1	Merge pull request 'feat: refs #7686 Added new alertLevel ON_PREVIOUS and changes in vn.state.alertLevel' (!2890) from 7686-onPrevious into dev ... Reviewed-on: #2890 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-02-03 08:12:36 +00:00
Javi Gallego	adba4765ed	refactor: refs #7686 update alert level conditions to only check for 'FREE'	2025-02-03 09:07:08 +01:00
Robert Ferrús	d98476b777	Merge branch 'dev' into 6702-missageSaleCloned	2025-02-03 06:11:47 +00:00
Jose Antonio Tubau	ca5668f941	Merge branch 'dev' into 7414-ticketLogChanges	2025-02-03 05:57:16 +00:00
Guillermo Bonet	12604d0f67	Merge branch 'dev' into 8227-roadmap	2025-01-31 14:27:18 +01: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
Jon Elias	923fef444c	Merge pull request 'Fix[CustomerList]: fixed country field' (!3406) from CustomerListCountryField into dev ... Reviewed-on: #3406 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-01-31 09:33:17 +00:00
Carlos Satorres	e1125dc46d	Merge branch 'dev' into 6553-workerBusiness	2025-01-31 09:16:13 +00:00
Jon Elias	53ee0c1617	fix: fixed country field	2025-01-31 09:17:15 +01: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
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	7fdd3d1eb8	feat: refs #6321 fix methods	2025-01-31 01:07:28 +01:00
Javier Segarra	75b4202a7b	feat: refs #6321 remove origin	2025-01-31 01:04:14 +01:00
Sergio De la torre	be93ea3a07	fix: refs #6964 visibleGreaterThanZero	2025-01-30 17:55:10 +01:00
Javi Gallego	3965441f7f	Merge branch 'dev' into 7686-onPrevious	2025-01-30 15:29:45 +01:00
Jon Elias	0a89a6a6fd	fix: refs #7488 deleted nif validation	2025-01-30 12:40:48 +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
Robert Ferrús	9c467e67e0	Merge branch 'dev' into 6822-entryTransferFix	2025-01-30 06:07:59 +00: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
Javier Segarra	efe0aa708f	Merge branch 'dev' into 7134-supplierBalance	2025-01-29 15:13:49 +00: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
Robert Ferrús	f87fa37a79	Merge branch 'dev' into 8077-sumDefaulterRedirectionLilium	2025-01-29 12:44:42 +00:00
Robert Ferrús	35e72c90d3	Merge branch 'dev' into 6822-entryTransferFix	2025-01-29 11:46:23 +00:00
Jose Antonio Tubau	ad29b26553	refactor: refs #7414 update Spanish translation for 'total' to 'importe'	2025-01-29 12:43:03 +01:00
Javier Segarra	ac053814e6	test: refs #6321 fixing test	2025-01-29 12:26:42 +01:00
Jon Elias	17b4089b51	Merge pull request 'Fix[WorkerFilter]: Fixed filter' (!3394) from Fix-WorkerFilterLimit into dev ... Reviewed-on: #3394 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2025-01-29 11:03:14 +00: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
Jon Elias	1d53f2c490	fix: worker filter limit	2025-01-29 11:43:15 +01:00
Jon Elias	f088f1776f	fix: fixed manual invoice	2025-01-29 10:45:29 +01:00
Guillermo Bonet	56b0baebaa	feat: refs #8227 Roadmap changes	2025-01-29 07:53:41 +01:00
Javier Segarra	a93e8b28db	fix: refs #6321 getSimilar	2025-01-28 23:37:56 +01:00
Robert Ferrús	a6a875cb2c	feat: refs #8077 redirection lilium	2025-01-28 13:27:35 +01:00
Carlos Satorres	b383725f9f	fix: refs #7917 fix user tests	2025-01-28 12:56:30 +01:00
Carlos Satorres	bb08ad7d1a	Merge branch '7917-freelancerRoute2' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2	2025-01-28 12:51:24 +01:00
Carlos Satorres	a01c419b44	fix: refs #7917 fix tback	2025-01-28 12:51:21 +01:00
Carlos Satorres	3c16914135	Merge branch 'dev' into 7917-freelancerRoute2	2025-01-28 11:43:25 +00: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
Carlos Satorres	b14beb83f4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2025-01-28 11:55:27 +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
Robert Ferrús	8482743baf	feat: refs #6822 ACL	2025-01-28 11:26:48 +01:00
Sergio De la torre	1575c509d1	fix: refs #7569 saveSign use lastState	2025-01-28 11:19:45 +01:00
Sergio De la torre	3f0f155113	fix: refs #7569 saveSign use lastState	2025-01-28 11:15:29 +01:00
Sergio De la torre	79ea19a360	fix: refs #7569 saveSign use lastState	2025-01-28 11:14:08 +01:00
Sergio De la torre	a29de13ab3	fix: refs #7569 saveSign use smtp.send and fix link	2025-01-28 09:54:26 +01:00
Javi Gallego	08d2414363	refactor: refs #7686 update editableStates tests to check for 'OK' and 'Bloqueado' states	2025-01-28 09:16:19 +01:00
Javier Segarra	9419eada64	Merge branch 'dev' into 7134-supplierBalance	2025-01-28 08:46:17 +01:00
Javier Segarra	10eef6d1b6	feat: refs #6321 updates	2025-01-28 08:45:00 +01:00
Javi Gallego	0def25ad15	Merge branch 'dev' into 7686-onPrevious	2025-01-28 08:28:16 +01:00
Javier Segarra	198ae9a83b	Merge branch 'master' into Hotfix-PriceDifferenceShipped	2025-01-28 07:19:37 +00:00