2438 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	ebd02987b9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-04-17 16:34:06 +02:00
Alex Moreno	873d528e0d	Merge pull request 'Waste breakdown' (!291) from hyervoni/salix-front-mindshore:feature/WasteBreakdown into dev ... Reviewed-on: #291 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-17 12:52:16 +00:00
William Buezas	5551189f2f	resolve conflicts	2024-04-17 08:46:37 -03:00
Javier Segarra	13214582ac	Merge pull request 'Item create view' (!285) from hyervoni/salix-front-mindshore:feature/ItemCreate into dev ... Reviewed-on: #285 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-04-17 11:42:50 +00:00
William Buezas	f5d8e94a24	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemCreate	2024-04-17 08:41:13 -03:00
Javier Segarra	95cd795e7b	Merge pull request 'feat(lilium): refs #6930 Undo rollback salix-back' (!301) from 6930_undo_rollback into dev ... Reviewed-on: #301 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-17 11:38:29 +00:00
Javier Segarra	5d7cee38bd	feat(lilium): refs #6930 Undo rollback salix-back	2024-04-17 11:26:35 +00:00
William Buezas	1dfaef2ffa	Resolve conflicts	2024-04-17 08:26:12 -03:00
Javier Segarra	55dd401064	Merge pull request '#6930 - Revert/Undo rollback' (!299) from 6930_undo_rollback into dev ... Reviewed-on: #299 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-17 11:04:48 +00:00
Javier Segarra	37ad84f239	perf(lilium): refs #6930 Improve setToken fn	2024-04-17 10:09:44 +02:00
Javier Segarra	b95d44c05d	feat(lilium): refs #6930 Undo rollback lilium	2024-04-17 10:07:44 +02:00
Guillermo Bonet	dca954850b	Merge pull request 'feat: refs #6968 Changed groupingMode to enum' (!295) from 6968-groupingModeRefactor into dev ... Reviewed-on: #295 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-17 06:48:46 +00:00
Guillermo Bonet	b4462fcdb5	Merge branch 'dev' into 6968-groupingModeRefactor	2024-04-17 06:44:24 +00:00
William Buezas	a397c6ed30	remove component import	2024-04-16 12:18:36 -03:00
Alex Moreno	892c5986c0	Merge pull request 'fix: refs #6425 fixed dev translations' (!294) from 6425-fixDevTranslations into dev ... Reviewed-on: #294 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-16 12:35:36 +00:00
Alex Moreno	4f286cd032	Merge branch 'dev' into 6425-fixDevTranslations	2024-04-16 12:32:46 +00:00
Alex Moreno	5d6a10050e	Merge pull request 'WorkerCalendar' (!270) from hyervoni/salix-front-mindshore:WorkerCalendar into dev ... Reviewed-on: #270 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-16 12:26:20 +00:00
William Buezas	2ab7a45114	resolve conflicts	2024-04-16 08:49:34 -03:00
Jon Elias	b216112d2a	refactor: refs #6425 fix failed tests	2024-04-16 11:42:43 +02:00
Guillermo Bonet	7b29832966	feat: refs #6968 Changed groupingMode to enum	2024-04-16 11:12:23 +02:00
Jon Elias	73c5a5b7d2	fix: refs #6425 fixed dev translations	2024-04-16 11:00:38 +02:00
Robert Ferrús	5feb4a21a5	Merge pull request 'feat: refs #6679 add icon' (!276) from 6679-addCreateIcon into dev ... Reviewed-on: #276 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-04-16 07:38:35 +00:00
Robert Ferrús	81f29d815d	Merge branch '6679-addCreateIcon' of https://gitea.verdnatura.es/verdnatura/salix-front into 6679-addCreateIcon	2024-04-16 09:33:58 +02:00
Robert Ferrús	87ae6870a9	feat: refs #6679 add icon	2024-04-16 09:33:56 +02:00
Robert Ferrús	130869dcdb	Merge branch 'dev' into 6679-addCreateIcon	2024-04-16 07:30:27 +00:00
Jorge Penadés	c2048afb53	Merge pull request '#6938 hide personal phone' (!290) from 6938-hideWorkerPhone into dev ... Reviewed-on: #290 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-16 06:38:56 +00:00
Robert Ferrús	d178d7dc6a	feat: refs #6679 add icon	2024-04-16 08:04:57 +02: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
William Buezas	d9d868a6af	Waste breakdown	2024-04-15 09:02:35 -03:00
William Buezas	c50741b4bf	Remove single quotes	2024-04-15 08:51:48 -03:00
Jorge Penadés	b2211369ea	fix: refs #6938 remove personal phone	2024-04-15 13:30:42 +02:00
Jorge Penadés	1e77e82784	fix: refs #6938 id filter	2024-04-15 13:28:10 +02:00
Robert Ferrús	058ddc8e9a	feat: refs #6500	2024-04-15 13:18:39 +02:00
Jorge Penadés	68069ba9c6	feat: refs #6938 hide personal phone	2024-04-15 12:48:07 +02:00
Alex Moreno	fe13125085	Merge pull request 'feat(supplierSummary): refs #6898 use VnTitle' (!289) from 6898-supplierSummary_use_VnTitle into test ... Reviewed-on: #289 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-04-15 09:56:01 +00:00
Alex Moreno	6e0510f0bd	feat(supplierSummary): refs #6898 use VnTitle	2024-04-15 08:58:39 +02:00
William Buezas	beaffbf685	delete old i18n files and adapt branch to the new ones	2024-04-12 10:20:05 -03:00
William Buezas	d38c85a0ef	resolve conflicts	2024-04-12 09:39:34 -03:00
William Buezas	b4d92d4f97	Fix Options item labels	2024-04-12 09:35:57 -03:00
Jon Elias	32382622e4	Merge pull request 'refactor: refs #6425 new translation proposal' (!250) from 6425-translationProposal into dev ... Reviewed-on: #250 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-12 12:22:23 +00:00
Jon Elias	5cd32ec2fe	Merge branch 'dev' into 6425-translationProposal	2024-04-12 12:21:41 +00:00
Javier Casado	372863e693	Merge pull request '#6946 add table and floating button' (!248) from 6946-refactorEntryNotes into dev ... Reviewed-on: #248 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-04-12 11:48:36 +00:00
Jorge Penadés	a27bdc37d5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6946-refactorEntryNotes	2024-04-12 13:27:14 +02: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
William Buezas	3d9d444bb4	remove filter field	2024-04-12 08:11:58 -03:00
William Buezas	c12fd77218	Remove businessFk from FetchData	2024-04-12 08:10:14 -03:00
Jon Elias	f83de74f01	refs #6425 fix conflicts	2024-04-12 11:44:56 +02:00
William Buezas	73703dc778	Add translations	2024-04-11 18:07:02 -03:00
William Buezas	c032c83e7f	Item create view	2024-04-11 08:40:41 -03:00
Javier Casado	a66ece1683	Merge pull request 'refs #7179 changes customer proxy and client Id' (!279) from 7179-changesClaimSummary into dev ... Reviewed-on: #279 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-04-11 11:38:59 +00:00