3845 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	fbc2c892f3	solve merge	2024-06-18 14:12:24 +02:00
Javier Segarra	746c8bd975	feat: #7604 POC ImageStore to refresh	2024-06-18 13:57:44 +02:00
Alex Moreno	cc0eb77228	Merge pull request '#7600 test vnLocation' (!454) from 7600-fix-vnLocation into dev ... Reviewed-on: #454 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-18 08:52:05 +00:00
Jorge Penadés	4ff0901950	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7600-fix-vnLocation	2024-06-18 10:44:58 +02:00
Jorge Penadés	4c40244d41	Merge pull request '#6238 addPercentageColumn' (!443) from 6238-addPercentageColumn into dev ... Reviewed-on: #443 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-18 08:41:42 +00:00
Jorge Penadés	cbbcddfd50	fix: refs #7600 test vnLocation	2024-06-18 10:37:49 +02:00
Jorge Penadés	14ef5ccefd	fix: refs #6238 rollback	2024-06-18 10:14:55 +02:00
Jorge Penadés	3f2779600a	fix: refs #6238 drop old fix	2024-06-18 10:13:43 +02:00
Jorge Penadés	1b4bd2e7f0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6238-addPercentageColumn	2024-06-18 10:12:48 +02:00
Jorge Penadés	f280a7d4dd	Merge pull request '#7598 fix-formModel' (!453) from 7598-fix-formModel into dev ... Reviewed-on: #453 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-18 08:01:04 +00:00
Alex Moreno	741e6f27b1	Merge branch 'dev' into 7598-fix-formModel	2024-06-18 07:58:12 +00:00
Jorge Penadés	34069f4841	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6238-addPercentageColumn	2024-06-18 09:54:33 +02:00
Jorge Penadés	fcc41f0e57	Merge pull request '#6243 load warehouses & iron out column width' (!449) from 6243-fixColumnWidth into dev ... Reviewed-on: #449 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-18 07:53:42 +00:00
Jorge Penadés	b1b0f4efed	Merge branch 'dev' into 6243-fixColumnWidth	2024-06-18 07:49:46 +00:00
Jorge Penadés	024687e2d3	fix: refs #7598 fix evt & .value	2024-06-18 09:46:58 +02:00
Jorge Penadés	9725874d5d	fix: refs #7598 fix evt & .value	2024-06-18 09:44:50 +02:00
Jorge Penadés	37af8ba8f5	fix: refs #7598 fix evt & .value	2024-06-18 09:43:44 +02:00
Carlos Satorres	e6bf73c8d1	Merge pull request 'refs #6897 remove code fix section' (!415) from 6897-EntryMigration into dev ... Reviewed-on: #415 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-18 06:16:18 +00:00
Carlos Satorres	1cf630378b	Merge branch 'dev' into 6897-EntryMigration	2024-06-18 06:15:12 +00:00
Carlos Satorres	af59da33aa	Merge pull request '7366-travelMigration' (!430) from 7366-travelMigration into dev ... Reviewed-on: #430 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-18 06:03:41 +00:00
Carlos Satorres	0940872625	Merge branch '6897-EntryMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-EntryMigration	2024-06-18 07:18:47 +02:00
Carlos Satorres	bc30531d42	refs #6897 fix trad	2024-06-18 07:18:44 +02:00
Jorge Penadés	f64f42f473	fix: refs #6243 load warehouses & iron out column width	2024-06-17 10:46:51 +02:00
Jorge Penadés	94f4e154b0	refactor: refs #6238 use variable & link class	2024-06-17 10:39:36 +02:00
Carlos Satorres	f4b7d34a7f	refs #7366 fix redirect	2024-06-17 08:39:39 +02:00
Jorge Penadés	bd6e45d260	refactor: refs #6238 get percentage from back	2024-06-14 14:52:39 +02:00
Carlos Satorres	8002f0a94b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration	2024-06-14 12:59:16 +02:00
Carlos Satorres	7fccd0ae81	Merge branch '7366-travelMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration	2024-06-14 10:47:03 +02:00
Jorge Penadés	fc54b44c7b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6238-addPercentageColumn	2024-06-14 09:05:49 +02:00
Javier Segarra	914a9afb92	Merge pull request 'Fix worker department: Create modal did not open' (!441) from hyervoni/salix-front-mindshore:bugfix/WorkerDepartment into dev ... Reviewed-on: #441 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-06-13 12:57:40 +00:00
Javier Segarra	7d73cd0e33	Merge branch 'dev' into bugfix/WorkerDepartment	2024-06-13 14:56:34 +02:00
Javier Segarra	648546888d	fix: DeleteDepartment VnConfirm	2024-06-13 14:56:19 +02:00
Carlos Satorres	548fc374c8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration	2024-06-13 09:22:45 +02:00
Carlos Satorres	8c5ea42be2	Merge branch 'dev' into 6897-EntryMigration	2024-06-13 06:51:02 +00:00
Carlos Satorres	3958d5ab08	Merge branch 'dev' into 7366-travelMigration	2024-06-13 06:50:28 +00:00
Pablo Natek	78042ab109	Merge pull request 'fix: refs #7499 id article' (!428) from 7499-refactorEntrys into dev ... Reviewed-on: #428 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-13 05:41:26 +00:00
Pablo Natek	e10755d8fe	Merge branch 'dev' into 7499-refactorEntrys	2024-06-13 05:39:13 +00:00
Javier Segarra	ffd4109dc7	Merge branch 'dev' into bugfix/WorkerDepartment	2024-06-12 20:23:30 +00:00
Jorge Penadés	7393b82008	refactor: refs #6238 update getRate function and color logic	2024-06-12 16:46:14 +02:00
Jorge Penadés	19aa1bf01d	fix; refs #6238 fix test	2024-06-12 14:48:31 +02:00
Carlos Satorres	6e4843563c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-EntryMigration	2024-06-12 14:42:06 +02:00
Carlos Satorres	34e92d130a	refs #7366 fix basic-data	2024-06-12 14:31:18 +02:00
William Buezas	b0e4dc99b0	Fix worker department create modal did not open	2024-06-12 08:47:32 -03:00
Jorge Penadés	2641489d83	fix: refs #6238 use .value prop	2024-06-12 13:45:17 +02:00
Jorge Penadés	1052e9eb21	fix: refs #6238 use :deep	2024-06-12 13:14:02 +02:00
Jorge Penadés	a4c21c7673	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6238-addPercentageColumn	2024-06-12 12:42:23 +02:00
Jorge Penadés	51d497a1de	feat: refs #6238 add percentage & summary btn	2024-06-12 12:17:52 +02:00
Guillermo Bonet	9388cb3599	Merge branch 'test' into dev	2024-06-12 12:02:12 +02:00
Guillermo Bonet	135e05b139	hotfix: refs #6636 EN i18n	2024-06-12 12:00:43 +02:00
Javier Segarra	ef24a5cd2f	Merge pull request '#7323 FIX default model value depends on route' (!437) from 7323_fix_workerTimeControl into dev ... Reviewed-on: #437 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-12 07:33:27 +00:00