11269 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	e91730cdec	fix(sms): static response for backTest	2022-01-18 13:20:35 +01:00
Joan Sanchez	47c7b36936	CSV method refactor	2022-01-18 13:15:42 +01:00
Alex Moreno	9ddf11c6bc	test(ticket): update to advanceable	2022-01-18 12:49:16 +01:00
Alex Moreno	8e1c3e107c	refactor(ticket): advanceable code	2022-01-18 12:48:39 +01:00
Alex Moreno	b8355320f2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-17 14:50:10 +01:00
Carlos Jimenez Ruiz	983c2d5e8c	Merge pull request '3513-export_database' (#849) from 3513-export_database into dev ... Reviewed-on: #849 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-01-17 13:48:28 +00:00
Carlos Jimenez Ruiz	dc0a498b4d	Merge branch 'dev' into 3513-export_database	2022-01-17 13:02:32 +00:00
Carlos Jimenez Ruiz	3ac0485180	Merge pull request '3491-ticket_volume' (#847) from 3491-ticket_volume into dev ... Reviewed-on: #847 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-01-17 13:02:15 +00:00
Alex Moreno	4b2153d638	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-17 13:37:25 +01:00
Alex Moreno	83d2dd2d80	refacto(ticket_volume): tests and front js	2022-01-17 13:17:06 +01:00
Joan Sanchez	a8f56dce58	Updated prop types	2022-01-17 12:44:43 +01:00
Joan Sanchez	7d16d7aaf2	Closure refactor	2022-01-17 12:33:11 +01:00
Alex Moreno	b05f464517	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3491-ticket_volume	2022-01-17 10:14:58 +01:00
Alex Moreno	5824acf3bc	change tests to advanceable	2022-01-17 10:12:13 +01:00
Carlos Jimenez Ruiz	7fa1acec00	Merge pull request '3448-worker_calendar-payedHolidays' (#846) from 3448-worker_calendar-payedHolidays into dev ... Reviewed-on: #846 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-01-17 09:09:45 +00:00
Carlos Jimenez Ruiz	941d43b9a2	Merge branch 'dev' into 3448-worker_calendar-payedHolidays	2022-01-17 09:06:27 +00:00
Vicent Llopis	13ce7991ec	refactor: uppercase in model type	2022-01-17 09:49:45 +01:00
Alex Moreno	61859a23c9	feat(ticket): getAdvanceable	2022-01-17 07:14:29 +01:00
Carlos Jimenez Ruiz	f20f2ecf03	package-locks due to loopback vn-mysql error	2022-01-14 16:14:48 +01:00
Alex Moreno	0d06ae309b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-14 10:08:01 +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
Alex Moreno	245161375c	update database	2022-01-13 08:27:56 +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
Alex Moreno	c90a2b6e5c	update folder changes	2022-01-13 07:24:46 +01:00
Alex Moreno	c87e3e1210	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-13 07:20:23 +01: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
Alex Moreno	757fe73ecd	test(ticket_volume): backTest	2022-01-12 14:55:20 +01:00
Alex Moreno	c9564e817a	test(ticket_volume): frontTest	2022-01-12 14:04:16 +01:00
Alex Moreno	fba09e8c40	feat(ticket_volume): volume for packingType	2022-01-12 14:02:58 +01:00
Vicent Llopis	f387551835	add sql	2022-01-12 12:27:12 +01:00
Vicent Llopis	e850fdaf4e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3448-worker_calendar-payedHolidays	2022-01-12 12:15:32 +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