7430_devToTest #388

Merged

alexm merged 282 commits from 7430_devToTest into test 2024-05-21 09:26:36 +00:00

Conversation 0 Commits 282 Files Changed 206 +8752 -3833

282 Commits

Author	SHA1	Message	Date
Pablo Natek	fe5211e14e	Merge pull request '#7187 - refactorWokerPda' (!378) from 7187-refactorWokerPda into dev ... Reviewed-on: #378 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-21 06:35:14 +00:00
Pablo Natek	e32e922c45	Merge branch 'dev' into 7187-refactorWokerPda	2024-05-20 23:06:07 +00:00
Pablo Natek	45f56078d7	feat: refs #7187 add vnconfirm on delete	2024-05-21 01:04:52 +02:00
Pablo Natek	9468e409ea	fix: refs #7187 fix reload	2024-05-21 00:34:03 +02:00
Carlos Satorres	936f921864	Merge pull request '7396-addBasicDataWorker' (!384) from 7396-addBasicDataWorker into dev ... Reviewed-on: #384 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-20 07:21:10 +00:00
Carlos Satorres	ce72b8099b	Merge branch 'dev' into 7396-addBasicDataWorker	2024-05-20 07:20:29 +00:00
Carlos Satorres	e5c445fc12	Merge branch '7396-addBasicDataWorker' of https://gitea.verdnatura.es/verdnatura/salix-front into 7396-addBasicDataWorker	2024-05-20 09:00:57 +02:00
Carlos Satorres	4199fc0dc5	refs #7396 fix basicData, summary, change deleteDepartment	2024-05-20 09:00:54 +02:00
Javier Segarra	8787db8622	Merge pull request 'Zone warehouses' (!385) from hyervoni/salix-front-mindshore:feature/ZoneWarehouses into dev ... Reviewed-on: #385 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-05-20 06:44:36 +00:00
Javier Segarra	c40f322a8f	Merge branch 'dev' into feature/ZoneWarehouses	2024-05-20 08:40:27 +02:00
Jon Elias	bfbe71c63e	Merge pull request 'refactor: refs #7361 ticket/summary like salix' (!368) from 7361-TicketSummaryRefactor into dev ... Reviewed-on: #368 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-20 05:09:12 +00:00
Jon Elias	708a852473	Merge branch 'dev' into 7361-TicketSummaryRefactor	2024-05-20 05:08:02 +00:00
Javier Segarra	3be5b66daa	Merge pull request 'Zone Delivery' (!377) from hyervoni/salix-front-mindshore:feature/ZoneDelivery into dev ... Reviewed-on: #377 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-05-18 07:07:40 +00:00
Javier Segarra	902d260822	Merge branch 'dev' into feature/ZoneDelivery	2024-05-18 07:06:57 +00:00
Javier Segarra	ce87008c12	fix: remove console.log	2024-05-18 08:50:38 +02:00
William Buezas	78e81c6f75	ZoneWarehouses and ZoneWareousesCreate refactor	2024-05-17 17:16:58 -03:00
William Buezas	e38f3fc60d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ZoneWarehouses	2024-05-17 15:32:45 -03:00
William Buezas	6c374061d0	Handle request orders	2024-05-17 15:24:17 -03:00
William Buezas	6e49982531	Revert "Handle onsubmit" ... This reverts commit 7c5b61cca8.	2024-05-17 15:18:10 -03:00
William Buezas	7c5b61cca8	Handle onsubmit	2024-05-17 14:35:15 -03:00
Javier Segarra	6afafb2f11	minor changes	2024-05-17 18:44:25 +02:00
Javier Segarra	cda59116ff	Revert "first approach" ... This reverts commit 9604599b33.	2024-05-17 18:04:48 +02:00
Javier Segarra	3b0f99a196	Merge branch '7396-addBasicDataWorker' of https://gitea.verdnatura.es/verdnatura/salix-front into 7396-addBasicDataWorker	2024-05-17 17:56:52 +02:00
Javier Segarra	9604599b33	first approach	2024-05-17 17:53:26 +02:00
William Buezas	e196cf8fd5	Zone warehouses	2024-05-17 10:57:20 -03:00
Alex Moreno	75f3d4f410	fix: refs #6539 VnSelect use url	2024-05-17 14:32:39 +02:00
Carlos Satorres	488c6b3f94	Merge branch '7396-addBasicDataWorker' of https://gitea.verdnatura.es/verdnatura/salix-front into 7396-addBasicDataWorker	2024-05-17 14:23:02 +02:00
Carlos Satorres	d359063e5d	refs #7396 fix summary	2024-05-17 14:23:00 +02:00
Javier Segarra	ce444c7e5c	first approach	2024-05-17 14:19:29 +02:00
Carlos Satorres	cd21d7817d	refs #7396 fix summary basicData	2024-05-17 14:16:06 +02:00
Carlos Satorres	d7e3303d68	refs #7396 add fiDueDate, machine	2024-05-17 13:19:59 +02:00
Carlos Satorres	2c41c31b6f	Merge pull request '6914-fixWorkerCreateErrors' (!380) from 6914-fixWorkerCreateErrors into dev ... Reviewed-on: #380 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-17 11:18:31 +00:00
Carlos Satorres	067df2d56b	Merge branch 'dev' into 6914-fixWorkerCreateErrors	2024-05-17 11:15:25 +00:00
Jon Elias	8b835e299b	Merge branch 'dev' into 7361-TicketSummaryRefactor	2024-05-17 08:31:52 +00:00
Jon Elias	d754e5efce	Merge branch '7361-TicketSummaryRefactor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7361-TicketSummaryRefactor	2024-05-17 10:30:51 +02:00
Jon Elias	4ca7df5bfb	refactor: refs #7361 changes in css	2024-05-17 10:30:50 +02:00
Javier Segarra	01ad6d9bea	Merge branch 'dev' into feature/ZoneDelivery	2024-05-17 09:52:21 +02:00
Javier Segarra	dc597f73e2	fix: style	2024-05-17 09:50:18 +02:00
Pablo Natek	b704692f3f	Merge branch '7187-refactorWokerPda' of https://gitea.verdnatura.es/verdnatura/salix-front into 7187-refactorWokerPda	2024-05-17 08:55:07 +02:00
Pablo Natek	e8ba975be2	fix: spec name	2024-05-17 08:55:07 +02:00
Carlos Satorres	660577c9fe	refs #6914 fix vnLocation workerCreate	2024-05-16 16:02:38 +02:00
Jorge Penadés	475f0eda48	Merge pull request '#6891 fix: hide across only on disable' (!379) from 6891-fixSearchbar into dev ... Reviewed-on: #379 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-05-16 13:15:09 +00:00
Carlos Satorres	b19d9ec473	refs #6914 fix VnLocationCountry	2024-05-16 14:18:41 +02:00
Pablo Natek	a5dd7c817e	Merge branch 'dev' into 7187-refactorWokerPda	2024-05-16 12:08:51 +00:00
Pablo Natek	108533d475	fix: delete translates	2024-05-16 12:57:35 +02:00
Jorge Penadés	2855499148	fix: refs #6891 hide across only on disable	2024-05-16 12:07:47 +02:00
Jorge Penadés	0854fa67a8	Merge pull request '#7281 solve terminal warnings' (!376) from 7281-solveTerminalWarnings into dev ... Reviewed-on: #376 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-05-16 07:19:16 +00:00
Jorge Penadés	d4cbdb469a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7281-solveTerminalWarnings	2024-05-16 09:06:48 +02:00
Jorge Penadés	1654fb93d4	fix: refs #6598 build	2024-05-16 09:06:12 +02:00
Jorge Penadés	03553dd9bc	Merge pull request '#7274 fixCustomer' (!374) from 7274-fixCustomer into dev ... Reviewed-on: #374 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-16 07:05:01 +00:00
Jorge Penadés	288f776c9c	Merge branch 'dev' into 7274-fixCustomer	2024-05-16 07:01:08 +00:00
Jorge Penadés	ed9310cbb1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7281-solveTerminalWarnings	2024-05-16 08:58:00 +02:00
Alex Moreno	cf16db2e33	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-05-16 08:52:03 +02:00
Alex Moreno	c7cb591008	warmFix(customerFiscalData): fix vnRows	2024-05-16 08:52:02 +02:00
Robert Ferrús	f4053b5d7c	Merge pull request 'feat: refs #7039 country change column country - name' (!326) from 7039-country-country into dev ... Reviewed-on: #326 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-16 06:50:45 +00:00
Robert Ferrús	ca5cf66f56	Merge branch 'dev' into 7039-country-country	2024-05-16 06:46:32 +00:00
Carlos Satorres	4a4550351d	Merge pull request '6905-fixUserPanel2' (!375) from 6905-fixUserPanel2 into dev ... Reviewed-on: #375 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-16 06:20:58 +00:00
Carlos Satorres	8b86846530	Merge branch 'dev' into 6905-fixUserPanel2	2024-05-16 06:18:49 +00:00
Robert Ferrús	b7fce0917e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7039-country-country	2024-05-16 07:29:07 +02:00
Jon Elias	6603c81aa3	Merge branch 'dev' into 7361-TicketSummaryRefactor	2024-05-16 05:18:13 +00:00
Pablo Natek	c24062fccb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7187-refactorWokerPda	2024-05-15 22:18:40 +02:00
Pablo Natek	bc9c1fdf8e	feat: pda duplicates	2024-05-15 22:17:40 +02:00
Jorge Penadés	3cb02d5e5f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7281-solveTerminalWarnings	2024-05-15 15:42:13 +02:00
Jorge Penadés	662dfb15a4	Merge pull request '#6891 showRightSideFilterPanel' (!353) from 6891-showRightSideFilterPanel into dev ... Reviewed-on: #353 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-15 13:39:22 +00:00
Jorge Penadés	185b9daa25	Merge branch 'dev' into 6891-showRightSideFilterPanel	2024-05-15 13:38:31 +00:00
William Buezas	5677a1af1b	remove unused onMounted	2024-05-15 10:31:33 -03:00
William Buezas	f3a5ebbcec	Bug fix	2024-05-15 10:27:45 -03:00
William Buezas	cd8095d3b8	Last changes	2024-05-15 09:39:15 -03:00
Jon Elias	e766bdfdfb	Merge branch 'dev' into 7361-TicketSummaryRefactor	2024-05-15 12:35:59 +00:00
Jon Elias	5e3fca3f81	Merge branch '7361-TicketSummaryRefactor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7361-TicketSummaryRefactor	2024-05-15 14:35:09 +02:00
Jon Elias	ccaf993841	refactor: refs #7361 requested changes	2024-05-15 14:35:08 +02:00
Jorge Penadés	0b59206caa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7281-solveTerminalWarnings	2024-05-15 14:32:39 +02:00
Jorge Penadés	628fc888ba	fix: refs #7281 fix warnings	2024-05-15 14:31:51 +02:00
Jorge Penadés	bf43893b05	fix: refs #7274 use VnInputDate	2024-05-15 14:06:42 +02:00
Alex Moreno	d99ef43e0d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-05-15 13:54:01 +02:00
Carlos Satorres	0819d00d05	refs #6905 fix pr	2024-05-15 12:55:39 +02:00
Jorge Penadés	872aee51ca	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel	2024-05-15 12:34:21 +02:00
Jorge Penadés	2eca98d31d	feat: refs #7274 show total on rightMenu	2024-05-15 11:54:14 +02:00
Carlos Satorres	942efc319a	refs #6905 fix userState	2024-05-15 11:46:04 +02:00
Jorge Penadés	31573c0f0b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7274-fixCustomer	2024-05-15 11:22:23 +02:00
Carlos Satorres	a3f074ea0a	refs #6905 fix data	2024-05-15 10:13:49 +02:00
Javier Segarra	9b64a82a71	Merge pull request 'Zone create' (!371) from hyervoni/salix-front-mindshore:feature/ZoneCreate into dev ... Reviewed-on: #371 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-05-15 07:49:35 +00:00
Alex Moreno	2b27e39d72	fix: zone icon and isVolumetric default false	2024-05-15 09:37:33 +02:00
Jorge Penadés	9d9d3db43b	fix: refs #7274 defaulterFilter	2024-05-14 17:29:15 +02:00
Jorge Penadés	e4637b7d15	fix: refs #7274 add note	2024-05-14 14:39:55 +02:00
Jorge Penadés	a6c761c031	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_Customer_1	2024-05-14 13:42:38 +02:00
Jorge Penadés	90a9a7dcc7	fix: refs #6891 fix invoiceIntrastat test	2024-05-14 13:07:29 +02:00
Jorge Penadés	189c3e0218	fix: refs #6891 fix invoiceInVat test	2024-05-14 13:00:03 +02:00
Jorge Penadés	a095670ff1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel	2024-05-14 12:42:14 +02:00
Javier Segarra	fc6bd82ea0	Merge branch 'dev' into feature/ZoneCreate	2024-05-14 11:52:29 +02:00
Javier Segarra	19bdd4fc36	Merge pull request 'feat: refs #7271 basicData and Log' (!369) from 7271-EndZoneMigration into dev ... Reviewed-on: #369 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-05-14 09:49:20 +00:00
Javier Segarra	f4dd9b84fd	fix: VnLocation > fiscal-data	2024-05-14 11:42:34 +02:00
Javier Segarra	cb40505f82	fix: VnLocation > workercreate	2024-05-14 11:11:28 +02:00
Javier Segarra	c443b0a00f	feat: input validations	2024-05-14 10:50:29 +02:00
Javier Segarra	20f9b53afb	Merge branch 'dev' into 7271-EndZoneMigration	2024-05-14 10:42:43 +02:00
Javier Segarra	fa82efe5d2	fix: limit width some fields	2024-05-14 10:41:28 +02:00
Javier Segarra	289bdeecae	fix: Workers/isActive	2024-05-14 10:41:07 +02:00
Javier Segarra	dcbf2eb837	Merge pull request 'Monitors' (!364) from hyervoni/salix-front-mindshore:feature/Monitors into dev ... Reviewed-on: #364 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-05-13 16:02:29 +00:00
Javier Segarra	32e715ce6b	Merge branch 'dev' into feature/Monitors	2024-05-13 17:59:39 +02:00
Jorge Penadés	b062474f91	fix: refs #6891 fix invoiceInDueDay test	2024-05-13 17:20:50 +02:00
Jorge Penadés	5b3ee220d4	fix: refs #6891 fix ticketDescriptor test	2024-05-13 17:07:59 +02:00
Jorge Penadés	364367d2f1	fix: refs #6891 fix invoiceInBasicData test test	2024-05-13 16:46:28 +02:00
Jorge Penadés	6a6d5b6d23	fix: refs #6891 fix workerLocker test	2024-05-13 16:22:12 +02:00
Jorge Penadés	a878ad23b9	fix: refs #6891 fix invoiceInform design	2024-05-13 16:01:18 +02:00
Jorge Penadés	fdd3c41c96	feat: refs #6891 update changelog	2024-05-13 15:46:48 +02:00
Jorge Penadés	07b91febb6	feat: refs #6891 unit test	2024-05-13 15:41:35 +02:00
William Buezas	7b99d2f38b	re order translation	2024-05-13 10:31:11 -03:00
William Buezas	8e7b043a46	Resolve conflicts	2024-05-13 10:28:21 -03:00
Jorge Penadés	d55dc638d9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel	2024-05-13 15:23:37 +02:00
William Buezas	9304b511bc	Zone delivery	2024-05-13 10:14:36 -03:00
Javier Segarra	1181cd0daa	Merge branch 'dev' into 7271-EndZoneMigration	2024-05-13 12:15:50 +00:00
Javier Segarra	a94c1a32e1	fix: show label agency instead id	2024-05-13 14:13:41 +02:00
Jorge Penadés	cde918744d	Merge pull request '#5919 locker' (!338) from 5919-locker into dev ... Reviewed-on: #338 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-13 12:08:47 +00:00
Jon Elias	04ce9558b7	Merge branch 'dev' into 7361-TicketSummaryRefactor	2024-05-13 11:58:49 +00:00
Jon Elias	146ced2ea2	Merge branch '7361-TicketSummaryRefactor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7361-TicketSummaryRefactor	2024-05-13 13:57:52 +02:00
Jon Elias	2859a7bad6	style: refs #7361 style refactor	2024-05-13 13:57:51 +02:00
Jorge Penadés	0b83d3663f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker	2024-05-13 13:20:15 +02:00
Jon Elias	14910c5899	feat: refs #7271 basicData and Log	2024-05-13 12:46:25 +02:00
Javier Segarra	4fb4cb9298	Merge pull request 'ZoneList and ZoneSummary' (!365) from hyervoni/salix-front-mindshore:feature/ZoneList into dev ... Reviewed-on: #365 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-13 08:00:21 +00:00
Alex Moreno	0ed3cafcab	Merge branch 'dev' into feature/ZoneList	2024-05-13 07:31:17 +00:00
Alex Moreno	a28d18f1e1	fix: redirection when clone and styles	2024-05-13 09:30:03 +02:00
Jorge Penadés	f08a7a2e9d	Merge branch '5919-locker' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker	2024-05-13 08:55:14 +02:00
Jorge Penadés	ad14d2e776	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker	2024-05-13 08:55:03 +02:00
Javier Segarra	05698af75d	Merge branch 'dev' into 5919-locker	2024-05-13 06:47:54 +00:00
Javier Segarra	722373fd99	Merge branch 'dev' into feature/Monitors	2024-05-13 06:47:41 +00:00
Jon Elias	68082dddd0	Merge branch 'dev' into 7361-TicketSummaryRefactor	2024-05-13 05:08:19 +00:00
Jorge Penadés	cd0dd6a735	feat: refs #5919 changeLog	2024-05-10 16:12:52 +02:00
Jorge Penadés	a692ca4a18	feat: refs #5919 test & set workerFk null.	2024-05-10 16:01:32 +02:00
Jon Elias	e0bb8da47f	Merge pull request 'refactor: refs #6767 deleted <div class="col">' (!302) from 6767-deleteDivCol into dev ... Reviewed-on: #302 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-05-10 12:40:53 +00:00
Jorge Penadés	7fd4c43b8b	feat: refs #5919 workerlocker	2024-05-10 13:07:58 +02:00
Jon Elias	686bead961	Merge branch 'dev' into 7361-TicketSummaryRefactor	2024-05-10 10:01:49 +00:00
Jon Elias	071e6a7296	refactor: refs #7361 ticket/summary like salix	2024-05-10 12:00:16 +02:00
Jon Elias	2183385e58	Merge branch 'dev' into 6767-deleteDivCol	2024-05-10 09:39:31 +00:00
Javier Segarra	daf1d4de2d	style changes	2024-05-10 08:51:47 +02:00
Javier Segarra	cb24ac81ff	Merge branch 'dev' into feature/ZoneList	2024-05-10 08:46:00 +02:00
Javier Segarra	049564f443	fix: Descriptor	2024-05-10 08:45:38 +02:00
Javier Segarra	1100588af5	fix: minor size icons	2024-05-10 08:40:56 +02:00
Javier Segarra	2697078a55	feat: Replace CarList by Table	2024-05-10 08:40:47 +02:00
Jorge Penadés	626a369f84	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker	2024-05-10 08:35:42 +02:00
Javier Segarra	7f185c091b	feat: add descriptor	2024-05-10 08:13:02 +02:00
Pablo Natek	4e8f524f49	feat: add new list form with popup	2024-05-09 22:47:13 +02:00
William Buezas	7216b90a3e	Fix filter panel bug	2024-05-09 15:13:45 -03:00
Javier Segarra	f374fe859d	Merge branch 'feature/Monitors' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/Monitors	2024-05-09 17:46:28 +02:00
Javier Segarra	104ea5b8e5	feat: refreshInterval	2024-05-09 17:46:24 +02:00
William Buezas	d227d4b09b	Zone create	2024-05-09 11:32:04 -03:00
William Buezas	b4f983b946	Add searchbar	2024-05-09 09:15:52 -03:00
William Buezas	7cc5c0bdbd	Fix client table initial request	2024-05-09 08:40:09 -03:00
Javier Segarra	a6ec40beb4	fix: style second row	2024-05-09 13:32:03 +02:00
Javier Segarra	2df0c1eba9	fix: ticketsMonitor title	2024-05-09 13:26:53 +02:00
William Buezas	9b9e482fa7	Zone list and Zone summary	2024-05-09 08:21:30 -03:00
Carlos Satorres	fcb6f8dd49	Merge pull request '#6877 - itemRequestMod' (!362) from 6877-itemRequestMod into dev ... Reviewed-on: #362 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-09 10:55:03 +00:00
Carlos Satorres	349a101680	Merge branch 'dev' into 6877-itemRequestMod	2024-05-09 10:53:27 +00:00
Javier Segarra	e7833206e7	fix: Risk field	2024-05-09 12:10:26 +02:00
Javier Segarra	437a75da4e	fix: CustomerExtendedList paginate	2024-05-09 10:25:27 +02:00
Javier Segarra	dac00236bc	fix: CustomerDefaulter paginate	2024-05-09 10:20:28 +02:00
Javier Segarra	b5951a5cef	fix: CustomerNotifications paginate	2024-05-09 10:15:24 +02:00
Jorge Penadés	ac935b9020	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker	2024-05-09 08:48:28 +02:00
Jorge Penadés	0b363d9e3a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel	2024-05-09 08:46:31 +02:00
Alex Moreno	8e529a08dc	Merge pull request 'Fix minor styles' (!363) from fix_minor_styles into dev ... Reviewed-on: #363 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-09 06:20:38 +00:00
William Buezas	a3ce81d66d	Zone list	2024-05-08 15:23:52 -03:00
William Buezas	e74afae5b3	remove padding bottom from some inputs	2024-05-08 12:04:23 -03:00
William Buezas	399c2723a9	change monitor list layout	2024-05-08 10:58:27 -03:00
William Buezas	712d7e13ff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/Monitors	2024-05-08 10:45:05 -03:00
William Buezas	5bdbbf426a	Tables development	2024-05-08 10:43:18 -03:00
Javier Segarra	0ebb9c6c52	fix: unnexpected bottom spca	2024-05-08 13:43:45 +02:00
Javier Segarra	fdd94b09f3	style: fix searchba input width	2024-05-08 11:43:18 +00:00
Carlos Satorres	26506c1f9f	refs #6877 remove update	2024-05-08 13:27:42 +02:00
Jorge Penadés	f803a210a6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel	2024-05-08 13:26:05 +02:00
Jorge Penadés	e52cb99a80	feat: refs #6891 itemTypeSearchbar	2024-05-08 13:23:41 +02:00
Jorge Penadés	c02dcf622a	fix: refs #6891 correct redirection	2024-05-08 13:22:21 +02:00
Jorge Penadés	54de101442	feat: refs #6891 improve useRedirect	2024-05-08 13:00:54 +02:00
Jorge Penadés	f7b6f3b9e1	fix: refs #6891 parking basicData	2024-05-08 12:59:56 +02:00
Jorge Penadés	80336868dc	feat: refs #6891 improve useRedirect	2024-05-08 12:52:42 +02:00
Jorge Penadés	7b370e6b93	feat: refs #6891 improve useRedirect	2024-05-08 12:39:48 +02:00
Jorge Penadés	07c67b0df2	feat: refs #6891 keep arrayData opts	2024-05-08 12:30:44 +02:00
Carlos Satorres	c18d035be5	Merge pull request 'refs #6842 isFreelance' (!348) from 6842-errorCalendar into dev ... Reviewed-on: #348 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-08 10:21:28 +00:00
Jorge Penadés	b5a599c8e7	feat: refs #6891 set text searchbar item	2024-05-08 12:09:16 +02:00
Jorge Penadés	4d1cef7f68	feat: refs #6891 improve useRedirect	2024-05-08 12:06:31 +02:00
Javier Segarra	2fc3868a25	Merge branch 'test' into fix_Customer_1	2024-05-08 09:28:13 +00:00
Jorge Penadés	1d16abd572	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel	2024-05-08 11:03:40 +02:00
Jorge Penadés	a1f785ccbe	feat: refs #5919 WIP workerlocker	2024-05-08 11:02:40 +02:00
Jorge Penadés	dec9b924eb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker	2024-05-08 10:36:03 +02:00
Carlos Satorres	3d3f72757a	Merge branch 'dev' into 6842-errorCalendar	2024-05-08 08:10:37 +00:00
Alex Moreno	e4af4d3e4a	Merge pull request 'Item tags' (!350) from hyervoni/salix-front-mindshore:feature/ItemTags into dev ... Reviewed-on: #350 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-08 08:03:55 +00:00
Alex Moreno	d69b362407	Merge branch 'dev' into feature/ItemTags	2024-05-08 08:02:55 +00:00
Carlos Satorres	1b65ec7c38	refs #6877 fix filterdate	2024-05-08 09:39:26 +02:00
Jorge Penadés	ad4c3a078a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel	2024-05-08 09:08:53 +02:00
Javier Segarra	6efd03dc0c	Merge pull request '#7271 - Zones Boilerplate' (!327) from 7271_boilerplate_zones into dev ... Reviewed-on: #327 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-08 06:17:41 +00:00
Javier Segarra	ccc87a0958	Merge branch 'dev' into 7271_boilerplate_zones	2024-05-08 07:52:59 +02:00
Javier Segarra	9a6dd65774	feat: remove deprecatedHour fn	2024-05-08 07:52:18 +02:00
Jorge Penadés	05f7c4f2d3	fix: refs #6891 fix prop	2024-05-07 17:34:55 +02:00
Jorge Penadés	0a281b2b73	fix: refs #6891 rollback customUrl	2024-05-07 17:33:12 +02:00
Jorge Penadés	ff0e290963	feat: refs #6891 ticket	2024-05-07 17:11:51 +02:00
Jorge Penadés	29e567d405	fix: refs #6891 use new props	2024-05-07 16:42:09 +02:00
Jorge Penadés	613492d04a	Merge pull request 'fix conflicts' (!361) from testToDev into dev ... Reviewed-on: #361 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-07 14:37:08 +00:00
Jorge Penadés	7504e5d12c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel	2024-05-07 16:36:34 +02:00
Jorge Penadés	392d1892ba	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into testToDev	2024-05-07 16:19:13 +02:00
Jorge Penadés	014ec60e47	feat: refs #6891 worker & supplier	2024-05-07 15:10:36 +02:00
Alex Moreno	1d9616c25e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-05-07 14:18:56 +02:00
Jorge Penadés	6b1befa037	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel	2024-05-07 14:15:03 +02:00
Jorge Penadés	64f41cf8dc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel	2024-05-07 13:47:39 +02:00
Carlos Satorres	a691644b9a	refs #6877 changes filter date	2024-05-07 13:38:25 +02:00
Jorge Penadés	0703de350c	fix: refs #6891 rollback order & route searchbar	2024-05-07 13:04:27 +02:00
Javier Segarra	0843d70951	Merge pull request 'Item Shelving' (!343) from hyervoni/salix-front-mindshore:feature/ItemShelving into dev ... Reviewed-on: #343 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-07 10:57:43 +00:00
Alex Moreno	9b31fa5042	Merge branch 'dev' into feature/ItemShelving	2024-05-07 10:54:12 +00:00
Javier Segarra	175746a4a4	Merge pull request 'Item Basic data' (!346) from hyervoni/salix-front-mindshore:feature/ItemBasicData into dev ... Reviewed-on: #346 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-07 10:47:01 +00:00
Javier Segarra	753b5bf939	Merge branch 'dev' into feature/ItemBasicData	2024-05-07 10:44:48 +00:00
Javier Segarra	33dac72f1c	Merge branch 'dev' into feature/ItemTags	2024-05-07 09:39:35 +00:00
Javier Segarra	c0dd140a3a	fix: validTag	2024-05-07 11:38:12 +02:00
Javier Segarra	0dc95ca3a0	fix: VnSelectFilter	2024-05-07 11:35:41 +02:00
Jorge Penadés	097e25a0b8	feat: refs #6891 shelving	2024-05-07 11:22:35 +02:00
Carlos Satorres	ac0993aa11	refs #6842 pr changes	2024-05-07 10:20:26 +02:00
Jorge Penadés	777ee0895e	feat: refs #6891 route & drop searchbar	2024-05-07 10:15:47 +02:00
Jorge Penadés	e9f5c0cc8d	feat: refs #6891 add custom url	2024-05-07 10:12:35 +02:00
Jorge Penadés	111333a6cf	fix: refs #6891 reactivity & show filter panel	2024-05-07 09:46:52 +02:00
Jorge Penadés	48bba65baf	fix: refs #6891 use vnCard searchbar	2024-05-07 09:30:59 +02:00
Jorge Penadés	c894945363	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel	2024-05-07 09:10:51 +02:00
Alex Moreno	a139c11a22	Merge branch 'test' into fix_Customer_1	2024-05-07 07:05:25 +00:00
Carlos Satorres	b9c6b01437	refs #6877 update model	2024-05-07 08:59:55 +02:00
Alex Moreno	4caf27b4f8	deploy: init version 2422	2024-05-07 08:37:52 +02:00
Jorge Penadés	036ef72593	fix: refs #6891 showFilterPanel	2024-05-06 17:27:30 +02:00
Jorge Penadés	fe11164ae9	fix: refs #6891reactivity on agency module	2024-05-06 16:45:10 +02:00
Jorge Penadés	7b6841afc6	feat: refs #6891 hide if no content	2024-05-06 16:44:48 +02:00
Jorge Penadés	b1147f00d3	refactor: refs #6891 use Teleport | slot	2024-05-06 16:16:00 +02:00
Javier Segarra	b21abf40d2	fix: Update from-to when cmpaign changes	2024-05-06 15:15:35 +02:00
Carlos Satorres	1a68cc0ced	refs #6877 change attender	2024-05-06 15:00:18 +02:00
Jon Elias	6ce57d3c40	fix: #7274	2024-05-06 14:59:23 +02:00
Jorge Penadés	15b080f7bd	feat: refs #6891 add redirection on VnfilterPanel	2024-05-06 14:27:04 +02:00
Jorge Penadés	b487ff4adc	feat: refs #6891 create rightMenu	2024-05-06 14:25:39 +02:00
Jorge Penadés	d444a8721d	feat: refs #6891 create composable & update searchbar	2024-05-06 14:05:58 +02:00
Javier Segarra	4d490652ea	feat #7271: add template	2024-05-06 10:11:07 +02:00
Javier Segarra	211da4a995	Merge remote-tracking branch 'origin/dev' into 7271_boilerplate_zones	2024-05-06 10:03:29 +02:00
Javier Segarra	605a24156b	Merge branch 'dev' into feature/ItemShelving	2024-05-06 07:54:28 +00:00
Robert Ferrús	755730a030	Merge branch 'dev' into 7039-country-country	2024-05-06 07:23:42 +00:00
Javier Segarra	49b6c57ad4	fix: show Color	2024-05-06 08:53:12 +02:00
Javier Segarra	6a81076874	fix: replace inputMin rule	2024-05-06 08:45:29 +02:00
Javier Segarra	62bf968b0b	change action to st-actions	2024-05-06 08:41:12 +02:00
Javier Segarra	f85665b271	fix: replace QToolbar by Teleport	2024-05-06 08:37:41 +02:00
Javier Segarra	0f5d06614d	feat: VnInput numberValidation	2024-05-06 07:24:52 +02:00
Robert Ferrús	24edecf51a	Merge branch 'dev' into 7039-country-country	2024-05-06 05:08:39 +00:00
William Buezas	dbc9e9dd71	Sales monitor base	2024-05-05 19:13:36 -03:00
William Buezas	f3b1de1ee4	Item tags	2024-05-03 17:19:13 -03:00
Javier Segarra	743faef956	fix: #6842 Not update calendar correctly	2024-05-03 15:05:37 +02:00
Carlos Satorres	710b45f43a	refs #6842 isFreelance	2024-05-03 14:49:50 +02:00
William Buezas	d15a92ce7d	Resolve conflicts	2024-05-03 08:57:39 -03:00
William Buezas	99adc9aa05	WIP	2024-05-03 08:53:50 -03:00
Jon Elias	312985b427	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7271_boilerplate_zones	2024-05-03 12:37:30 +02:00
Jon Elias	f03ad52387	Merge branch '7271_boilerplate_zones' of https://gitea.verdnatura.es/verdnatura/salix-front into 7271_boilerplate_zones	2024-05-03 12:31:22 +02:00
Jon Elias	1a5f2fbea2	feat: refs #7271 advanced structure	2024-05-03 12:30:53 +02:00
Jon Elias	f3026dfe00	Merge branch '6767-deleteDivCol' of https://gitea.verdnatura.es/verdnatura/salix-front into 6767-deleteDivCol	2024-05-03 08:56:40 +02:00
Jon Elias	8f0af24f50	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6767-deleteDivCol	2024-05-03 08:56:38 +02:00
Jon Elias	179ab30805	Merge branch 'fix_Customer_1' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_Customer_1	2024-05-03 08:40:55 +02:00
Jon Elias	3467f30b12	refactor: refs #7274 changed CustomerNotificationsCampaignConsumption template and logic	2024-05-03 08:40:53 +02:00
William Buezas	d2e178a41b	resolve conflicts	2024-05-02 12:02:44 -03:00
William Buezas	d68934a526	Item basic data	2024-05-02 11:51:04 -03:00
Javier Segarra	cb0d721465	feat: zoneSummary	2024-05-02 14:41:51 +02:00
William Buezas	554b9e814b	WIP	2024-05-02 09:08:03 -03:00
Javier Segarra	d692c77fcf	Merge branch 'fix_Customer_1' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_Customer_1	2024-05-02 14:05:29 +02:00
Javier Segarra	ce0c9ebd98	Merge branch 'test' into fix_Customer_1	2024-05-02 11:52:11 +00:00
Jon Elias	c2ba7bfe22	fix: campaign button	2024-05-02 12:57:34 +02:00
Jorge Penadés	54155961fe	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker	2024-05-02 12:04:16 +02:00
Jorge Penadés	455f47d46f	feat: refs #5919 set store.data	2024-05-02 10:23:35 +02:00
William Buezas	ac219bfbb7	Item shelvings	2024-04-30 16:15:48 -03:00
Javier Segarra	d92a0ba77e	fix: Roadmap Summary ID	2024-04-30 07:46:57 +02:00
Javier Segarra	813703ce93	fix: show icons	2024-04-26 12:39:09 +02:00
Javier Segarra	71f60b82e4	fix: minor bugs use VnSubToolbar	2024-04-26 12:30:17 +02:00
Javier Segarra	94a948c933	fix: add socialName	2024-04-26 12:29:55 +02:00
Javier Segarra	be1857bb94	fix: FilterPanel menu icon	2024-04-26 11:28:09 +02:00
Javier Segarra	320f6afd17	fix: CustomerDefaulter	2024-04-26 11:27:55 +02:00
Javier Segarra	7831a69aa9	fix: i18n and icon class	2024-04-26 11:03:40 +02:00
Javier Segarra	f169ca6778	fix: add button showPDF	2024-04-26 11:02:48 +02:00
Javier Segarra	93bbd0c222	fix: icons	2024-04-26 10:48:25 +02:00
Jon Elias	8e4429a28c	Merge branch 'dev' into 6767-deleteDivCol	2024-04-26 07:48:23 +00:00
Jon Elias	e6dc7b9862	refactor: refs #6767 fix all conflicts	2024-04-26 09:47:44 +02:00
Javier Segarra	f14d631051	feat #7271 ZoneDescriptor	2024-04-25 14:32:42 +02:00
Javier Segarra	b1871c33fd	feat #7271 Zone Components boilerplate	2024-04-25 14:30:16 +02:00
Javier Segarra	b4e3157887	feat #7271 i18n	2024-04-25 14:28:06 +02:00
Javier Segarra	42591d0781	feat #7271 router	2024-04-25 14:27:56 +02:00
Robert Ferrús	92e172fcaf	feat: refs #7039 country change column country - name	2024-04-25 12:56:02 +02:00
William Buezas	934db32973	WIP	2024-04-24 10:31:33 -03:00
Jon Elias	3f3b37fd4a	refactor: refs #6767 fixed conflicts	2024-04-19 07:24:58 +02:00
Jon Elias	6839b5aac2	refactor: refs #6767 deleted <div class="col">	2024-04-17 13:26:08 +02:00