331 Commits

Author	SHA1	Message	Date
Guillermo Bonet	4b9e69625b	Merge branch 'dev' into 6636-pickup	2024-04-09 08:02:30 +00:00
Guillermo Bonet	b2ef381f1d	Merge branch 'dev' into 6636-pickup	2024-04-08 05:18:34 +00:00
William Buezas	970d1a48e3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into features/ms_submodulos_worker	2024-04-05 08:25:28 -03:00
Javier Casado	5d7fed3b32	Merge branch 'dev' into 6816-removeMicroSip	2024-04-05 07:57:21 +00:00
Guillermo Bonet	b09ecefad4	feat: refs #6636 Added pickup in claim	2024-04-04 14:12:16 +02:00
jcasado	d00ec3c41c	refs #6816 remove microsip tag	2024-04-04 09:38:47 +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
Jon Elias	d555f7e09e	Merge branch 'dev' into 6988-SummaryRefactor	2024-03-27 10:02:18 +00: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
Alex Moreno	a4a96a106f	Merge branch 'dev' into 6988-SummaryRefactor	2024-03-26 06:41:39 +00:00
Kevin Martinez	5e089e616e	Merge branch 'dev' into feature/worker-log	2024-03-25 12:00:06 +00:00
Alex Moreno	c335accffb	refs #6905 fix translation and warnings	2024-03-25 12:42:48 +01:00
Jon Elias	84a25acf22	refactor: refs #6988 used global translations	2024-03-25 11:42:29 +01:00
Jorge Penadés	d2efbb204f	feat: refs #5186 use arrayData in summary	2024-03-22 14:57:36 +01:00
Carlos Satorres	95d943e6f5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-userPanelConfig	2024-03-22 10:17:36 +01: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
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
Carlos Satorres	798ffa7de3	refs #6905 fix	2024-03-20 10:20:05 +01:00
Carlos Satorres	0946a34422	Merge branch '6905-userPanelConfig' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-userPanelConfig	2024-03-20 09:38:14 +01:00
Carlos Satorres	89fc147ad8	refs #6905 fix traduction	2024-03-20 09:38:11 +01: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	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
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
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
William Buezas	f26d14e875	resolve conflicts	2024-03-13 12:57:41 -03:00
Jorge Penadés	e793b3dd93	feat: refs #5186 use global locales	2024-03-13 15:06:02 +01:00
William Buezas	bd5eb1a1c3	remove assignPDA translation	2024-03-12 11:34:38 -03:00
William Buezas	632049c13b	Assign button change	2024-03-12 11:31:32 -03:00
William Buezas	dad2711311	fix translation	2024-03-12 08:13:27 -03:00
William Buezas	029fc043de	Change title translation	2024-03-12 08:08:20 -03:00
William Buezas	319295f2c2	Workers PDA	2024-03-11 16:53:33 -03: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
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
Javier Segarra	7e769164d7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-refactor-claimSummary	2024-03-06 09:48:34 +01:00
William Buezas	992ada0984	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/InvoicesOutCorrections	2024-03-05 18:21:00 -03:00
Alex Moreno	4484f431bf	refs #6336 feat: polish claims	2024-03-04 14:42:15 +01:00
Carlos Satorres	adc290da6d	refs #6935 restyle card	2024-03-04 12:26:14 +01:00
Jorge Penadés	b5edc98732	fix: refs #5186 add all fields basic data & summary	2024-03-01 12:12:44 +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
Alex Moreno	284eefa8f3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms	2024-02-27 08:23:02 +01:00