1222 Commits

Author	SHA1	Message	Date
Alexandre Riera	c99bfef917	refs #3302 fixed scss	2022-12-20 15:29:21 +01:00
Alexandre Riera	1982e4c989	Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas	2022-12-20 14:25:38 +01:00
Alexandre Riera	27e0c2d0be	refs #3302 where with changedModel and changedModelId	2022-12-20 14:23:47 +01:00
Alexandre Riera	62152d1668	Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas	2022-12-20 12:16:40 +01:00
Alexandre Riera	5b87514501	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat	2022-12-20 12:15:50 +01:00
Pau	1305513b07	Merge branch 'dev' into 4791-refactor-sendsms	2022-12-20 11:01:38 +00:00
Alexandre Riera	8403af7db5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour	2022-12-20 11:37:40 +01:00
Joan Sanchez	73ea928b33	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-12-20 10:40:23 +01:00
Joan Sanchez	c063c0e72f	fix(pagination): duplicated rows on paginate ... Refs: #4531	2022-12-20 09:48:41 +01:00
Pau	5a01e49f27	Merge branch 'dev' into 4791-refactor-sendsms	2022-12-19 12:25:58 +00:00
Alexandre Riera	98c9e0ac50	refs #4962 autoload added and second header	2022-12-16 13:42:23 +01:00
Alex Moreno	19cbd5b57b	fix css	2022-12-16 08:43:34 +01:00
Alex Moreno	ed68637059	disable outLayout	2022-12-15 15:05:17 +01:00
Alexandre Riera	92a961ecc9	refs #3302 refactor	2022-12-15 14:24:57 +01:00
Alex Moreno	8d7757ddbe	add reset-password	2022-12-15 07:40:51 +01:00
Joan Sanchez	11db08b32b	Updated unit test	2022-12-14 14:20:41 +01:00
Joan Sanchez	a86636bee4	Use proper module codes	2022-12-14 13:49:49 +01:00
Alexandre Riera	4bafcc905a	refs #4866 fix css	2022-12-09 11:41:08 +01:00
Alexandre Riera	704cb71b61	refs #4866 instance log added and e2e done	2022-12-07 13:53:59 +01:00
Alexandre Riera	569a0e8cc9	refs #3302 log modified and fixed e2e tests	2022-12-05 15:30:41 +01:00
Alexandre Riera	36a78fac7f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat	2022-12-05 08:06:25 +01:00
Pau	9ed9c1a82c	Delete sendsms from core/components	2022-11-30 13:13:06 +01:00
Pau	a676351e5b	Merge branch 'dev' into 3681-move-sign_save-to-salix	2022-11-30 07:24:26 +01:00
Joan Sanchez	990dd88e2c	Merge pull request 'test → dev (Hacer despues)' (!1186) from test into dev ... Reviewed-on: #1186	2022-11-29 13:08:38 +00:00
Vicent Llopis	a0f5cf1449	refactor: borrados saltos de linea	2022-11-28 14:48:37 +01:00
Vicent Llopis	c3d06ca5db	fix: crashea cuando el log no tiene changedModel	2022-11-28 14:47:23 +01:00
Alex Moreno	d9e4ff6772	fix: use $location	2022-11-28 11:48:25 +01:00
Alex Moreno	804db15ece	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-28 07:53:51 +01:00
Pau	8f98082910	refs #4791 @2h	2022-11-25 09:59:02 +01:00
Pau	1c9964b902	Merge branch '4791-refactor-sendsms' of https://gitea.verdnatura.es/verdnatura/salix into 4791-refactor-sendsms	2022-11-25 08:23:59 +01:00
Pau	d47e7ffb16	change component location	2022-11-25 08:23:57 +01:00
Pau	7c71e40cc5	Merge branch 'dev' into 4791-refactor-sendsms	2022-11-24 13:15:54 +00:00
Vicent Llopis	20d0d053ac	Merge branch 'dev' into 4682-searchbar_filter	2022-11-24 11:03:23 +00:00
Vicent Llopis	74e8789439	Merge branch 'dev' into 4793-models_translation	2022-11-24 10:54:40 +00:00
Vicent Llopis	7ccf37c079	Merge branch 'dev' into 4793-models_translation	2022-11-24 08:08:56 +00:00
Alex Moreno	30a25664de	out-layout component	2022-11-23 13:49:50 +01:00
Vicent Llopis	9a47b2fea4	Merge branch 'dev' into 4682-searchbar_filter	2022-11-23 10:00:27 +00:00
Pau	a8520f851c	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-23 08:28:07 +00:00
Alex Moreno	314e98b838	fix: nested router	2022-11-22 14:57:52 +01:00
Alex Moreno	660648e01f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-22 14:35:25 +01:00
Vicent Llopis	89141419c1	fix: merge filter	2022-11-22 10:36:40 +01:00
Alexandre Riera	2651081838	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour	2022-11-22 10:15:31 +01:00
Vicent Llopis	cac8879ec7	fix: solo vuelve a buscar el mismo filtro en caso de que se encuentre en un index	2022-11-22 09:22:06 +01:00
Pau	4bd643143b	requested changes refs #4791 @1h	2022-11-22 07:59:18 +01:00
Pau	4e97d931f7	refs #4791 @2h	2022-11-21 08:45:45 +01:00
Vicent Llopis	d4712e27c3	fix: no repite la llamada filter cada vez q cambias de seccion	2022-11-17 11:31:36 +01:00
Alex Moreno	9405333c07	try	2022-11-16 15:29:02 +01:00
Pau	5b4c1ad4e6	Merge branch 'dev' into 3681-move-sign_save-to-salix	2022-11-16 12:26:59 +01:00
Vicent Llopis	3d352fa0fd	fix: locale no puede ser undefined	2022-11-16 12:06:50 +01:00
Alex Moreno	9085e7fab1	fix: use routes	2022-11-15 15:12:15 +01:00
Alex Moreno	8dcd567a68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-15 13:20:52 +01:00
Vicent Llopis	843e5ae736	feat: traducciones en los modelos	2022-11-15 11:41:57 +01:00
Pau	9d0cd36afe	Merge branch 'dev' into 4457'	2022-11-15 08:49:21 +01:00
Alexandre Riera	7dd87b1ea8	refs #4700 icons future	2022-11-14 09:56:23 +01:00
Juan Ferrer	e7f26e8502	Merge branch 'master' into test	2022-11-11 00:56:20 +01:00
Juan Ferrer	c2b4187b97	refs #4609	2022-11-10 23:46:03 +01:00
Alex Moreno	4c216c4556	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-10 14:40:55 +01:00
Alex Moreno	517422be8c	refactor: not use axios	2022-11-10 13:32:07 +01:00
Pau	a237375db6	Merge branch 'dev' into 3681-move-sign_save-to-salix	2022-11-10 10:42:53 +01:00
Alexandre Riera	897a7d079d	Merge branch 'dev' into 2596-arrastrar-ficheros	2022-11-10 07:40:10 +00:00
Alex Moreno	5339bc1143	feat(recoverPassword): use loopback	2022-11-09 14:51:30 +01:00
Juan Ferrer	993ae11277	refs #3302	2022-11-09 09:19:56 +01:00
Alex Moreno	fcf46ade7d	feat: reset-password section	2022-11-07 15:15:00 +01:00
Alexandre Riera	07b2ac99ce	refs #2596 css corregido	2022-11-03 15:45:36 +01:00
Alexandre Riera	f3085bef66	refs #2596 css actualizado	2022-11-03 15:28:52 +01:00
Alex Moreno	36894c31de	Merge branch 'dev' into 4077-login_recover-password	2022-11-03 08:39:04 +00:00
Alex Moreno	ec9139f985	Merge branch 'dev' into 4159-tableQ_filter	2022-11-03 07:24:05 +00:00
Alexandre Riera	e1eeb81696	refs #2596 tabulación y css	2022-11-03 08:18:24 +01:00
Alex Moreno	9891f7060d	fix(smart-table): monitor only ticketFilter use url and add ?q in routes	2022-11-02 09:40:09 +01:00
Alexandre Riera	aaaa73644d	refs #2596 drag and drop implementado	2022-11-02 08:18:58 +01:00
Joan Sanchez	fe3ebe8e0c	Merge branch 'dev' into 3095-item.shelving	2022-11-02 06:43:43 +00:00
Alex Moreno	f8f44aaae7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4159-tableQ_filter	2022-11-02 07:37:28 +01:00
Alex Moreno	755a1667dc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-02 07:35:04 +01:00
Pau	0739608de3	Merge branch 'dev' into 4457-hasInvoiceElectronic	2022-10-31 07:57:50 +01:00
Pau	c1c06f27d3	create save.js	2022-10-27 08:21:21 +02:00
Alex Moreno	3fd10dfc64	Merge branch 'dev' into 4075-ticket_boxing	2022-10-25 09:58:17 +00:00
Alex Moreno	107a0a6555	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4159-tableQ_filter	2022-10-25 11:35:12 +02:00
Alex Moreno	bcfbeb7032	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-10-21 12:41:39 +02:00
Vicent Llopis	888f612dbb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving	2022-10-21 11:41:53 +02:00
Alex Moreno	0bc018ec02	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-10-17 14:06:31 +02:00
Pau	cf50c4690a	Merge branch 'dev' into 4153-supplier.fiscal-data	2022-10-17 08:41:39 +00:00
Alex Moreno	248572feb4	use variable	2022-10-14 07:40:11 +02:00
Alex Moreno	cfc626494f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4159-tableQ_filter	2022-10-14 07:39:23 +02:00
Vicent Llopis	7b7e01f49e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving	2022-10-11 07:09:20 +02:00
Alex Moreno	5c4daee35e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-10-10 14:20:22 +02:00
Pau	4f25961988	Created checkbox and logic, package-lock	2022-10-07 08:33:45 +02:00
Joan Sanchez	9764b79f81	Restored engine versions	2022-10-06 12:52:50 +02:00
Joan Sanchez	f2eaa9d0e5	Merge branch 'dev' into 4077-login_recover-password	2022-10-06 06:28:00 +00:00
Vicent Llopis	2f17257e46	feat: add new sub section itemShelving	2022-10-05 15:13:48 +02:00
Joan Sanchez	3dbd304217	Updated unit tests	2022-10-04 09:21:24 +02:00
Pau	9c7ec6fdc9	Implemented Insertable in the textfield class	2022-10-03 13:48:35 +02:00
Pau	5ca39c9dd3	Modified TextField to have a insertable option	2022-10-03 08:48:04 +02:00
Joan Sanchez	21bb95fc88	CSV refactor	2022-10-03 08:28:47 +02:00
Alex Moreno	e931414bb7	unnecessary code	2022-09-30 08:59:49 +02:00
Joan Sanchez	1ac35c0b68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2	2022-09-29 14:52:31 +02:00
Alex Moreno	94c143bc4c	test(searchbar_smart-table): fix for integration	2022-09-29 14:28:50 +02:00
Pau	796988bb18	Removed e.stopPropagation	2022-09-29 14:14:05 +02:00
Alex Moreno	84003ab09c	fix(searchbar): smart-table.tableQ integration	2022-09-29 12:36:16 +02:00
Pau	7ac7189a8a	added maxlength binding, finished logic on insert	2022-09-29 08:08:49 +02:00
Alex Moreno	203b223cc6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-09-28 12:24:40 +02:00
Pau	dff378632b	Changed the logic	2022-09-28 12:23:25 +02:00
Alex Moreno	840140c40f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-09-28 12:20:35 +02:00
Alex Moreno	81752e7f30	quit userError	2022-09-28 12:20:29 +02:00
Alex Moreno	4df99a82e1	feat(tableOrder): save order in url	2022-09-28 11:22:29 +02:00
Alex Moreno	444bc36f31	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4159-tableQ_filter	2022-09-28 08:26:54 +02:00
Alex Moreno	8082e3071a	try	2022-09-27 15:17:54 +02:00
Pau	c2813e3633	Removed console logs and other debugging elements	2022-09-27 13:05:46 +02:00
Pau	d30065f90a	Add vn-input-account tag and logic	2022-09-27 12:12:25 +02:00
Alex Moreno	2c691eb796	feat(vnApp): getUrl and create salix.url. test(boxing): getVideoList	2022-09-26 14:49:11 +02:00
Alex Moreno	f698a22fcf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-09-26 09:25:43 +02:00
Alex Moreno	63acbc50d5	quit comment	2022-09-26 09:08:09 +02:00
Alex Moreno	d2cbaa565e	add translation	2022-09-26 08:48:46 +02:00
Alex Moreno	c79f884526	feat(recover-password): open changePass in front and tests done	2022-09-22 09:22:24 +02:00
Joan Sanchez	8105c12a18	Campaign metrics	2022-09-22 08:48:29 +02:00
Alex Moreno	00f5689825	feat(account): recover-password	2022-09-21 15:15:19 +02:00
Alex Moreno	918863ee8e	feat(account): recover-password	2022-09-20 15:21:01 +02:00
Joan Sanchez	09bdee8b34	View & send PDF from loopback endpoint	2022-09-19 12:59:32 +02:00
Alex Moreno	310557427a	feat(recover-password): create section and route	2022-09-15 10:21:30 +02:00
Alex Moreno	cf7016c28a	feat(login): recover-password section	2022-09-14 15:18:11 +02:00
Alex Moreno	e72c0ae919	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-vnInputTime	2022-09-14 13:09:00 +02:00
Alex Moreno	bbc5790945	fix(smartTable): refresh button await query	2022-09-07 10:30:50 +02:00
Joan Sanchez	768e4d5e77	Resolved conflicts	2022-08-10 12:13:31 +02:00
Alex Moreno	062806b3f0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-08-05 13:19:43 +02:00
Alex Moreno	d040ecb743	feat(ticket): getVideo from shinobi	2022-08-01 07:59:04 +02:00
Alex Moreno	d3852bac5d	fix(vnInputTime): quit new date(null)	2022-07-26 11:45:12 +02:00
Vicent Llopis	762ec3045f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3069-client.shelving	2022-07-14 09:11:43 +02:00
Carlos Jimenez Ruiz	d0e06a46d0	removed deprecated stowaway comp and usages	2022-07-01 09:15:07 +02:00
Alex Moreno	1a88ccaae5	move funcionality setVersion to vnApp	2022-06-16 08:25:38 +02:00
Alex Moreno	fd8375a45a	move code to vnApp and interceptor	2022-06-14 10:16:41 +02:00
Alex Moreno	0d4ab527c3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2240-salix-version-refresh	2022-06-13 13:37:17 +02:00
Alex Moreno	3e133c22e1	correct interval	2022-06-13 13:37:06 +02:00
Alex Moreno	559f313814	feat(front): interceptor getVersion from back	2022-06-13 13:36:05 +02:00
Alex Moreno	5e586bf1d0	test(client_defaulter): getBalanceDueTotal tested	2022-06-13 07:44:21 +02:00
Alex Moreno	f74c7a6999	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4024-client_defaulter	2022-06-09 15:13:04 +02:00
Alex Moreno	36ea903333	change NumberFormat	2022-06-09 15:10:53 +02:00
Joan Sanchez	83d4627f2d	Removed font color	2022-06-09 11:31:18 +02:00
Joan Sanchez	c92f444776	Ammends	2022-06-07 14:59:18 +02:00
Joan Sanchez	c369453bfc	Added model fields	2022-05-31 13:36:27 +02:00
Vicent Llopis	f00fb0dc3f	feat: add new module shelving	2022-05-24 12:50:22 +02:00
Joan Sanchez	caa9a63c4c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2022-05-24 08:45:37 +02:00
Alex Moreno	4a9c5742c0	fix(entry_latest-buys): fix multi_check	2022-05-17 13:50:06 +02:00
Alex Moreno	1707ff7f0f	duplicate test	2022-05-16 10:24:02 +02:00
Alex Moreno	35209d77cc	fix(multi-check)	2022-05-13 12:14:37 +02:00
Alex Moreno	946f1c1cb5	refactor test	2022-05-10 12:02:50 +02:00
Alex Moreno	fde73b35e7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3887-multi-check	2022-05-10 08:57:28 +02:00
Alex Moreno	f364c19c70	fix(monitor_client): fix scroll	2022-05-03 14:08:46 +02:00
Alex Moreno	ec49f37303	fix(icon): defaulter	2022-04-25 08:10:14 +02:00
Alex Moreno	62f7b80ed4	quit $	2022-04-20 08:55:43 +02:00
Alex Moreno	ea2e38af4e	support front filter and front test for component	2022-04-20 08:24:12 +02:00
Alex Moreno	69530d3019	fix filter	2022-04-19 14:12:31 +02:00