4026 Commits

All Branches

Search

Author	SHA1	Message	Date
Jon Elias	fe47215bf7	Merge branch '6896-EndOrderMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6896-EndOrderMigration	2024-06-17 09:58:21 +02:00
Jon Elias	7c64df6600	refactor: refs #6896 fixed styles	2024-06-17 09:58:20 +02:00
Jon Elias	9c1e79ebee	Merge branch 'dev' into 6896-EndOrderMigration	2024-06-17 07:57:16 +00:00
Jon Elias	42008ef74b	feat: refs #6896 created VnImg and added to order module	2024-06-17 09:56:16 +02:00
Alex Moreno	bc31985a4d	remove console.log	2024-06-17 09:54:19 +02:00
Alex Moreno	1c6fab0158	fix(VnTable): duplicate fetch	2024-06-17 09:53:36 +02:00
Pablo Natek	ef6a7001e8	Merge branch 'dev' into 7129-finishRouteMigration	2024-06-17 07:21:40 +00:00
Carlos Satorres	f4b7d34a7f	refs #7366 fix redirect	2024-06-17 08:39:39 +02:00
Alex Moreno	6120c98580	fix(VnTable): warns	2024-06-17 08:19:07 +02:00
Alex Moreno	0ad6b260da	fix(VnTable): create scss	2024-06-17 07:32:43 +02:00
Alex Moreno	d9d54a351f	fix(VnTable): showLabel	2024-06-14 14:54:52 +02:00
Jorge Penadés	bd6e45d260	refactor: refs #6238 get percentage from back	2024-06-14 14:52:39 +02:00
Pablo Natek	05d7a61468	fix: refs #7129 remove fix from claim lines	2024-06-14 14:40:40 +02:00
Pablo Natek	ac56d6d9d7	feat: refs #7129 fix some code and add order	2024-06-14 13:12:12 +02:00
Pablo Natek	20e0c84035	fix: refs #7129 fix module routes	2024-06-14 13:10:47 +02:00
Carlos Satorres	8002f0a94b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration	2024-06-14 12:59:16 +02:00
Alex Moreno	f86bc9791b	fix: fix warnings	2024-06-14 11:49:29 +02:00
Alex Moreno	b282ce540e	remove unnecessay	2024-06-14 11:39:05 +02:00
Alex Moreno	cb87d2b419	fix(VnFilter): filter with params	2024-06-14 11:35:33 +02:00
Alex Moreno	bea756d7cb	feat(vnTable): reload data when change url	2024-06-14 10:53:02 +02:00
Carlos Satorres	7fccd0ae81	Merge branch '7366-travelMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration	2024-06-14 10:47:03 +02:00
Alex Moreno	42042ea3cd	fix: SkeletonTable	2024-06-14 09:19:51 +02:00
Jon Elias	64648c77f6	Merge branch 'dev' into 7566-FixCustomerSummary	2024-06-14 07:11:09 +00:00
Jorge Penadés	fc54b44c7b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6238-addPercentageColumn	2024-06-14 09:05:49 +02:00
Javier Segarra	914a9afb92	Merge pull request 'Fix worker department: Create modal did not open' (!441) from hyervoni/salix-front-mindshore:bugfix/WorkerDepartment into dev ... Reviewed-on: #441 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-06-13 12:57:40 +00:00
Javier Segarra	7d73cd0e33	Merge branch 'dev' into bugfix/WorkerDepartment	2024-06-13 14:56:34 +02:00
Javier Segarra	648546888d	fix: DeleteDepartment VnConfirm	2024-06-13 14:56:19 +02:00
Pablo Natek	d6f085dc3d	Merge branch 'dev' into 7129-finishRouteMigration	2024-06-13 13:48:44 +02:00
Pablo Natek	f2dddb5e30	Merge branch 'dev' into 7129-finishRouteMigration	2024-06-13 10:45:37 +02:00
Carlos Satorres	548fc374c8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration	2024-06-13 09:22:45 +02:00
Carlos Satorres	8c5ea42be2	Merge branch 'dev' into 6897-EntryMigration	2024-06-13 06:51:02 +00:00
Carlos Satorres	3958d5ab08	Merge branch 'dev' into 7366-travelMigration	2024-06-13 06:50:28 +00:00
Jon Elias	2b66148ff5	Merge branch 'dev' into 7566-FixCustomerSummary	2024-06-13 05:45:23 +00:00
Jon Elias	fa55e33b54	fix: refs #7566 fixed summary cards and table	2024-06-13 07:43:49 +02:00
Pablo Natek	78042ab109	Merge pull request 'fix: refs #7499 id article' (!428) from 7499-refactorEntrys into dev ... Reviewed-on: #428 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-13 05:41:26 +00:00
Pablo Natek	e10755d8fe	Merge branch 'dev' into 7499-refactorEntrys	2024-06-13 05:39:13 +00:00
Javier Segarra	ffd4109dc7	Merge branch 'dev' into bugfix/WorkerDepartment	2024-06-12 20:23:30 +00:00
Jorge Penadés	7393b82008	refactor: refs #6238 update getRate function and color logic	2024-06-12 16:46:14 +02:00
Jorge Penadés	19aa1bf01d	fix; refs #6238 fix test	2024-06-12 14:48:31 +02:00
Carlos Satorres	6e4843563c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-EntryMigration	2024-06-12 14:42:06 +02:00
Carlos Satorres	34e92d130a	refs #7366 fix basic-data	2024-06-12 14:31:18 +02:00
Carlos Satorres	e464608a9f	refs #7391 fix url, fix filters	2024-06-12 14:01:10 +02:00
William Buezas	b0e4dc99b0	Fix worker department create modal did not open	2024-06-12 08:47:32 -03:00
Jorge Penadés	2641489d83	fix: refs #6238 use .value prop	2024-06-12 13:45:17 +02:00
Carlos Satorres	f414b8aa0e	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7391-defaulterFilter	2024-06-12 13:23:21 +02:00
Jorge Penadés	1052e9eb21	fix: refs #6238 use :deep	2024-06-12 13:14:02 +02:00
Jorge Penadés	a4c21c7673	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6238-addPercentageColumn	2024-06-12 12:42:23 +02:00
Jorge Penadés	51d497a1de	feat: refs #6238 add percentage & summary btn	2024-06-12 12:17:52 +02:00
Guillermo Bonet	9388cb3599	Merge branch 'test' into dev	2024-06-12 12:02:12 +02:00
Guillermo Bonet	135e05b139	hotfix: refs #6636 EN i18n	2024-06-12 12:00:43 +02:00