14133 Commits

All Branches

Search

Author	SHA1	Message	Date
Pau Rovira	ab0d2e60b7	Merge pull request 'feat: #8406 upgraded CrudModel' (!1627) from 8406-crudModelUpdate into dev ... Reviewed-on: #1627 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-05-08 14:44:15 +00:00
Pau Rovira	0502abfca5	Merge branch 'dev' into 8406-crudModelUpdate	2025-05-08 14:17:54 +00:00
Alex Moreno	b1ef9b1bd3	Merge pull request 'feat: refs #7248 modify VnNotes' (!1336) from 7248-tablesObservation into dev ... Reviewed-on: #1336 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-05-08 13:04:24 +00:00
Alex Moreno	debae747db	Merge branch 'dev' into 8406-crudModelUpdate	2025-05-08 10:53:36 +00:00
Alex Moreno	671f0c1e67	Merge branch 'dev' into 7248-tablesObservation	2025-05-08 10:21:53 +00:00
Javier Segarra	cbb36d0ec7	fix: minor bug related with vnTable selectAll	2025-05-08 10:28:03 +02:00
Alex Moreno	fca1c77791	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-05-08 08:26:20 +02:00
Alex Moreno	b993428201	fix(VnUserLink): stop when workerId is null	2025-05-08 08:26:05 +02:00
Javier Segarra	035530c4ce	Merge pull request 'fix: fixed a problem when trying to order by shipped' (!1784) from hotfix-customerConsumptionOrder into master ... Reviewed-on: #1784 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-05-07 14:24:15 +00:00
Javier Segarra	3ed45ec8e1	Merge branch 'master' into hotfix-customerConsumptionOrder	2025-05-07 14:20:24 +00:00
Alex Moreno	5bb452186e	fix: refs #7248 update user filter property name in VehicleNotes component	2025-05-07 15:04:02 +02:00
Alex Moreno	7dd6cc71e2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7248-tablesObservation	2025-05-07 13:29:54 +02:00
Alex Moreno	d611a7387c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-05-07 13:06:35 +02:00
Alex Moreno	03dd5831c2	fix: update description assignment logic based on supplier reference	2025-05-07 13:06:21 +02:00
Pau Rovira	69f1f4d47c	fix: fixed a problem when trying to order by shipped	2025-05-07 09:44:41 +00:00
Jon Elias	44d395054a	Merge pull request 'Hotfix[CustomerNewPayment]: Description field not changing automatically' (!1783) from Fix-CustomerBalanceDescription into master ... Reviewed-on: #1783 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-05-07 09:41:00 +00:00
Jon Elias	e8ea2ebaa2	Merge branch 'master' into Fix-CustomerBalanceDescription	2025-05-07 08:57:36 +00:00
Jon Elias	a3c917f82a	fix: make data be reactive and use template values	2025-05-07 10:55:09 +02:00
Alex Moreno	9d643a5a32	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-05-07 10:54:35 +02:00
Alex Moreno	b70e23498b	Merge pull request 'hotFix(VnUserLink): improve worker existence check and refactor template logic' (!1773) from hotFix_VnUserLink_whenNotIsWorker into master ... Reviewed-on: #1773 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-05-07 08:54:03 +00:00
Alex Moreno	8ae5d8b238	Merge pull request 'chore: run eslint fix and prettier write' (!1782) from run_eslint_and_prettier into dev ... Reviewed-on: #1782 Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-05-07 08:22:01 +00:00
Alex Moreno	6b51996c36	Merge branch 'master' into hotFix_VnUserLink_whenNotIsWorker	2025-05-07 08:19:23 +00:00
Alex Moreno	3647b2b09b	fix: skip test by commit d18dd7b9ae	2025-05-07 10:14:36 +02:00
Jon Elias	efd2738553	fix: skip failling e2e in jenkins	2025-05-07 10:02:21 +02:00
Jon Elias	cc33568c27	fix: description field not changing	2025-05-07 09:57:10 +02:00
Alex Moreno	d5fc3423d6	Merge branch '7248-tablesObservation' of https://gitea.verdnatura.es/verdnatura/salix-front into 7248-tablesObservation	2025-05-07 09:56:04 +02:00
Alex Moreno	e064f9e706	fix: refs #7248 rename workerFk to userFk in CustomerDefaulter component	2025-05-07 09:55:48 +02:00
Alex Moreno	cb47858f65	Merge branch 'dev' into 7248-tablesObservation	2025-05-07 07:49:56 +00:00
Alex Moreno	686edc0b51	Revert "fix: refs #7248 update exprBuilder for workerFk and calculate total amount in CustomerBalanceDueTotal" ... This reverts commit 5f9d498700.	2025-05-07 09:49:17 +02:00
Alex Moreno	b3c2df5940	test: skip VnShortcuts test suite and ensure spinner waits in beforeEach	2025-05-07 09:40:34 +02:00
Alex Moreno	c4c6758a6c	fix: simplify waitForElement command and ensure selector exists before scrolling	2025-05-07 07:56:45 +02:00
Alex Moreno	de89eb437f	chore: run eslint fix and prettier write	2025-05-07 07:51:55 +02:00
Alex Moreno	a55c03f945	fix: enhance waitForElement command to ensure element exists and is visible	2025-05-07 07:27:54 +02:00
Alex Moreno	34892316d7	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into hotFix_VnUserLink_whenNotIsWorker	2025-05-07 07:21:31 +02:00
Javier Segarra	2bdc05951a	fix: ticketEditMana i18n label	2025-05-06 18:44:53 +02:00
Javier Segarra	112dcca245	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front	2025-05-06 15:20:30 +02:00
Javier Segarra	d18dd7b9ae	fix: remove rule required	2025-05-06 15:20:28 +02:00
Javier Segarra	382a2e0321	Merge pull request 'fix: fix Description & TicketId filters on CustomerConsumption' (!1779) from hotfix-customerConsumptionFilters into master ... Reviewed-on: #1779 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-05-06 13:09:05 +00:00
Alex Moreno	f8b1966c2a	Merge pull request 'feat: refs #8767 enable download and corrective invoice tests' (!1778) from 8767-invoiceInDescriptor_e2e into dev ... Reviewed-on: #1778 Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-05-06 12:33:58 +00:00
Pau Rovira	6c8ccd011a	fix: merge	2025-05-06 14:12:27 +02:00
Pau Rovira	761948d5b3	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix-customerConsumptionFilters	2025-05-06 14:10:56 +02:00
Pau Rovira	af065eb66e	fix: fix Description & TicketId filters on CustomerConsumption	2025-05-06 14:07:16 +02:00
Javier Segarra	6f43f2df04	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front	2025-05-06 12:35:52 +02:00
Javier Segarra	5a54debbc0	fix: #347390 ticketWeekly	2025-05-06 12:35:45 +02:00
Alex Moreno	00010c1db3	feat: refs #8767 enable download and corrective invoice tests	2025-05-06 11:56:42 +02:00
Alex Moreno	6f3b768fca	Merge branch 'hotFix_VnUserLink_whenNotIsWorker' of https://gitea.verdnatura.es/verdnatura/salix-front into hotFix_VnUserLink_whenNotIsWorker	2025-05-06 11:27:52 +02:00
Alex Moreno	88b460ee99	test: add VnUserLink stub to VnDmsList and VnLog tests	2025-05-06 11:27:50 +02:00
Javier Segarra	8c81c813b9	Merge branch 'master' into hotFix_VnUserLink_whenNotIsWorker	2025-05-06 09:25:59 +00:00
Jon Elias	ddecd0ae9a	Merge pull request 'Hotfix[CustomerBalance]: Allow negative amount' (!1776) from Hotfix-CustomerBalanceNegativeAmount into master ... Reviewed-on: #1776 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2025-05-06 09:20:36 +00:00
Jon Elias	fc2a89b479	Merge branch 'master' into Hotfix-CustomerBalanceNegativeAmount	2025-05-06 09:16:12 +00:00