11063 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	b7494afbe2	Eliminado orden predeterminado	2022-01-20 12:57:36 +01:00
Joan Sanchez	dfd746f84d	Sort by clientFk	2022-01-20 12:48:12 +01:00
Joan Sanchez	b88f2c71c1	Ammends	2022-01-20 12:29:28 +01:00
Joan Sanchez	3fceff2975	Updated unit tests	2022-01-20 12:29:22 +01:00
Joan Sanchez	cf2ad0d61e	feat(smartTag): added sort priority between multiple sorting ... Refs: 3528	2022-01-20 12:29:12 +01:00
Joan Sanchez	4aa6b2b6c0	fix(salixfont): removed font color	2022-01-14 08:26:34 +01:00
Joan Sanchez	b86c32c97b	fix(importBuy): prevent action	2022-01-14 08:06:38 +01:00
Joan Sanchez	dd122f7420	Downgraded node version for docker container	2022-01-13 13:28:33 +01:00
Joan Sanchez	220cb55e0f	Upgraded nodejs to v14	2022-01-13 11:37:25 +01:00
Joan Sanchez	74d9b3f774	Removed package lock	2022-01-13 09:05:26 +01:00
Joan Sanchez	a4d16a60e0	Removed salix icons color	2022-01-13 08:36:46 +01:00
Joan Sanchez	25e17ee340	Merge pull request '.text-secundary is now $color-font-light' (#848) from 3512-autocomplete_style into dev ... Reviewed-on: #848 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-01-13 06:47:01 +00:00
Carlos Jimenez Ruiz	b27cfef267	.text-secundary is now $color-font-light	2022-01-12 16:53:45 +01:00
Joan Sanchez	baea601156	Merge pull request '3472-supplier_summary isFarmer' (#833) from 3472-supplier_summary into dev ... Reviewed-on: #833 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-01-12 14:09:51 +00:00
Alex Moreno	6f7c1b6a46	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary	2022-01-12 14:56:34 +01:00
Carlos Jimenez Ruiz	2d94993423	Merge pull request '3490-sms' (#844) from 3490-sms into dev ... Reviewed-on: #844 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-01-12 10:34:06 +00:00
Carlos Jimenez Ruiz	98e621305d	Merge branch 'dev' into 3490-sms	2022-01-12 10:29:49 +00:00
Joan Sanchez	e7b2dc718a	Merge pull request 'can't transfer claimed sales without claimManager role' (#845) from 3506-ticket_sale_transfer into dev ... Reviewed-on: #845 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-01-12 10:16:08 +00:00
Carlos Jimenez Ruiz	98cd0b659c	Merge branch 'dev' into 3506-ticket_sale_transfer	2022-01-12 09:19:51 +00:00
Carlos Jimenez Ruiz	cc3e2fbc3a	can't transfer claimed sales without claimManager role	2022-01-12 10:17:51 +01:00
Joan Sanchez	efa9412ff0	Merge pull request 'added shorcuts for order, monitor and worker modules' (#843) from 3303-shortcuts into dev ... Reviewed-on: #843 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-01-12 08:37:03 +00:00
Vicent Llopis	f8cd5d3ea3	fix: change 'query' by 'form'	2022-01-12 08:32:01 +01:00
Alex Moreno	b02695a14b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary	2022-01-11 14:49:36 +01:00
Alex Moreno	94a2d3cc16	refactor(supplier): add isFarmer in getSummary	2022-01-11 14:49:22 +01:00
Alex Moreno	aaae5e157e	replace query for searchPanel	2022-01-11 13:52:01 +01:00
Vicent Llopis	4f0edbda6b	add prefix +34	2022-01-11 10:03:59 +01:00
Alex Moreno	9e491082e7	test(send): backTest and fixtures	2022-01-11 08:39:06 +01:00
Carlos Jimenez Ruiz	7b5e6e8a23	added shorcuts for order, monitor and worker modules	2022-01-10 16:08:45 +01:00
Alex Moreno	ebac06e4fc	refactor(send): update got sms	2022-01-10 15:14:05 +01:00
Alex Moreno	ef9dcf2fb3	update got to 10.7	2022-01-10 15:13:43 +01:00
Alex Moreno	de28bfec8e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3490-sms	2022-01-10 15:09:08 +01:00
Carlos Jimenez Ruiz	51bf4e44ba	Merge pull request '3485-monitors-ticketAddProblem' (#842) from 3485-monitors-ticketAddProblem into dev ... Reviewed-on: #842 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-01-10 13:46:54 +00:00
Carlos Jimenez Ruiz	fa17c85c67	Merge branch 'dev' into 3485-monitors-ticketAddProblem	2022-01-10 12:54:28 +00:00
Joan Sanchez	9b76a3f1d4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-01-10 13:21:05 +01:00
Alex Moreno	fc69151f7f	update sms	2022-01-10 13:20:57 +01:00
Alex Moreno	75de01ed72	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3490-sms	2022-01-10 12:29:03 +01:00
Alex Moreno	1983eb012b	refactor(sms): got and apiKey	2022-01-10 12:28:39 +01:00
Carlos Jimenez Ruiz	5de6f437a8	Merge branch 'dev' into 3485-monitors-ticketAddProblem	2022-01-10 10:41:39 +00:00
Carlos Jimenez Ruiz	612311b23f	Merge pull request '3247-refactor(ticket): add more text in the error when change zone' (#841) from 3247-ticket_basic-data into dev ... Reviewed-on: #841 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-01-10 10:41:24 +00:00
Alex Moreno	5462af91ee	extract to variable	2022-01-10 11:38:02 +01:00
Joan Sanchez	dc572a6e2e	Updated translations	2022-01-10 08:10:21 +01:00
Joan Sanchez	ebee852de6	Throw invalid businessType for new clients	2022-01-10 08:10:21 +01:00
Joan Sanchez	d85f95a8f4	Prevent businessTypeFk validation for other invalid fields	2022-01-10 08:10:21 +01:00
Alex Moreno	7406c59f16	update condition	2022-01-10 08:10:21 +01:00
Alex Moreno	eae140003d	feat(client): add more condition for businessType Validation	2022-01-10 08:10:21 +01:00
Alex Moreno	c5b8280403	feat(client): add isWorker condition in hasBusinessType	2022-01-10 08:09:36 +01:00
Alex Moreno	1f79a3047d	feat(monitors_ticket): add isTooLittle	2022-01-07 11:26:16 +01:00
Alex Moreno	b552c1972e	refactor(icons): update	2022-01-07 11:25:39 +01:00
Alex Moreno	860499db82	refactor(ticket): add more text in error when change zone	2022-01-07 08:28:57 +01:00
Alex Moreno	4f799d3e00	remove focus test	2022-01-07 08:10:13 +01:00