3353 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	7685c38fb7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn	2024-05-22 16:45:58 +02:00
Carlos Satorres	1a4d8bb0c0	Merge pull request '6820-changeKmroute' (!395) from 6820-changeKmroute into dev ... Reviewed-on: #395 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-22 13:56:18 +00:00
Carlos Satorres	6b474bfd06	Merge branch 'dev' into 6820-changeKmroute	2024-05-22 12:53:40 +00:00
Jorge Penadés	3db3d04bc9	fix: refs #6942 formModel & CardDescriptor	2024-05-22 13:57:12 +02:00
Carlos Satorres	e4ebf4c4db	refs #6820 fix traduction	2024-05-22 13:44:53 +02:00
Carlos Satorres	2746ea7f5e	Merge pull request 'remove right' (!389) from fix-CalendarTimeControlRightPanel into dev ... Reviewed-on: #389 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-22 10:56:10 +00:00
Carlos Satorres	499e104daa	Merge branch 'dev' into fix-CalendarTimeControlRightPanel	2024-05-22 10:49:43 +00:00
Carlos Satorres	506b5dd9c2	refs #6820 fix error front	2024-05-22 12:24:08 +02:00
Jorge Penadés	5bddc6e04d	fix: refs #6942 wip: formModel	2024-05-22 11:22:46 +02:00
Jorge Penadés	467531d029	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn	2024-05-22 09:17:18 +02:00
Alex Moreno	56804900d9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-05-22 08:05:23 +02:00
Alex Moreno	d466e9f70a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-05-22 08:05:05 +02:00
Alex Moreno	f3c334b826	hotFix(VnDmsList): downloadModel default undefined	2024-05-22 08:02:59 +02:00
Carlos Satorres	bacc07a4ca	remove right	2024-05-21 12:04:56 +02:00
Alex Moreno	a8fef3fa84	deploy: init version	2024-05-21 11:30:00 +02:00
Alex Moreno	05587ece9e	Merge pull request '7430_devToTest' (!388) from 7430_devToTest into test ... Reviewed-on: #388 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-05-21 09:26:35 +00:00
Jorge Penadés	5f10d25630	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn	2024-05-21 09:04:17 +02:00
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	9f517eb59d	refs #6820 fix BasicData Tickets	2024-05-20 12:40:47 +02:00
Jorge Penadés	c1a6bca508	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn	2024-05-20 09:31:58 +02:00
Jorge Penadés	cda9e71197	refactor: refs #6942 Fix getTotalAmount function to correctly calculate the total amount in InvoiceInDueDay.vue	2024-05-20 09:31:31 +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
Jorge Penadés	2366ef772f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn	2024-05-20 08:55:35 +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
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