693 Commits

Author	SHA1	Message	Date
William Buezas	9f1dd4d74d	WIP	2024-06-20 09:41:53 -03:00
William Buezas	00ebbbfc78	Ticket log	2024-06-20 08:40:05 -03:00
William Buezas	0afd7f4ae1	Ticket tracking	2024-06-19 10:22:20 -03:00
William Buezas	b3a4dd3f79	Ticket purchase request	2024-06-19 08:16:20 -03:00
Alex Moreno	819d1230c4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable	2024-06-19 09:57:31 +02:00
Carlos Satorres	ac28a6728a	refs #7409 change icon	2024-06-19 08:41:36 +02:00
William Buezas	bb208040bb	Last changes	2024-06-18 11:47:35 -03:00
Javier Segarra	dc0a938c4c	Merge branch 'dev' into feature/AccountList	2024-06-18 10:50:50 +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
William Buezas	06e8e819f4	WIP	2024-06-17 12:11:23 -03: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	a479637ee6	feat: customerList is customerExtendedList	2024-06-17 10:14:11 +02:00
Carlos Satorres	657dbc6761	refs #7529 route	2024-06-13 08:24:36 +02:00
Javier Segarra	d55c75089c	Merge branch 'dev' into 7323_department_descriptor_routerLink	2024-06-12 09:28:05 +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
Javier Segarra	d0759cb654	Merge branch 'dev' into feature/AccountFormsView	2024-06-11 21:12:13 +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	4e2358d722	fix: point 3	2024-06-11 11:58:06 +02:00
Javier Segarra	fac9b6a439	Merge branch 'dev' into feature/AccountConnections	2024-06-11 07:39:41 +00:00
Jorge Penadés	01658ee100	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6598-getUserAcl	2024-06-11 09:10:19 +02:00
Carlos Satorres	3bfbed9e54	refs #7529 create WorkerPIT	2024-06-10 13:19:09 +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
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	4c84fd9326	resolve conflicts	2024-06-07 09:03:41 -03:00
Javier Segarra	5551077c92	fix: roles	2024-06-07 11:16:15 +02:00
Javier Segarra	6053d42442	fix: descriptor and i18n	2024-06-07 11:09:46 +02:00
Javier Segarra	567c9ad307	Merge branch 'dev' into feature/MailAliases	2024-06-07 10:46:24 +02:00
Javier Segarra	0ea44eb8db	Merge branch 'dev' into feature/AccountAcls	2024-06-07 10:07:15 +02:00
Javier Segarra	ec5d5e52f4	Merge branch 'dev' into feature/ZoneCalendar	2024-06-07 09:32:51 +02:00
William Buezas	f305cee3ce	Account view forms	2024-06-06 14:07:40 -03:00
William Buezas	9f6d0b4dc9	Remove roles	2024-06-04 15:15:12 -03:00
William Buezas	c71877cdb1	Account connections	2024-06-04 12:23:28 -03:00
William Buezas	c574af9e9b	resolve conflicts	2024-06-04 09:15:55 -03:00
William Buezas	253b54379c	Add submodules routes again	2024-06-04 09:14:48 -03:00
William Buezas	37a8956f86	Merge branch 'feature/AccountList' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/AccountList	2024-06-04 09:11:37 -03:00
William Buezas	c96e6482f9	remove mail alias content	2024-06-04 08:42:32 -03:00
William Buezas	3efca6242d	Account ACLs	2024-06-04 08:41:41 -03:00
Javi Gallego	5f00f3bad4	Merge branch 'dev' into 4560-gastos-reparto	2024-06-04 09:42:44 +02:00
William Buezas	8320a75e61	make searchbar work	2024-06-03 09:03:37 -03:00
Javi Gallego	56a46cd130	4560	2024-06-03 11:52:19 +02:00
Javi Gallego	ca4193e11a	Merge branch 'dev' into 4560-gastos-reparto	2024-06-03 11:31:33 +02:00
William Buezas	8e1f7c24a4	submodules WIP	2024-06-02 13:26:46 -03:00
William Buezas	1c14841233	Several changes	2024-05-31 14:02:50 -03:00
Javier Segarra	28173ddee2	Merge branch 'dev' into feature/AccountRoles	2024-05-31 10:24:37 +02:00
Javier Segarra	4268f15d30	perf: remove unnecessary submodules	2024-05-31 10:23:03 +02:00
Javier Segarra	c2dd7831d1	perf: remove unnecessary components	2024-05-31 10:17:44 +02:00
William Buezas	5c25c77f19	Mail aliases	2024-05-30 13:09:11 -03:00
William Buezas	0cf4f41d19	Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/MailAliases	2024-05-30 08:38:23 -03:00
William Buezas	d82de6da58	Account roles	2024-05-29 16:14:29 -03:00
Alex Moreno	2b6612317c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation	2024-05-29 14:05:42 +02:00
Javier Segarra	532d60130d	Merge branch 'dev' into feature/ZoneCalendar	2024-05-29 11:28:53 +02:00
Alex Moreno	5965e70740	Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation	2024-05-29 07:50:15 +02:00
William Buezas	0659eac652	Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/AccountRoles	2024-05-28 18:38:13 -03:00
William Buezas	4292804922	Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/AccountList	2024-05-28 11:30:10 -03:00
William Buezas	d4600a1181	resolve conflicts and adapt tree	2024-05-28 11:20:43 -03:00
Jorge Penadés	0de575bb6b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn	2024-05-28 13:14:11 +02:00
William Buezas	fcaca42b1f	resolve conflicts	2024-05-27 12:35:59 -03:00
Carlos Satorres	ef52c9b0c0	refs #7406 routes trad	2024-05-27 10:42:47 +02:00
Jorge Penadés	12016f8653	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn	2024-05-24 09:02:24 +02:00
Javier Segarra	286fe0d20c	Merge branch 'dev' into feature/UpcomingDeliveries	2024-05-24 08:13:37 +02:00
Javier Segarra	889263bfb8	feat: roleCreate as dialog	2024-05-23 13:47:14 +02:00
Jorge Penadés	c6477af493	fix: refs #6942 formModel watch changes & invoiceInCreate	2024-05-23 09:29:50 +02:00
Javier Segarra	433564507e	Merge branch 'dev' into 7311_boilerplate_users	2024-05-23 08:53:10 +02:00
Javier Segarra	06664cc2d0	feat: newRole	2024-05-23 08:52:57 +02:00
William Buezas	790e69f659	WIP	2024-05-22 08:08:43 -03:00
William Buezas	84845b7958	WIP	2024-05-21 09:50:36 -03:00
Javier Segarra	dc14116717	perf: RoleCard, BasicData, summary	2024-05-21 08:52:34 +02:00
Javier Segarra	2cae2168ac	perf: AccountCard, BasicData, summary	2024-05-21 08:52:19 +02:00
William Buezas	7466d03f15	resolve conflicts	2024-05-20 08:46:08 -03: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	c40f322a8f	Merge branch 'dev' into feature/ZoneWarehouses	2024-05-20 08:40:27 +02:00
William Buezas	202473158c	resolve conflicts	2024-05-19 14:21:32 -03:00
Javier Segarra	aa007117a7	Merge branch 'dev' into 7311_boilerplate_users	2024-05-18 10:16:28 +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
Javier Segarra	49b562ca44	Merge branch 'dev' into feature/UpcomingDeliveries	2024-05-17 12:30:55 +02:00
Javier Segarra	01ad6d9bea	Merge branch 'dev' into feature/ZoneDelivery	2024-05-17 09:52:21 +02:00
William Buezas	a35ccb5b51	Zone Locations	2024-05-16 16:38:27 -03:00
Jorge Penadés	b63735a709	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6598-getUserAcl	2024-05-16 12:35:52 +02:00
Jorge Penadés	4f38ae3745	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6598-getUserAcl	2024-05-15 16:43:34 +02:00
Jorge Penadés	31573c0f0b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7274-fixCustomer	2024-05-15 11:22:23 +02:00
Alex Moreno	2b27e39d72	fix: zone icon and isVolumetric default false	2024-05-15 09:37:33 +02:00
William Buezas	cbe44c97f6	Upcoming deliveries	2024-05-14 12:03:43 -03:00
Jorge Penadés	a6c761c031	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_Customer_1	2024-05-14 13:42:38 +02:00
Javier Segarra	fc6bd82ea0	Merge branch 'dev' into feature/ZoneCreate	2024-05-14 11:52:29 +02:00
Javier Segarra	20f9b53afb	Merge branch 'dev' into 7271-EndZoneMigration	2024-05-14 10:42:43 +02:00
Javier Segarra	32e715ce6b	Merge branch 'dev' into feature/Monitors	2024-05-13 17:59:39 +02:00
William Buezas	8e7b043a46	Resolve conflicts	2024-05-13 10:28:21 -03:00
William Buezas	9304b511bc	Zone delivery	2024-05-13 10:14:36 -03:00
Javier Segarra	1181cd0daa	Merge branch 'dev' into 7271-EndZoneMigration	2024-05-13 12:15:50 +00:00
Jorge Penadés	0b83d3663f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker	2024-05-13 13:20:15 +02:00
Jon Elias	14910c5899	feat: refs #7271 basicData and Log	2024-05-13 12:46:25 +02:00
Javier Segarra	f9e77596e4	feat: roles sections	2024-05-10 22:01:57 +02:00
Javier Segarra	555b5a663c	feat: role router	2024-05-10 18:06:40 +02:00
Javier Segarra	c045b0d1f4	feat accountRoutes	2024-05-10 17:47:34 +02:00
Javier Segarra	f6d3e37787	feat: accountRoles	2024-05-10 08:02:12 +02:00
William Buezas	d227d4b09b	Zone create	2024-05-09 11:32:04 -03:00
William Buezas	9b9e482fa7	Zone list and Zone summary	2024-05-09 08:21:30 -03:00
Javier Segarra	c68ad5be34	feat #7311: minor changes	2024-05-09 08:40:00 +02:00
Javier Segarra	034342beb2	Merge branch 'dev' into 7311_boilerplate_users	2024-05-09 08:29:18 +02:00
Javier Segarra	99ef7fad76	feat #7311: subsections	2024-05-09 08:28:58 +02:00
Javier Segarra	01bedb94d0	feat #7311: enable leftmenu option	2024-05-09 07:54:16 +02:00
William Buezas	a3ce81d66d	Zone list	2024-05-08 15:23:52 -03:00
William Buezas	712d7e13ff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/Monitors	2024-05-08 10:45:05 -03:00
William Buezas	5bdbbf426a	Tables development	2024-05-08 10:43:18 -03:00
Jorge Penadés	a1f785ccbe	feat: refs #5919 WIP workerlocker	2024-05-08 11:02:40 +02:00
Alex Moreno	d69b362407	Merge branch 'dev' into feature/ItemTags	2024-05-08 08:02:55 +00:00
Alex Moreno	a139c11a22	Merge branch 'test' into fix_Customer_1	2024-05-07 07:05:25 +00:00
William Buezas	dbc9e9dd71	Sales monitor base	2024-05-05 19:13:36 -03:00
William Buezas	99adc9aa05	WIP	2024-05-03 08:53:50 -03:00
Jorge Penadés	0e7e804475	feat: refs #6598 create useAcl composable	2024-05-03 13:18:46 +02:00
William Buezas	d2e178a41b	resolve conflicts	2024-05-02 12:02:44 -03:00
Javier Segarra	9fa03beda1	Merge branch 'dev' into 6887-endClaimMigration	2024-05-02 12:44:02 +00:00
Javier Segarra	03759d2746	Merge branch 'dev' into feature/ItemLastEntries	2024-05-02 14:34:54 +02:00
Javier Segarra	1675919801	fix: minor build bugs	2024-05-02 14:33:24 +02:00
Jon Elias	c1a464d9ae	fix: refs #6887 fix conflicts	2024-05-02 13:02:59 +02:00
Javier Segarra	494f0be44a	Merge branch 'dev' into feature/ItemDiary	2024-05-02 08:13:41 +00:00
Javier Segarra	94fc856bea	Merge branch 'dev' into feature/ItemDiary	2024-05-02 08:05:17 +00:00
Javier Segarra	b530101cda	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-05-02 07:44:20 +00:00
Javier Segarra	4ef7b0e17c	fix: item routes order	2024-05-01 13:31:32 +02:00
Javier Segarra	d2531efdd6	fix: Botanical icon	2024-05-01 13:27:40 +02:00
William Buezas	ac219bfbb7	Item shelvings	2024-04-30 16:15:48 -03:00
Jon Elias	d5762f65b3	refactor: refs #6887 fixed errors	2024-04-30 10:34:48 +02:00
Jon Elias	5b15558dbf	refactor: refs #6887 fixed errors	2024-04-30 10:32:32 +02:00
William Buezas	ac9063e166	Item Last entries	2024-04-29 17:01:26 -03:00
Javier Segarra	761bc7724f	fix: redirect	2024-04-29 11:46:40 +02:00
Javier Segarra	19fcacebc9	perf: VnSearchbar	2024-04-29 10:12:19 +02:00
William Buezas	322ad816b9	item diary	2024-04-28 19:37:44 -03:00
Javier Segarra	2deeada1f5	Merge remote-tracking branch 'origin/dev' into fix_Customer_1	2024-04-26 12:50:46 +02:00
Javier Segarra	93bbd0c222	fix: icons	2024-04-26 10:48:25 +02:00
Javier Segarra	33f3024246	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-26 07:47:24 +00:00
Javier Segarra	98846bbd1a	Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical	2024-04-26 09:28:40 +02:00
Pablo Natek	cb22eaee4d	Merge branch 'dev' into 4988-agencySection	2024-04-26 06:58:53 +00:00
Javier Segarra	22d9d369c8	Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical	2024-04-26 08:52:05 +02:00
Javier Segarra	aa87d54f57	Merge remote-tracking branch 'origin/dev' into feature/ItemLog	2024-04-26 08:34:05 +02:00
Pablo Natek	f29f7a55a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection	2024-04-25 16:28:30 +02:00
William Buezas	823351f76d	Item botanical	2024-04-25 10:55:48 -03:00
Pablo Natek	e184f70be5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection	2024-04-25 09:59:17 +02:00
William Buezas	726699bbc5	Item log	2024-04-24 10:38:00 -03:00
William Buezas	934db32973	WIP	2024-04-24 10:31:33 -03:00
Javier Segarra	dcb06918dd	Merge remote-tracking branch 'mindshore/feature/ItemRequests' into feature/ItemFamily	2024-04-24 14:35:20 +02:00
Javier Segarra	e6c9a692f5	feat moduleName	2024-04-24 14:33:10 +02:00
Javier Segarra	e65ffb63c9	Merge remote-tracking branch 'mindshore/feature/ItemsSummary' into feature/ItemRequests	2024-04-24 14:26:12 +02:00
Javier Segarra	299838bfa5	Merge branch 'dev' into feature/ItemsSummary	2024-04-24 14:23:49 +02:00
Javier Segarra	1c3660050b	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-24 12:15:34 +02:00
Javier Segarra	de91364ee8	Merge remote-tracking branch 'origin/dev' into feature/FixedPrices	2024-04-24 09:33:34 +02:00
Javier Segarra	bf08ca7655	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-24 06:25:14 +00:00
Javier Segarra	861e4385bb	Merge branch 'dev' into feature/ItemsSummary	2024-04-24 07:34:49 +02:00
Javier Segarra	5dc41f8236	Merge branch 'dev' into feature/ItemFamily	2024-04-24 07:01:46 +02:00
William Buezas	42fe189e9f	Add module name in Item router file	2024-04-23 16:45:28 -03:00
Javier Segarra	9a78b8ac3b	Merge branch 'dev' into feature/ItemRequests	2024-04-23 13:55:43 +02:00
Javier Segarra	bfb7dfb472	Merge branch 'dev' into feature/WorkerTimeControl	2024-04-23 13:31:41 +02:00
William Buezas	78561c5f42	Item types	2024-04-22 08:34:38 -03:00
Pablo Natek	43aadd4fc6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection	2024-04-22 12:22:04 +02:00
Pablo Natek	6b4cb4ed12	feat: refs #4988 add agency section	2024-04-22 12:19:22 +02:00
Javier Segarra	5a588ead87	Merge remote-tracking branch 'origin/dev' into 7190_renewTokenMultimedia	2024-04-22 07:38:07 +02:00
Javier Segarra	2b24e18f75	FEAT: SETiNTERVAL WITH RENEWpERIOD	2024-04-22 07:37:35 +02:00
William Buezas	9212e53905	resolve conflicts	2024-04-19 12:48:07 -03:00
William Buezas	3a03e42cf9	Resolve conflicts	2024-04-19 10:40:04 -03:00
William Buezas	5f01e5c705	change es translations	2024-04-18 09:09:22 -03:00
William Buezas	5551189f2f	resolve conflicts	2024-04-17 08:46:37 -03:00
William Buezas	1dfaef2ffa	Resolve conflicts	2024-04-17 08:26:12 -03:00
William Buezas	a397c6ed30	remove component import	2024-04-16 12:18:36 -03:00
William Buezas	ba2499db9d	resolve conflicts	2024-04-16 12:11:57 -03:00
William Buezas	e36949ad07	resolve conflicts	2024-04-16 10:11:03 -03:00
William Buezas	2ab7a45114	resolve conflicts	2024-04-16 08:49:34 -03:00
Robert Ferrús	d70da976c2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6679-addCreateIcon	2024-04-16 08:04:23 +02:00
Pablo Natek	c65c09c39c	feat(agency): refs #4988 add agency router and sections	2024-04-16 07:45:33 +02:00
William Buezas	00dfa171b0	WIP	2024-04-15 15:37:41 -03:00
William Buezas	d9d868a6af	Waste breakdown	2024-04-15 09:02:35 -03:00
Robert Ferrús	058ddc8e9a	feat: refs #6500	2024-04-15 13:18:39 +02:00
William Buezas	4d418c9cb7	Pull new traduction yml files and add translations	2024-04-12 10:32:19 -03:00
William Buezas	f2dc50d229	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into WorkerCalendar	2024-04-12 08:13:58 -03:00
Pablo Natek	af9fd6ed73	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection	2024-04-12 07:52:37 +02:00
William Buezas	98f273cb93	WIP	2024-04-11 18:04:11 -03:00
William Buezas	c032c83e7f	Item create view	2024-04-11 08:40:41 -03:00
William Buezas	4a0ae8aa45	Item summary	2024-04-10 17:18:57 -03:00
William Buezas	9dfe5f5e68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList	2024-04-10 09:34:51 -03:00
Javier Segarra	478ebfd0ea	Merge branch 'dev' into 6679-addCreateIcon	2024-04-10 12:22:19 +00:00
William Buezas	c881fe6577	Resolve conflicts	2024-04-10 09:19:54 -03:00
William Buezas	e8486099fc	Resolve conflicts	2024-04-10 08:37:52 -03:00
Robert Ferrús	933e6b88b1	feat: refs #6679 add icon	2024-04-10 13:24:20 +02:00
William Buezas	fc4a69b2c6	resolve conflicts in worker routes	2024-04-09 15:28:11 -03:00
William Buezas	c3835dfd7a	resolve conflicts	2024-04-09 15:23:05 -03:00
William Buezas	e51ea9996b	Item list view	2024-04-09 08:18:18 -03:00
Robert Ferrús	cd3024c0a1	feat: refs #6679 add icon	2024-04-09 09:17:49 +02:00
William Buezas	4da540fc9c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList	2024-04-08 08:47:56 -03:00
Javier Segarra	f2d513766e	fix_merge_worker_submoduls	2024-04-08 07:03:42 +00:00
William Buezas	7584857c87	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/WorkerTimeControl	2024-04-05 09:11:23 -03:00
William Buezas	4701714aa9	merge with dev	2024-04-05 08:42:13 -03:00
William Buezas	03be831ee5	remove package-lock.json	2024-04-05 08:24:55 -03:00
William Buezas	4ee8c45fdc	resolve conflicts	2024-04-03 11:22:52 -03:00
Pablo Natek	fb6a2c8097	feat: refs #4988 add agencyList and searchBar	2024-04-03 14:59:51 +02:00
Pablo Natek	6c39c7da97	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection	2024-04-03 08:40:15 +02:00
Pablo Natek	f404243d63	feat(route): refs # agency add agencyList	2024-04-03 08:38:26 +02:00
William Buezas	addbe9345b	Resolve conflicts	2024-04-02 12:40:26 -03:00
Alex Moreno	181bff6c0c	Merge branch 'dev' into 6514-gestDocSupplier	2024-03-28 07:17:28 +00:00
Kevin Martinez	0dee7e8cc9	Create worker calendar submodule	2024-03-27 16:51:44 -03:00
William Buezas	37465ffa4a	resolve conflicts	2024-03-27 11:23:54 -03:00
William Buezas	b546b63352	resolve conflicts	2024-03-27 10:11:20 -03:00
Jorge Penadés	9c83c4cd6c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection	2024-03-27 08:30:37 +01:00
Jon Elias	1ec54d7664	feat: #6514 create supplierDms lilium	2024-03-26 08:55:01 +01:00
carlosfonseca	627d3bbe85	Se implementan las correcciones a los comentarios	2024-03-25 16:00:47 -05:00
Jorge Penadés	4216839d96	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn	2024-03-25 14:58:11 +01:00
Jorge Penadés	d2efbb204f	feat: refs #5186 use arrayData in summary	2024-03-22 14:57:36 +01:00
carlosfonseca	aa2db28eda	Se crea submodulo mis documentos en worker	2024-03-22 08:30:54 -05:00
Jorge Penadés	4f242b0840	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection	2024-03-21 15:31:15 +01:00
William Buezas	65da9a3e69	resolve conflicts	2024-03-21 08:53:42 -03:00
Kevin Martinez	f6e3b3607a	Merge branch 'salix-dev' into feature/worker-log	2024-03-21 08:01:57 -03:00
Carlos Fonseca	142155e14e	Merge branch 'dev' into features/ms_submodulos_worker	2024-03-20 16:55:09 +00:00
Kevin Martinez	cf25476a5d	Create worker log	2024-03-18 21:04:52 -03:00
carlosfonseca	844cd0e12b	Desarrollo de los submodulos basic data, notes y pbx	2024-03-18 08:39:10 -05:00
Jorge Penadés	15efff6855	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn	2024-03-15 09:31:55 +01:00
Carlos Fonseca	f25e46cf08	Merge branch 'dev' into PR-CUSTOMER	2024-03-15 03:12:46 +00:00
Jorge Penadés	dd91449818	feat: refs #5186 use global locales	2024-03-14 15:16:50 +01:00
Jorge Penadés	f39595087a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection	2024-03-14 15:00:16 +01:00
William Buezas	22c49d9cf7	resolve conflicts	2024-03-14 09:50:27 -03:00
William Buezas	6baaebf6bd	WIP	2024-03-14 09:48:04 -03:00
Kevin Martinez	8587d46943	Merge branch 'salix-dev' into feature/route-module ... # Conflicts: # src/pages/Route/Card/RouteSummary.vue	2024-03-14 08:05:51 -03:00
Carlos Fonseca	a3097a9223	Merge branch 'dev' into PR-CUSTOMER	2024-03-14 10:55:02 +00:00
Jorge Penadés	0c012ed71a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection	2024-03-14 08:54:21 +01:00
Javi Gallego	4bc57d0287	Merge branch 'dev' into CambiosSolicitadosSuppliers	2024-03-13 14:37:06 +00:00
William Buezas	4925bed845	resolve conflicts	2024-03-13 11:31:55 -03:00
William Buezas	09582ab6a8	WIP	2024-03-13 09:05:23 -03:00
William Buezas	433843ea09	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into CambiosSolicitadosSuppliers	2024-03-12 08:16:40 -03:00
William Buezas	319295f2c2	Workers PDA	2024-03-11 16:53:33 -03:00
Jorge Penadés	37f155aa85	fix: refs #5186 css, required files & routes	2024-03-11 10:06:11 +01:00
Jorge Penadés	33ef118dea	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection	2024-03-11 09:32:30 +01:00
Jorge Penadés	058b21669f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn	2024-03-11 08:23:56 +01:00
Jorge Penadés	300e384f75	feat: refs #5186 add e2e	2024-03-08 10:32:41 +01:00
Pablo Natek	e5e0d8f806	Merge branch 'dev' into 6349-removeRma	2024-03-08 07:08:36 +00:00
Jorge Penadés	d8a0adb852	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection	2024-03-07 15:57:54 +01:00
William Buezas	b994d39369	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/InvoicesOutCorrections	2024-03-07 08:44:30 -03:00
Kevin Martinez	d3a93da849	Merge branch 'salix-dev' into feature/route-module ... # Conflicts: # src/components/ui/VnPaginate.vue	2024-03-06 23:19:47 -03:00
William Buezas	6a105d5d38	resolve conflicts	2024-03-06 08:35:49 -03:00
Jorge Penadés	3d5674128f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn	2024-03-06 12:31:33 +01:00
William Buezas	859c87940d	Several changes	2024-03-06 08:15:50 -03:00
Jorge Penadés	0fd83cf435	fix: refs #6942 changes and new features	2024-03-05 08:59:06 +01:00
Alex Moreno	4484f431bf	refs #6336 feat: polish claims	2024-03-04 14:42:15 +01:00
Kevin Martinez	31911be3ba	Remove unused route	2024-03-03 23:36:30 -03:00
Jorge Penadés	ebbe38a14e	fix: refs #5186 parking routes	2024-03-01 11:05:34 +01:00
Jorge Penadés	c18e395f6f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection	2024-02-29 15:52:43 +01:00
Pablo Natek	b49db55892	Merge branch 'dev' into 6349-removeRma	2024-02-29 06:50:18 +00:00
Kevin Martinez	64490f7e5b	Merge remote-tracking branch 'salix/dev' into feature/route-module ... # Conflicts: # src/i18n/en/index.js # src/i18n/es/index.js	2024-02-28 21:27:01 -03:00
William Buezas	a0f9c811ff	resolve conflicts	2024-02-28 12:56:13 -03:00
William Buezas	b0d43edbce	Route summary link logic improvement	2024-02-28 12:02:38 -03:00
carlosfonseca	0a33b8d92a	Solucion a comentarios 24	2024-02-27 11:38:58 -05:00
Pablo Natek	546df84db1	remove(claimRma): refs #6349 remove all references	2024-02-26 19:06:21 +01:00