4061 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	10a663b400	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-06-25 13:33:23 +02:00
Alex Moreno	d7cc983f29	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-06-25 13:33:19 +02:00
Carlos Satorres	c644abe571	Merge pull request '7406-workerFormation' (!405) from 7406-workerFormation into dev ... Reviewed-on: #405 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-25 11:31:46 +00:00
Carlos Satorres	49b86672f5	Merge branch 'dev' into 7406-workerFormation	2024-06-25 11:18:05 +00:00
Alex Moreno	d55d6ec06e	Merge pull request 'master to test' (!483) from master into test ... Reviewed-on: #483 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-25 11:17:10 +00:00
Jorge Penadés	e26ef0bf66	Merge pull request '#7578 add data-key attribute to CardSummary components' (!482) from 7578-hotfix-itemsWithName into master ... Reviewed-on: #482 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-25 11:08:23 +00:00
Jorge Penadés	ff33923b7a	feat: refs #7578 add data-key attribute to CardSummary components	2024-06-25 12:49:54 +02:00
Carlos Satorres	a705245783	refs #7406 fix pr	2024-06-25 12:18:02 +02:00
Alex Moreno	86524fe9e2	Merge pull request '7631_testToMaster_2426' (!480) from 7631_testToMaster_2426 into master ... Reviewed-on: #480 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-06-25 06:40:04 +00:00
Alex Moreno	d421cefeb1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-06-25 07:32:17 +02:00
Jorge Penadés	0daf61608d	Merge pull request '#6238 show notes & create vnPopup' (!470) from 6238-addNotes into test ... Reviewed-on: #470 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-21 13:49:22 +00:00
Javier Segarra	ec7b0c1416	Merge pull request '7323 # FIX Department descriptor and routerLink' (!435) from 7323_department_descriptor_routerLink into dev ... Reviewed-on: #435 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-21 12:53:10 +00:00
Javier Segarra	01816613f2	Merge branch 'dev' into 7323_department_descriptor_routerLink	2024-06-21 12:50:14 +00:00
Javier Segarra	d083319f34	Merge pull request 'Ticket log' (!465) from hyervoni/salix-front-mindshore:feature/TicketLog into dev ... Reviewed-on: #465 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-21 12:49:46 +00:00
Jorge Penadés	44d762694a	fix: refs 6238 replace style	2024-06-21 13:53:35 +02:00
Jorge Penadés	606c629d77	feat: refs #6238 function name	2024-06-21 13:47:42 +02:00
Jorge Penadés	bebb20c76f	fix: refs 6238 drop locale	2024-06-21 13:07:43 +02:00
Jorge Penadés	891c0d2347	feat: refs 6238 show notes & create vnPopup	2024-06-21 13:05:28 +02:00
Javier Segarra	63b8ca46a3	Merge branch 'dev' into feature/TicketLog	2024-06-21 11:33:29 +02:00
Javier Segarra	febc7f1f46	fix: notify icon style	2024-06-21 11:33:14 +02:00
Javier Segarra	9ce49bf108	fix: TravelLog	2024-06-21 11:31:09 +02:00
Alex Moreno	961c8140af	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-06-21 10:53:57 +02:00
Jorge Penadés	93407d8219	Merge pull request '#6243 show rightPanel' (!468) from 6243-warmfix-showRightPanel into test ... Reviewed-on: #468 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-21 08:52:56 +00:00
Carlos Satorres	9d38c1ff1c	Merge pull request 'refs #6504 fix formModel claimFilter claimCard' (!464) from 6504-fixCardClaim into dev ... Reviewed-on: #464 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-21 08:51:12 +00:00
Carlos Satorres	0f2f688f16	Merge branch 'dev' into 6504-fixCardClaim	2024-06-21 08:49:15 +00:00
Jorge Penadés	6aa920b70e	fix: refs #6243 show rightPanel	2024-06-21 10:47:09 +02:00
Carlos Satorres	79bafdee20	Merge branch '7406-workerFormation' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation	2024-06-21 08:43:00 +02:00
Carlos Satorres	fdedf7bf57	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation	2024-06-21 08:42:57 +02:00
Alex Moreno	d23dbca7bf	fix(EntryBuys): fix VnSubtoolbar	2024-06-21 08:12:03 +02:00
Alex Moreno	bcda488aae	Merge pull request '#6825 - VnTable V1' (!396) from 6825-vnTable into dev ... Reviewed-on: #396 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-06-20 13:08:55 +00:00
William Buezas	47768faea4	Change model	2024-06-20 09:42:32 -03:00
Alex Moreno	1b3828ceba	Merge branch 'dev' into 6825-vnTable	2024-06-20 12:35:35 +00:00
Jon Elias	b60fa62c99	Merge pull request '#6896 end orders migration' (!400) from 6896-EndOrderMigration into dev ... Reviewed-on: #400 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-20 12:31:45 +00:00
Alex Moreno	09545cb2c0	fix: WorkerNotificationsManager test	2024-06-20 14:25:45 +02:00
William Buezas	00ebbbfc78	Ticket log	2024-06-20 08:40:05 -03:00
Alex Moreno	e8296d0edd	Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable	2024-06-20 12:33:05 +02:00
Alex Moreno	2352b6aac4	fix: invoiceDueDay test	2024-06-20 12:33:04 +02:00
Alex Moreno	28b241bb77	Merge branch 'dev' into 6825-vnTable	2024-06-20 10:26:05 +00:00
Jon Elias	304c7677bc	Merge branch 'dev' into 6896-EndOrderMigration	2024-06-20 10:12:24 +00:00
Alex Moreno	03be4bc0e6	refactors	2024-06-20 10:55:29 +02:00
Pablo Natek	47bcb73dab	Merge pull request '7129-finishRouteMigration' (!447) from 7129-finishRouteMigration into dev ... Reviewed-on: #447 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-20 08:50:33 +00:00
Pablo Natek	f48c5deba1	Merge branch 'dev' into 7129-finishRouteMigration	2024-06-20 08:49:38 +00:00
Alex Moreno	11a82f3ae5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable	2024-06-20 10:47:41 +02:00
Jon Elias	a61196b04d	Merge branch 'dev' into 6896-EndOrderMigration	2024-06-20 08:39:32 +00:00
Carlos Satorres	6d5973f4b7	refs #6504 fix formModel claimFilter claimCard	2024-06-20 10:26:22 +02:00
Jon Elias	a84c20f2ce	refactor: refs #6896 changes requested in PR	2024-06-20 08:33:29 +02:00
Alex Moreno	702b031650	feat(VnFilter): merge objects	2024-06-19 15:18:38 +02:00
Alex Moreno	02f8288b22	feat(customerList): add searchbar	2024-06-19 15:02:26 +02:00
Javier Segarra	3fdad15f21	fix: comments	2024-06-19 13:43:32 +02:00
Guillermo Bonet	577452df8a	Merge pull request 'feat: refs #7545 Deleted hasIncoterms client column' (!439) from 7545-hasIncoterms into dev ... Reviewed-on: #439 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-19 09:32:12 +00:00