6162 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	95e30c88ee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7277-RefundInvoices	2024-09-04 15:32:14 +02:00
Carlos Satorres	251f27bec6	Merge pull request 'refs #7407 Medical Section' (!667) from 7407-MedicalWorker2 into dev ... Reviewed-on: #667 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-04 13:07:33 +00:00
Carlos Satorres	716270ef92	Merge branch 'dev' into 7407-MedicalWorker2	2024-09-04 12:53:09 +00:00
Carlos Satorres	61c0f63eaf	refs #6943 add try catch get	2024-09-04 14:46:21 +02:00
Carlos Satorres	bcdd6965e6	refs #6943 add try catch	2024-09-04 14:43:48 +02:00
Carlos Satorres	d08748b1a4	refs #6943 fix sampleType	2024-09-04 14:41:35 +02:00
Pablo Natek	717bf1c3e3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought	2024-09-04 14:40:53 +02:00
Pablo Natek	3dc720e2d0	feat: refs #7404 add m3 and fix detail	2024-09-04 14:40:36 +02:00
Carlos Satorres	b29a56d7dd	refs #6943 remake, refactor, clean code Samples	2024-09-04 14:37:39 +02:00
Jon Elias	63c2da9a51	Merge pull request '#6896 Added missing descriptors and small details' (!671) from Fix_OrderMissingDetails into dev ... Reviewed-on: #671 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-04 10:36:04 +00:00
Jon Elias	4602f4c7b3	refactor: deleted useless prop	2024-09-04 12:25:05 +02:00
Jorge Penadés	763cf2e345	refactor: refs #6900 create setRectificative composable	2024-09-04 10:30:14 +02:00
Carlos Satorres	1f9d1b79ab	refs #7283 refactor ItexDescriptor	2024-09-04 10:17:57 +02:00
Jon Elias	3a1575a385	Merge branch 'Fix_OrderMissingDetails' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderMissingDetails	2024-09-04 10:05:19 +02:00
Jon Elias	19ae1f9d80	refactor: deleted useless prop in FetchedTags	2024-09-04 10:05:18 +02:00
Jon Elias	beaa9ab5c8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderMissingDetails	2024-09-04 09:53:47 +02:00
Carlos Satorres	3a703141c6	Merge branch 'dev' into 7407-MedicalWorker2	2024-09-04 07:49:14 +00:00
Jon Elias	6097f46e29	Merge branch 'dev' into Fix_OrderMissingDetails	2024-09-04 06:38:34 +00:00
Jorge Penadés	50cdb053f8	feat: refs #7663 fine tunning	2024-09-03 17:33:17 +02:00
Jorge Penadés	edfc6ace0a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight	2024-09-03 16:23:48 +02:00
Javi Gallego	5b53e9dc37	feat: transfer an invoice	2024-09-03 15:25:36 +02:00
Jorge Penadés	00beeaf51b	feat: refs #6900 add tooltip	2024-09-03 14:37:24 +02:00
Jon Elias	58eca71e95	Merge branch 'dev' into 6346-fixWagonModule	2024-09-03 12:36:42 +00:00
Jorge Penadés	6eb5435e25	chore: refs #6900 drop useless code	2024-09-03 13:03:38 +02:00
Jorge Penadés	02264b2bb5	Merge branch '6900-hotfix-fineTunning' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-hotfix-fineTunning	2024-09-03 12:50:52 +02:00
Jorge Penadés	a5887114ef	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-hotfix-fineTunning	2024-09-03 12:50:35 +02:00
Javier Segarra	4d4997951c	Merge pull request 'fix_mainShortcutMixin' (!673) from fix_mainShortcutMixin into dev ... Reviewed-on: #673 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-09-03 08:43:44 +00:00
Javier Segarra	397a2606f1	fix: cli warnings	2024-09-03 10:31:37 +02:00
Javier Segarra	4e73e74c2c	fix: add border-top	2024-09-03 10:31:24 +02:00
Javier Segarra	eca68b76a0	perf: improve mainShrotcutMixin	2024-09-03 10:31:01 +02:00
Carlos Satorres	65bf1664ff	Merge pull request 'refs #6899 fix InvoiceOut' (!672) from hotfix-descriptorSummaryInvoiceOut into master ... Reviewed-on: #672 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-03 08:11:31 +00:00
Carlos Satorres	64eeeb67fa	refs #6899 fix InvoiceOut	2024-09-03 10:00:44 +02:00
Jon Elias	f4694792eb	Merge branch 'dev' into Fix_OrderMissingDetails	2024-09-03 07:57:37 +00:00
Jon Elias	75e18a1e2f	fix: added missing descriptors and small details	2024-09-03 09:55:58 +02:00
Pablo Natek	74b47361c4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought	2024-09-03 09:42:35 +02:00
Jorge Penadés	3e81b34379	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight	2024-09-03 09:10:34 +02:00
Jorge Penadés	02383f28f0	Merge branch 'master' into 6900-hotfix-fineTunning	2024-09-03 07:07:38 +00:00
Robert Ferrús	ea8fde49ff	Merge pull request 'feat: refs #211153 businessDataLinkGrafana' (!663) from 211153-businessDataLinkGrafana into dev ... Reviewed-on: #663 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-03 06:47:24 +00:00
Robert Ferrús	5a684e244f	Merge branch 'dev' into 211153-businessDataLinkGrafana	2024-09-03 06:46:35 +00:00
Javier Segarra	e2bbe8cf3d	Merge pull request '#7897 - masterTest_24_36' (!669) from 7897_masterTest_24_36 into master ... Reviewed-on: #669 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-03 06:37:48 +00:00
Javier Segarra	ecba084f8b	feat: reduce changelog.md lines	2024-09-03 08:31:27 +02:00
Javier Segarra	c4c4285b4b	fix: remove unnecessary console.log	2024-09-03 08:16:01 +02:00
Javier Segarra	6e2630c69e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 7897_masterTest_24_36	2024-09-03 08:07:57 +02:00
Javier Segarra	84076309a5	feat: update changelog.md	2024-09-03 08:04:42 +02:00
Pablo Natek	2fb974af0f	Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought	2024-09-03 08:01:19 +02:00
Javier Segarra	61721b84b9	Merge pull request '#7897 - Solve conflicts masterTest_24_36' (!670) from 7897_masterTest_24_36 into test ... Reviewed-on: #670 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-03 05:40:47 +00:00
Pablo Natek	18ded3b6f5	Merge pull request 'feat: refs #7129 add km start and end on create form' (!666) from 7129-someFixesAfterMigration into dev ... Reviewed-on: #666 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-03 05:28:09 +00:00
Pablo Natek	f6fe05a47a	Merge branch 'dev' into 7129-someFixesAfterMigration	2024-09-03 05:26:37 +00:00
Jon Elias	e2674e0cd8	Merge pull request '#7354 end Zone migration' (!539) from 7354_ZoneMigration_End into dev ... Reviewed-on: #539 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-03 04:48:17 +00:00
Jon Elias	a2eb298733	Merge branch 'dev' into 7354_ZoneMigration_End	2024-09-03 04:36:22 +00:00