14067 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	a5ab5d613a	Merge pull request 'refactor(login): split in differents folder' (!1234) from 4995-split_folder into dev ... Reviewed-on: #1234 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2022-12-28 13:18:22 +00:00
Alex Moreno	90acbac2ad	refactor(login): split in differents folder	2022-12-28 14:06:51 +01:00
Alex Moreno	323776e50c	Merge pull request '#4995 feat(app): only use ui-view for routing' (!1232) from 4995-app_use_ui-view into dev	2022-12-28 12:47:40 +00:00
Alexandre Riera	502461fde5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4926-add-itemPackingOut	2022-12-28 13:25:10 +01:00
Alexandre Riera	101be86448	Merge branch 'dev' into 3571-refactor-e2e	2022-12-28 12:20:35 +00:00
Alexandre Riera	b2af21ba01	refs #3571 fdescribed removed	2022-12-28 13:17:47 +01:00
Alexandre Riera	3b717e54fa	refs #3571 refactor e2e worker	2022-12-28 13:06:00 +01:00
Vicent Llopis	d5b626434b	refactor: add translations, change css...	2022-12-28 12:42:51 +01:00
Vicent Llopis	ab0af27f8b	refactor: delete changes in ticket.sale-checked	2022-12-28 12:23:41 +01:00
Vicent Llopis	d0ae97e41b	refactor: move changes from ticket.sale-checked to ticket.sale-tracking	2022-12-28 12:16:23 +01:00
Vicent Llopis	ba7e5d6a91	refator: se usa loopback cuando se puede	2022-12-28 11:56:34 +01:00
Alex Moreno	c93c276968	Merge branch '4995-app_use_ui-view' of https://gitea.verdnatura.es/verdnatura/salix into 4995-app_use_ui-view	2022-12-28 11:40:14 +01:00
Alex Moreno	fc72a6e2f5	changelog	2022-12-28 11:40:13 +01:00
Alex Moreno	31ad0555fe	Merge branch 'dev' into 4995-app_use_ui-view	2022-12-28 10:28:21 +00:00
Alex Moreno	f4a60d3b35	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4995-app_use_ui-view	2022-12-28 11:27:49 +01:00
Alex Moreno	990bcc0f6e	feat(app): only use ui-view for routing	2022-12-28 11:18:53 +01:00
Alexandre Riera	9971611a0b	Merge branch 'dev' into 4866-detalle-faltas	2022-12-28 09:31:33 +00:00
Alexandre Riera	d1eb3b97ea	Merge pull request 'fixes #4971 Filtrar Artículo en la pantalla de compras' (!1224) from 4971-filtrar-articulo into dev ... Reviewed-on: #1224 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2022-12-28 09:22:12 +00:00
Alexandre Riera	b6e17d3489	Merge branch 'dev' into 4971-filtrar-articulo	2022-12-28 09:16:14 +00:00
Alexandre Riera	30197e9e15	Merge branch 'dev' into 4866-detalle-faltas	2022-12-28 09:07:26 +00:00
Alexandre Riera	33fbe8cc7b	Merge pull request 'fixes #4957 saleChecked kkear' (!1231) from 4957-saleChecked-kkear into dev ... Reviewed-on: #1231 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2022-12-28 09:06:25 +00:00
Vicent Llopis	ec3e60fddd	Merge pull request 'TEST_4825-intrastat' (!1221) from test_4825-intrastat into test ... Reviewed-on: #1221 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2022-12-28 08:51:28 +00:00
Vicent Llopis	eed6d05e23	delete console.log	2022-12-28 08:51:39 +01:00
Vicent Llopis	eb4cb318ed	refactor: evitar join innecesarios en el filter general	2022-12-28 08:43:02 +01:00
Alex Moreno	bee65f9c69	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2	2022-12-28 07:24:08 +01:00
Vicent Llopis	3dd0c79629	feat: add ItemShelvingSales/filter	2022-12-27 15:00:49 +01:00
Alexandre Riera	c06c3dc6a7	refs #4957 saleChecked deleted	2022-12-27 11:50:58 +01:00
Pau	48073f1be8	Merge pull request 'solve fixture error' (!1228) from Hotfix-crear-report-Factura-Electronica into master ... Reviewed-on: #1228	2022-12-27 08:32:36 +00:00
Pau	73a4a193b0	Merge branch 'master' into Hotfix-crear-report-Factura-Electronica	2022-12-27 08:22:39 +00:00
Pau	deb730aae7	solve fixture error	2022-12-27 09:21:02 +01:00
Pau	6e6dc73d59	Merge pull request 'Fix missing report for the invoice electronic notification' (!1216) from Hotfix-crear-report-Factura-Electronica into master ... Reviewed-on: #1216	2022-12-27 08:04:27 +00:00
Alexandre Riera	1f560761a4	refs #4930 changelog modified	2022-12-27 08:31:35 +01:00
Alexandre Riera	c1cac3785d	refs #4926 changelog modified	2022-12-27 08:26:49 +01:00
Alexandre Riera	96a6f0b9d9	refs #4926 packingOut added	2022-12-27 07:48:09 +01:00
Pau	7aeeddcf18	removed the sql	2022-12-27 07:23:15 +01:00
Pau	8696d554d6	Change SQL folder	2022-12-26 07:22:59 +01:00
Pau	1c1cc93ef4	Merge branch 'master' into Hotfix-crear-report-Factura-Electronica	2022-12-26 06:18:47 +00:00
Alexandre Riera	762e39f7be	refs #4866 refactor component instance-log	2022-12-23 15:10:35 +01:00
Alexandre Riera	57440d003d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas	2022-12-23 12:43:30 +01:00
Alexandre Riera	d827795441	refs #4930 agency changed for zone	2022-12-23 12:38:05 +01:00
Vicent Llopis	fb325d5e65	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel	2022-12-23 12:34:51 +01:00
Vicent Llopis	29e66157ea	fix: se excluyen los test de back que fallan intermitente	2022-12-23 12:29:28 +01:00
Vicent Llopis	d3a9e9ac89	delete: columnas que ya no existen en la tabla	2022-12-23 12:17:24 +01:00
Alexandre Riera	7d1b8c8c56	refs #4971 itemSearchFunc added	2022-12-23 12:11:24 +01:00
Vicent Llopis	16c20e4700	feat: add itemShelvingSale popup	2022-12-23 12:08:16 +01:00
Alexandre Riera	53b5ef6d78	refs #4937 viewReceipt added	2022-12-23 11:48:59 +01:00
Vicent Llopis	10a6c280a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2022-12-23 10:58:19 +01:00
Joan Sanchez	c13b49c7cd	Added next version & changelog	2022-12-23 10:07:19 +01:00
Vicent Llopis	9468f604ff	move sql changes	2022-12-23 10:02:21 +01:00
Vicent Llopis	906d8c5df7	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test_4825-intrastat	2022-12-23 10:01:44 +01:00