2067 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Alex Moreno	cb4ec856fd	refs #6905 fix css	2024-03-15 14:08:16 +01:00
Alex Moreno	17df7e8b09	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-us	2024-03-15 12:24:30 +01:00
Carlos Satorres	d8419a146a	refs #6905 fix userConfig	2024-03-15 10:48:02 +01:00
Alex Moreno	0fe0a6385b	hotFix(Readme): change bun to pnpm	2024-03-15 10:43:25 +01:00
Javier Segarra	26e54923de	Merge pull request '#6930 - Use ScopedToken when share Multimedia files' (!202) from 6930_scopedToken_Multimedia into dev ... Reviewed-on: #202 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-15 09:08:20 +00:00
Javier Segarra	efb3ae6e2a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6930_scopedToken_Multimedia	2024-03-15 09:47:13 +01:00
Javier Segarra	278ebbe070	Merge pull request 'Modulo de rutas' (!195) from hyervoni/salix-front-mindshore:feature/route-module into dev ... Reviewed-on: #195 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-14 12:44:43 +00: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
Alex Moreno	7a75238695	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-03-14 08:16:15 +01:00
Alex Moreno	ab8e1fdc04	Merge pull request 'CambiosSolicitadosEntries' (!201) from hyervoni/salix-front-mindshore:CambiosSolicitadosEntries into dev ... Reviewed-on: #201 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-14 06:39:45 +00:00
William Buezas	f26d14e875	resolve conflicts	2024-03-13 12:57:41 -03:00
Javi Gallego	e1cf13076f	Merge pull request 'CambiosSolicitadosSuppliers' (!214) from hyervoni/salix-front-mindshore:CambiosSolicitadosSuppliers into dev ... Reviewed-on: #214 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-13 14:37:59 +00:00
Javi Gallego	4bc57d0287	Merge branch 'dev' into CambiosSolicitadosSuppliers	2024-03-13 14:37:06 +00:00
Javi Gallego	9e87365bd7	Merge pull request 'Workers PDA' (!234) from hyervoni/salix-front-mindshore:feature/WorkerPDA into dev ... Reviewed-on: #234 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-13 14:36:48 +00:00
Kevin Martinez	77e29a2b87	Fix tickets feedback	2024-03-12 21:26:17 -03:00
Kevin Martinez	e4553659cf	Update translation from population to city	2024-03-12 21:23:46 -03:00
William Buezas	ff0b0c8131	Remove innecesary prop	2024-03-12 12:38:44 -03: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	433843ea09	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into CambiosSolicitadosSuppliers	2024-03-12 08:16:40 -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
Carlos Satorres	2d880be0f8	refs #6905 fix vnrow	2024-03-12 11:04:57 +01:00
Carlos Satorres	374bc4a703	refs #6905 add rows	2024-03-12 09:58:24 +01:00
William Buezas	319295f2c2	Workers PDA	2024-03-11 16:53:33 -03:00
Javier Segarra	63f00c24d7	Merge pull request 'Create date and time utility' (!233) from hyervoni/salix-front-mindshore:feature/date-utility into dev ... Reviewed-on: #233 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>	2024-03-11 11:13:05 +00:00
Kevin Martinez	5011fd5f83	Create date and time utility	2024-03-10 21:41:36 -03:00
Javier Segarra	6baa158d43	Merge pull request 'EntryLatestBuysFilters' (!226) from hyervoni/salix-front-mindshore:EntryLatestBuysFilters into dev ... Reviewed-on: #226 Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-08 12:08:56 +00:00
William Buezas	9ced305797	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into EntryLatestBuysFilters	2024-03-08 09:03:33 -03:00
Pablo Natek	3f1a731ac7	Merge pull request 'remove(claimRma): refs #6349 remove all references' (!208) from 6349-removeRma into dev ... Reviewed-on: #208 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-08 11:27:23 +00:00
Javier Segarra	79801d0be8	Merge pull request '#6940 - Fix CmrList Filter Panel' (!209) from 6940_hotFix_cmrFilterPanel into test ... Reviewed-on: #209 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-08 07:38:14 +00:00
Pablo Natek	e5e0d8f806	Merge branch 'dev' into 6349-removeRma	2024-03-08 07:08:36 +00:00
Kevin Martinez	1ab9bfefed	Centralize roadmap add stop form	2024-03-07 20:37:14 -03:00
Javier Segarra	baf01f6720	Merge branch 'test' into 6940_hotFix_cmrFilterPanel	2024-03-07 12:53:00 +00:00
Javier Segarra	13cfbf0224	Merge pull request 'Update input date/time behaviour' (!223) from hyervoni/salix-front-mindshore:feature/input-date-updates into dev ... Reviewed-on: #223 Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-07 11:20:07 +00:00
Kevin Martinez	80b2683001	Merge branch 'salix-dev' into feature/input-date-updates	2024-03-07 08:11:48 -03:00
Carlos Satorres	d189ebca28	Merge pull request 'fix px' (!231) from fixCheckbox into dev ... Reviewed-on: #231 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-07 10:27:58 +00:00
Carlos Satorres	39009d055d	fix px	2024-03-07 11:19:25 +01:00
Carlos Satorres	aefc237c3f	Merge pull request 'refs #6892 fix checkbox' (!230) from 6892-fixCheckbox into dev ... Reviewed-on: #230 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-07 08:38:05 +00:00
Carlos Satorres	cd8eb4ce5c	refs #6892 fix checkbox	2024-03-07 09:24:17 +01:00
Guillermo Bonet	d8331dcfa5	Merge pull request 'refactor: refs #6948 Bank to Accouting' (!224) from 6948-bank into dev ... Reviewed-on: #224 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-07 06:19:45 +00:00
Guillermo Bonet	61f13861f8	Merge branch 'dev' into 6948-bank	2024-03-07 06:17:20 +00:00
Kevin Martinez	e8e2bc8403	Fix route list worker field	2024-03-06 23:25:41 -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
Kevin Martinez	7974725da0	Fix with feedback	2024-03-06 23:15:26 -03:00
Kevin Martinez	c34fc0f79e	Fix date time timezone	2024-03-06 22:45:23 -03:00
William Buezas	2449488927	Changes	2024-03-06 19:00:50 -03:00