2548 Commits

Author	SHA1	Message	Date
Alex Moreno	b5bf4bab54	feat(CustomerFIlter): use correct table	2024-06-19 09:55:30 +02:00
Javier Segarra	d5bd8c4432	fix: #7566 remove v-if	2024-06-19 09:54:24 +02:00
Jon Elias	a80caa7c93	Merge branch 'dev' into 7566-FixCustomerSummary	2024-06-19 07:07:05 +00:00
William Buezas	de0ef06d92	remove console.log	2024-06-18 19:28:05 -03:00
William Buezas	d488a2d523	small change	2024-06-18 11:50:15 -03:00
William Buezas	bb208040bb	Last changes	2024-06-18 11:47:35 -03:00
Jon Elias	db67fd1e43	Merge branch 'dev' into 6896-EndOrderMigration	2024-06-18 11:32:13 +00:00
Jon Elias	fa425a4329	Merge branch 'dev' into 7566-FixCustomerSummary	2024-06-18 11:31:48 +00:00
Jon Elias	3023280108	refactor: refs #6896 refactor VnImg	2024-06-18 13:31:25 +02:00
Jon Elias	e0b4d86cab	Merge branch '7566-FixCustomerSummary' of https://gitea.verdnatura.es/verdnatura/salix-front into 7566-FixCustomerSummary	2024-06-18 13:29:18 +02:00
Jon Elias	546b43ffcf	refactor: refs #7566 fix customer summary	2024-06-18 13:29:17 +02:00
Alex Moreno	8085e1e518	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable	2024-06-18 13:25:44 +02:00
Alex Moreno	ae75908e46	refactor: simplify code	2024-06-18 10:53:21 +02:00
Javier Segarra	cd8e99e1df	perf: remove CLI warnings	2024-06-18 10:52:55 +02:00
Javier Segarra	dc0a938c4c	Merge branch 'dev' into feature/AccountList	2024-06-18 10:50:50 +02:00
Javier Segarra	f004ab3645	Merge branch 'feature/AccountList' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/AccountList	2024-06-18 10:48:44 +02:00
Jon Elias	a5f4f85c80	refactor: refs #6896 requested changes	2024-06-18 10:46:13 +02:00
Jorge Penadés	4ff0901950	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7600-fix-vnLocation	2024-06-18 10:44:58 +02:00
Jorge Penadés	cbbcddfd50	fix: refs #7600 test vnLocation	2024-06-18 10:37:49 +02:00
Jorge Penadés	34069f4841	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6238-addPercentageColumn	2024-06-18 09:54:33 +02:00
Jorge Penadés	b1b0f4efed	Merge branch 'dev' into 6243-fixColumnWidth	2024-06-18 07:49:46 +00:00
Javier Segarra	dfbc7df54d	perf: Remove div.col	2024-06-18 09:20:45 +02:00
Carlos Satorres	84378187be	Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7409-workerBalance	2024-06-18 08:56:23 +02:00
Carlos Satorres	1cf630378b	Merge branch 'dev' into 6897-EntryMigration	2024-06-18 06:15:12 +00:00
Carlos Satorres	0940872625	Merge branch '6897-EntryMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-EntryMigration	2024-06-18 07:18:47 +02:00
Carlos Satorres	bc30531d42	refs #6897 fix trad	2024-06-18 07:18:44 +02:00
William Buezas	c798874a9e	Ticket future	2024-06-17 17:27:06 -03:00
William Buezas	6b7c76dde3	mini change	2024-06-17 12:19:44 -03:00
William Buezas	06e8e819f4	WIP	2024-06-17 12:11:23 -03:00
Carlos Satorres	0ccfd9ae75	refs #7409 columns trad	2024-06-17 15:50:33 +02:00
Carlos Satorres	25ab5a1b9f	refs #7409 front section	2024-06-17 13:55:16 +02:00
William Buezas	c807b5feb2	Weekly tickets	2024-06-17 08:21:43 -03:00
Alex Moreno	e8054467a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable	2024-06-17 13:00:30 +02:00
Alex Moreno	3394eb10b0	fix(VnFilterPanel): remove key	2024-06-17 12:58:58 +02:00
Jorge Penadés	f64f42f473	fix: refs #6243 load warehouses & iron out column width	2024-06-17 10:46:51 +02:00
Jorge Penadés	94f4e154b0	refactor: refs #6238 use variable & link class	2024-06-17 10:39:36 +02:00
Alex Moreno	a479637ee6	feat: customerList is customerExtendedList	2024-06-17 10:14:11 +02:00
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
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
William Buezas	c31e865faa	Fix card searchbar routing	2024-06-15 12:04:31 -03:00
William Buezas	acc899b851	Transfer	2024-06-15 11:28:49 -03:00
William Buezas	0666aeb166	Btn dropdown more actions	2024-06-14 15:04:02 -03: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
Alex Moreno	79a34db700	Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation	2024-06-14 13:25:33 +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
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
William Buezas	8c3262bcdf	Add change state dropdown action	2024-06-13 15:36:30 -03:00
William Buezas	531f4bb8cd	Avoid firing request if quantity does not change	2024-06-13 14:14:46 -03:00
William Buezas	975e8f06c0	WIP	2024-06-13 13:56:19 -03: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
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
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
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	1052e9eb21	fix: refs #6238 use :deep	2024-06-12 13:14:02 +02:00
Jorge Penadés	51d497a1de	feat: refs #6238 add percentage & summary btn	2024-06-12 12:17:52 +02:00
Guillermo Bonet	38610870ea	feat: refs #7545 Deleted hasIncoterms client column	2024-06-12 11:49:36 +02:00
Javier Segarra	d55c75089c	Merge branch 'dev' into 7323_department_descriptor_routerLink	2024-06-12 09:28:05 +00:00
Alex Moreno	d7237463ea	feat(WorkerFormation): is-editable and use-model	2024-06-12 11:00:10 +02:00
Pablo Natek	b7a097fd13	Merge branch 'dev' into 7499-refactorEntrys	2024-06-12 06:16:48 +00:00
Alex Moreno	c3409a9d5c	Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation	2024-06-12 07:50:41 +02:00
Alex Moreno	048685277f	Merge branch 'dev' into 6825-vnTable	2024-06-12 05:31:31 +00:00
Jon Elias	df364dca4a	Merge branch 'dev' into 7154-ItemDescriptor	2024-06-12 05:04:16 +00:00
William Buezas	89f6873b03	WIP	2024-06-11 22:40:07 -03:00
Javier Segarra	d0759cb654	Merge branch 'dev' into feature/AccountFormsView	2024-06-11 21:12:13 +02:00
Pablo Natek	a65f5dfe44	fix: refs #7499 use current colors	2024-06-11 16:38:12 +02:00
Carlos Satorres	a7b805a4ab	stash departmentFilter	2024-06-11 16:24:07 +02:00
Alex Moreno	3dfe3226ac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable	2024-06-11 15:00:52 +02:00
Alex Moreno	14e27f193e	feat: adapt tu VnTable → CrudModel	2024-06-11 15:00:03 +02:00
Jon Elias	4045a3a631	Merge branch 'dev' into 7154-ItemDescriptor	2024-06-11 12:56:52 +00:00
Javi Gallego	cb0559fee8	Merge pull request '7548-ticketSummaryCollection' (!432) from 7548-ticketSummaryCollection into dev ... Reviewed-on: #432 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-11 12:53:42 +00:00
Pablo Natek	6789f3d1cb	fix: refs #7499 fix style	2024-06-11 14:32:01 +02:00
Jon Elias	2d0b33c626	Merge branch '7154-ItemDescriptor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7154-ItemDescriptor	2024-06-11 14:29:44 +02:00
Jon Elias	de18b670ea	feat: refs #7154 changed label	2024-06-11 14:29:42 +02:00
Pablo Natek	be919f97b1	Merge branch '7499-refactorEntrys' of https://gitea.verdnatura.es/verdnatura/salix-front into 7499-refactorEntrys	2024-06-11 14:28:20 +02:00
Pablo Natek	80adeede81	fix: refs #7499 fix item reference	2024-06-11 14:28:19 +02:00
Jon Elias	989ea3d82c	Merge branch 'dev' into 7154-ItemDescriptor	2024-06-11 11:49:25 +00:00
Jon Elias	e5a590a9f9	feat: refs #7154 new item descriptor field	2024-06-11 13:48:15 +02:00
Alex Moreno	59e72dcd50	Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation	2024-06-11 12:53:50 +02:00
Javier Segarra	25f4d1f654	fix: point 3	2024-06-11 11:58:27 +02:00
Javier Segarra	fe2412f6d9	fix: point 1	2024-06-11 11:58:20 +02:00
Alex Moreno	f753eddc43	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable	2024-06-11 11:40:58 +02:00
Carlos Satorres	ba0364e799	refs #6897 fix BasicData	2024-06-11 10:30:42 +02:00
Javier Segarra	fac9b6a439	Merge branch 'dev' into feature/AccountConnections	2024-06-11 07:39:41 +00:00
Javier Segarra	adbc9dee2c	Merge branch 'dev' into feature/WorkerDescriptorMenu	2024-06-11 07:37:06 +00:00
Jorge Penadés	11bcfb0d2d	Merge branch 'dev' into 6243-generalizeCmrSection	2024-06-11 07:34:34 +00:00
Carlos Satorres	31afa22de8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-EntryMigration	2024-06-11 09:20:23 +02:00
Jorge Penadés	c5889b2170	Merge branch 'dev' into 6273-fixRedirect	2024-06-11 07:16:59 +00:00
Carlos Satorres	8e9656f96a	refs #7366 remove warning	2024-06-11 09:10:25 +02:00
Carlos Satorres	313395ef7c	refs #7366 fix travelMigration	2024-06-11 09:06:09 +02:00
Jorge Penadés	f9b688fc37	Merge branch 'dev' into 6243-generalizeCmrSection	2024-06-11 07:02:37 +00:00
Carlos Satorres	b07f7b0003	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration	2024-06-11 08:35:35 +02:00
Alex Moreno	0289c167ee	refactor: unnecessary computed	2024-06-11 08:30:18 +02:00
Alex Moreno	5e7ef68439	feat: simplify html	2024-06-11 08:22:26 +02:00
Javi Gallego	b83285000b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-06-11 08:03:41 +02:00
Javi Gallego	d847b33def	minor change	2024-06-11 08:03:35 +02:00
Javier Segarra	fbecbd0c08	Merge remote-tracking branch 'origin/dev' into feature/WorkerDescriptorMenu	2024-06-10 17:10:05 +02:00
Jorge Penadés	992249c638	fix: refs #6273 redirect	2024-06-10 17:06:28 +02:00
William Buezas	c1df20a09b	Worker descriptor menu	2024-06-10 11:21:23 -03:00
Jorge Penadés	348310bc34	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection	2024-06-10 15:37:08 +02:00
Jorge Penadés	a5b71ecebc	feat: refs #6273 delete prop	2024-06-10 15:32:38 +02:00
Jorge Penadés	a64cd6fa73	refactor: refs #6273 update locale	2024-06-10 15:21:28 +02:00
Javi Gallego	3f94eabc3d	feat: refs #7548 añado link grafana	2024-06-10 14:47:43 +02:00
Jorge Penadés	9eed6e55be	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt	2024-06-10 14:24:25 +02:00
Jorge Penadés	5869ad220c	feat: refs #6273 wip: add locale	2024-06-10 14:17:22 +02:00
Jorge Penadés	5e96ed3bd3	fix: refs #6273 fix arrayData changed	2024-06-10 14:03:57 +02:00
Jorge Penadés	d81ce9fe95	feat: refs #6273 add test & improve form	2024-06-10 13:54:02 +02:00
Jon Elias	15bb9f596c	Merge branch 'dev' into 6464-fixNegativeBases	2024-06-10 10:00:42 +00:00
Jon Elias	4b2d977542	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6464-fixNegativeBases	2024-06-10 11:59:34 +02:00
Javi Gallego	0e0e351805	Merge branch 'dev' into 7548-ticketSummaryCollection	2024-06-10 10:53:33 +02:00
Javi Gallego	911ff376fd	Merge pull request '#4560 - gastos-reparto' (!421) from 4560-gastos-reparto into dev ... Reviewed-on: #421 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-10 08:16:57 +00:00
Alex Moreno	aa2601ac45	feat(WorkerFormation): add columnFilter	2024-06-10 09:15:17 +02:00
Jorge Penadés	049783b16c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt	2024-06-10 08:58:10 +02:00
Jon Elias	f3a28edb5e	Merge branch 'dev' into 7003-fixedPriceOrder	2024-06-10 05:12:28 +00:00
William Buezas	91e0eb636f	resolve conflicts	2024-06-07 10:51:00 -03:00
William Buezas	bf3c146317	resolve conflicts	2024-06-07 10:24:11 -03:00
William Buezas	fa4a18fbbb	make account samba work again	2024-06-07 09:46:04 -03:00
William Buezas	1e67a0feca	Make AccountLdap work again	2024-06-07 09:35:36 -03:00
Jorge Penadés	695dd36c1f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt	2024-06-07 14:23:26 +02:00
Jorge Penadés	8d89fc2d90	feat: refs #6273 set payMethod to 0	2024-06-07 14:08:18 +02:00
William Buezas	4c84fd9326	resolve conflicts	2024-06-07 09:03:41 -03:00
Alex Moreno	dce95824be	fix(AccountAlias): fix and optimization	2024-06-07 12:51:38 +02:00
Jon Elias	deb6b448fb	Merge branch 'dev' into 7003-fixedPriceOrder	2024-06-07 10:48:09 +00:00
Jon Elias	d6bd3de971	refactor: refs #7003 fixed order param	2024-06-07 12:47:18 +02:00
Jon Elias	290325b677	refactor: refs #7003 changed order filter	2024-06-07 12:45:22 +02:00
Jorge Penadés	213ba4ba52	chore: refs #6273 Add default pay method for internal	2024-06-07 12:24:48 +02:00
Jorge Penadés	8b93dbc57d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt	2024-06-07 12:15:04 +02:00
Jorge Penadés	d35f9c9468	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection	2024-06-07 12:03:52 +02:00
Javi Gallego	9ceac32d89	feat: refs #7548 grafana	2024-06-07 11:59:26 +02:00