1993 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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
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
Pablo Natek	e5e0d8f806	Merge branch 'dev' into 6349-removeRma	2024-03-08 07:08:36 +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	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
William Buezas	44d7f98cdc	Add item descriptor	2024-03-06 18:22:15 -03:00
William Buezas	a828ac5954	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into EntryLatestBuysFilters	2024-03-06 18:08:02 -03:00
Pablo Natek	d549077ffa	Merge pull request 'fix(ticket): refs #6486 add a and style to card headers' (!229) from 6486-fix-TicketHeaders into dev ... Reviewed-on: #229 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-06 13:48:01 +00:00
Pablo Natek	00df197653	Merge branch 'dev' into 6486-fix-TicketHeaders	2024-03-06 13:27:52 +00:00
Pablo Natek	70dc144019	fix(ticket): refs #6486 add a and style to card headers	2024-03-06 14:28:33 +01:00
William Buezas	fe8e4a8342	add VnSelectDialog refill to action icon	2024-03-06 09:52:43 -03:00
Alex Moreno	4443edd800	fix(claimSummary) header color	2024-03-06 13:45:02 +01:00
William Buezas	6a105d5d38	resolve conflicts	2024-03-06 08:35:49 -03:00
William Buezas	800b626c99	fire searchbar search on icon click	2024-03-06 08:21:26 -03:00
Javier Segarra	7bfbf26606	Merge pull request '6336-refactor-claimSummary' (!227) from 6336-refactor-claimSummary into dev ... Reviewed-on: #227 Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>	2024-03-06 10:44:30 +00:00
Guillermo Bonet	aa59643cf3	Merge branch 'dev' into 6948-bank	2024-03-06 10:18:49 +00:00
Alex Moreno	5510594b74	Merge branch 'dev' into 6336-refactor-claimSummary	2024-03-06 09:14:27 +00:00
Pablo Natek	5c40789633	Merge pull request 'fix(buid): refs #6486 add custom variable' (!228) from 6486-fixBuild into dev ... Reviewed-on: #228 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-06 09:02:27 +00:00
Pablo Natek	16adef62c3	fix(buid): refs #6486 add custom variable	2024-03-06 09:55:36 +01:00
Alex Moreno	ed15ea4c35	feat: update cypress v13	2024-03-06 09:52:51 +01: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
Pablo Natek	759dbaa066	Merge pull request '6486-salixColors' (!219) from 6486-salixColors into dev ... Reviewed-on: #219 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-06 08:44:29 +00:00
Pablo Natek	1aedb3c7da	Merge branch 'dev' into 6486-salixColors	2024-03-06 08:43:21 +00:00
Pablo Natek	0192ec344f	Merge branch '6486-salixColors' of https://gitea.verdnatura.es/verdnatura/salix-front into 6486-salixColors	2024-03-06 09:43:45 +01:00
Pablo Natek	b584295101	fix: refs #6486 add title to basicData	2024-03-06 09:43:45 +01:00
Carlos Satorres	8a964c7382	Merge pull request '6892-summaryCardRefact' (!221) from 6892-summaryCardRefact into dev ... Reviewed-on: #221 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-06 08:43:10 +00:00
Pablo Natek	28b63831cc	Merge branch 'dev' into 6486-salixColors	2024-03-06 08:41:49 +00:00
Carlos Satorres	207b95c0e9	Merge branch 'dev' into 6892-summaryCardRefact	2024-03-06 08:40:46 +00:00