3348 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	4bf4d754a2	Merge pull request 'refs #6111 fix qtable, actions, scroll' (!264) from 6111-modsRouteList into dev ... Reviewed-on: #264 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-23 12:48:28 +00:00
Carlos Satorres	6388f08ffb	Merge branch 'dev' into 6111-modsRouteList	2024-05-23 12:47:38 +00:00
Carlos Satorres	0dfd00dbfc	Merge pull request '#6332 - calendarMods' (!391) from 6332-calendarMods into dev ... Reviewed-on: #391 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-23 12:39:51 +00:00
Carlos Satorres	bfdd319366	Merge branch 'dev' into 6332-calendarMods	2024-05-23 12:36:36 +00:00
Carlos Satorres	2432a37211	refs #6111 fix sticky	2024-05-23 10:26:54 +02:00
Carlos Satorres	6ea942bf31	refs #6111 fix merge, fix column	2024-05-23 09:24:50 +02:00
Carlos Satorres	66c841114b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6111-modsRouteList	2024-05-23 09:23:11 +02:00
Jon Elias	406c095ed2	Merge pull request '#6652 improved defaulter section' (!394) from 6652-improveCustomerDefaulter into dev ... Reviewed-on: #394 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-23 06:34:59 +00:00
Jon Elias	566ef90cbe	Merge branch 'dev' into 6652-improveCustomerDefaulter	2024-05-23 06:34:10 +00: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
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
Carlos Satorres	98449b0c1e	refs #6111 scroll horizontal	2024-05-22 10:23:10 +02:00
Javier Segarra	d900ed3764	Merge branch '6332-calendarMods' of https://gitea.verdnatura.es/verdnatura/salix-front into 6332-calendarMods	2024-05-22 10:22:05 +02:00
Javier Segarra	f6051472ef	style: color transparent when is fetive	2024-05-22 10:21:06 +02:00
Jon Elias	77e3104047	Merge branch 'dev' into 6652-improveCustomerDefaulter	2024-05-22 08:10:52 +00:00
Jon Elias	2af4df8ded	refactor: refs #6652 improved defaulter section	2024-05-22 10:07:58 +02:00
Carlos Satorres	c1bcc0379d	refs #6332 fix festive	2024-05-22 09:35:56 +02:00
Javier Segarra	eaa0288f25	update	2024-05-22 09:27:48 +02:00
Javier Segarra	a0ca26ad9b	Merge branch '6332-calendarMods' of https://gitea.verdnatura.es/verdnatura/salix-front into 6332-calendarMods	2024-05-22 08:56:10 +02:00
Javier Segarra	0e0f649ff9	fix: 9-12	2024-05-22 08:54:37 +02:00
Carlos Satorres	81f7e06143	refs #6332 fix calendar	2024-05-22 08:35:01 +02:00
Javier Segarra	3d6fac5338	Merge branch '6332-calendarMods' of https://gitea.verdnatura.es/verdnatura/salix-front into 6332-calendarMods	2024-05-22 08:28:51 +02:00
Javier Segarra	2094506baf	fix: WorkerCalendarItem	2024-05-22 08:27:09 +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	27c86288e1	refs #6332 color red button	2024-05-21 16:14:55 +02:00
Carlos Satorres	bacc07a4ca	remove right	2024-05-21 12:04:56 +02:00
Carlos Satorres	99d16d215f	refs #6332 colors	2024-05-21 11:56:30 +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
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
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