6948 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	570c09bab5	Merge branch 'dev' into cypress_features	2024-11-08 07:27:26 +00:00
Javier Segarra	96d68ed106	Merge branch 'dev' into fix/OrderCatalog	2024-11-08 06:59:26 +00:00
William Buezas	8bff7fc1d6	fix: reset category	2024-11-07 21:09:39 -03:00
William Buezas	52a2250acc	refactor: apply QPopupProxy	2024-11-07 19:16:06 -03:00
William Buezas	498a52a3e5	refactor: small change	2024-11-07 19:07:03 -03:00
Alex Moreno	624ba2c13d	Merge pull request 'FIX: #6943 Customer issues' (!885) from fix_customer_issues into dev ... Reviewed-on: #885 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-07 16:20:22 +00:00
Alex Moreno	0b5be9e67f	chore: correct checkNotification	2024-11-07 17:19:35 +01:00
Javier Segarra	e210ad7de4	Merge branch 'dev' into fix_customer_issues	2024-11-07 13:06:33 +01:00
Javier Segarra	489df51d64	Merge branch 'dev' into fix_customer_issues	2024-11-07 12:54:19 +01:00
Javier Segarra	2bf7fa46ca	perf: remove appendParams	2024-11-07 12:53:17 +01:00
Alex Moreno	5d0c91187e	Merge pull request 'fix(InvoiceOutGlobal): parallelism' (!900) from warmFix_invoiceOut_Global into dev ... Reviewed-on: #900 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-11-07 09:43:18 +00:00
Alex Moreno	18cc3888e5	Merge branch 'dev' into warmFix_invoiceOut_Global	2024-11-07 09:42:09 +00:00
Alex Moreno	cc236cac03	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-11-07 10:19:02 +01:00
Alex Moreno	dd2ee2a7de	Merge pull request 'fix(worker): add searchurls' (!901) from warmFix_worker_searchUrls into test ... Reviewed-on: #901 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-11-07 09:17:18 +00:00
Alex Moreno	6c9627c6c5	fix(worker): add searchurls	2024-11-06 17:51:21 +01:00
Alex Moreno	2b02c9fbd3	Merge branch 'dev' into warmFix_invoiceOut_Global	2024-11-06 12:54:18 +00:00
Alex Moreno	ead241e7da	chore: remove console.log	2024-11-06 13:53:58 +01:00
Alex Moreno	a2bbf4474d	fix(InvoiceOutGlobal): parallelism	2024-11-06 13:52:59 +01:00
Alex Moreno	473b0808e8	Merge pull request 'feat(VnInput): empty to null' (!898) from 6766-vnInput_emptyToNull into dev ... Reviewed-on: #898 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-11-05 14:05:01 +00:00
Alex Moreno	abd7b76636	feat(VnInput): empty to null	2024-11-05 13:50:25 +01:00
Jorge Penadés	ec88bcbc44	Merge pull request '#7273 fixItemTags' (!895) from 7273-fixItemTags into dev ... Reviewed-on: #895 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-05 11:56:14 +00:00
Jorge Penadés	9959fbf005	fix: refs #7273 use same filter	2024-11-05 12:23:11 +01:00
Jorge Penadés	4a95a0e39a	chore: refs #7273 sticky add btn & refactor	2024-11-05 11:59:38 +01:00
Jorge Penadés	9ee05721a4	Merge pull request '#8078 enable multi choice' (!848) from 8078-enableMultiSelection into dev ... Reviewed-on: #848 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-05 10:20:04 +00:00
Jorge Penadés	ca9a7f2932	Merge branch 'dev' into 8078-enableMultiSelection	2024-11-05 10:18:46 +00:00
Alex Moreno	14498a78b2	Merge pull request '6920-invoiceInBasicData_useVnDms' (!892) from 6920-invoiceInBasicData_useVnDms into dev ... Reviewed-on: #892 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-11-05 09:57:31 +00:00
Jorge Penadés	86e6bef90f	chore: refs #8078 fiz tests	2024-11-05 10:37:35 +01:00
Jorge Penadés	a4a4190e4e	Merge branch '8078-enableMultiSelection' of https://gitea.verdnatura.es/verdnatura/salix-front into 8078-enableMultiSelection	2024-11-05 10:02:33 +01:00
Jorge Penadés	1f9d850fbe	chore: refs #8078 rollback ref	2024-11-05 10:02:29 +01:00
Jorge Penadés	a542f69b0f	Merge branch 'dev' of https: refs #8078//gitea.verdnatura.es/verdnatura/salix-front into 8078-enableMultiSelection	2024-11-05 10:02:09 +01:00
Alex Moreno	e050a077d4	test: refactor e2e	2024-11-04 13:41:37 +01:00
Alex Moreno	08204aa5f0	refactor(InvoiceInBasicData): use VnDms	2024-11-04 13:02:39 +01:00
William Buezas	d627c1f698	fix: order catalog	2024-11-03 10:29:03 -03:00
Javier Segarra	1761cc23e0	feat: use composable to unify logic	2024-10-30 08:29:04 +01:00
Javier Segarra	4de23c31b3	feat: use composable to unify logic	2024-10-29 15:01:49 +01:00
Javier Segarra	fbbbc331a9	feat: #7782 add cypress report	2024-10-29 14:27:24 +01:00
Javier Segarra	2090b78ce6	feat: #7782 cypress.config watchForFileChanges	2024-10-29 14:25:34 +01:00
Javier Segarra	b817aa92c2	feat: #7782 npm run resetDatabase	2024-10-29 14:23:22 +01:00
Javier Segarra	ed8225bf6c	feat: #7782 waitUntil domContentLoad	2024-10-29 14:23:06 +01:00
Alex Moreno	f4bdefd4e7	Merge branch 'dev' into improve_isRequired_input	2024-10-29 13:13:59 +00:00
Jon Elias	e26fdfe4a3	Merge pull request '#7206 added inactive label and corrected minor errors' (!889) from 7206-ModifySelectAddress into dev ... Reviewed-on: #889 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-29 13:05:38 +00:00
Jon Elias	282999c49e	fix: refs #7206 deleted duplicate code	2024-10-29 13:23:15 +01:00
Jon Elias	bf480c20f8	Merge branch '7206-ModifySelectAddress' of https://gitea.verdnatura.es/verdnatura/salix-front into 7206-ModifySelectAddress	2024-10-29 13:22:01 +01:00
Jon Elias	8be4210138	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7206-ModifySelectAddress	2024-10-29 13:21:56 +01:00
Jon Elias	00b4e885c1	Merge branch 'dev' into 7206-ModifySelectAddress	2024-10-29 12:19:19 +00:00
Jon Elias	476ef1dedd	feat: refs #7206 added inactive label and corrected minor errors	2024-10-29 13:14:42 +01:00
Alex Moreno	fa5750bce4	Merge branch 'dev' into 8078-enableMultiSelection	2024-10-29 11:44:04 +00:00
Jon Elias	89dfc0aff5	Merge pull request '#6896 fix Order module problems' (!817) from Fix_OrderModuleProblems into dev ... Reviewed-on: #817 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-10-29 11:20:13 +00:00
Jon Elias	9104e13a6d	Merge branch 'dev' into Fix_OrderModuleProblems	2024-10-29 11:19:21 +00:00
Alex Moreno	53887277ca	Merge pull request 'fix: refs #7283 filter' (!887) from 7283-itemFilterWorkerBuyer into dev ... Reviewed-on: #887 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-29 10:43:32 +00:00