3497 Commits

All Branches

Search

Author	SHA1	Message	Date
William Buezas	202473158c	resolve conflicts	2024-05-19 14:21:32 -03: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	7197881cdd	style: reset poc style	2024-05-18 08:53:46 +02:00
Javier Segarra	632acc13ac	style: reset poc style	2024-05-18 08:53:08 +02: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
Jorge Penadés	81998a4137	refactor: refs #6942 summary	2024-05-17 17:26:58 +02:00
Jorge Penadés	7f880b397c	fix: refs #6942 fix vncard	2024-05-17 17:26:00 +02:00
William Buezas	e196cf8fd5	Zone warehouses	2024-05-17 10:57:20 -03:00
Jorge Penadés	1abcb4796f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn	2024-05-17 14:36:22 +02: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
Javier Segarra	41e2462b49	Merge branch 'dev' into 6957_refactorFetechedTags	2024-05-17 11:58:38 +00:00
Javier Segarra	08e6703853	style updates	2024-05-17 13:57:01 +02:00
Javier Segarra	24eeb5519a	style updates	2024-05-17 13:52:45 +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
Javier Segarra	49b562ca44	Merge branch 'dev' into feature/UpcomingDeliveries	2024-05-17 12:30:55 +02:00
Javier Segarra	8e4c74c1cc	fix: style	2024-05-17 12:26:45 +02:00
Pablo Natek	676e020928	fix: refs #6095 add reFfk null on search	2024-05-17 10:55:43 +02: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
Javier Segarra	dba42a6001	feat: #6957: Rename FetchedTags instance tag	2024-05-16 23:02:49 +02:00
Javier Segarra	38d7c96c00	feat: #6957: Rename FetchedTags instance tag	2024-05-16 23:01:55 +02:00
Javier Segarra	77a454b590	feat: refactor template	2024-05-16 20:59:51 +00:00
William Buezas	a35ccb5b51	Zone Locations	2024-05-16 16:38:27 -03: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