4342 Commits

Author	SHA1	Message	Date
Alex Moreno	f21cdeb3b6	fix(item_waste): title background dark	2022-01-31 13:27:33 +01:00
Alex Moreno	78b3df0b6a	feat(monitor_ticket): classColor in db	2022-01-31 13:15:37 +01:00
Joan Sanchez	e618423ef8	Updated unit tests	2022-01-31 12:27:42 +01:00
Alex Moreno	746cbede4b	feat(client_defaulter): move tool-bar up , add column author	2022-01-31 08:17:15 +01:00
Joan Sanchez	78507240ee	Merge branch 'dev' into 3258-import_buys	2022-01-28 13:14:14 +00:00
Joan Sanchez	db54d92b69	Updated E2E	2022-01-28 14:11:26 +01:00
Joan Sanchez	c5ffc16486	Filters items with last item buy	2022-01-28 09:35:30 +01:00
Alex Moreno	072ac5fb6a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3052-client_defaulter	2022-01-28 09:28:13 +01:00
Alex Moreno	b25ffa8feb	feat(ticket_step-two): redirect to new ticket	2022-01-28 09:15:41 +01:00
Alex Moreno	38100eeda4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-27 15:15:08 +01:00
Carlos Jimenez Ruiz	abd758721e	Merge branch 'dev' into 3553-travel_summary	2022-01-27 09:36:22 +00:00
Carlos Jimenez Ruiz	d4d761150e	Merge branch 'dev' into 3549-travel_search-panel	2022-01-27 08:26:28 +00:00
Alex Moreno	74916c182a	Merge branch '3430-ticket_step-two' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-27 07:22:39 +01:00
Alex Moreno	d0c4099255	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-27 07:20:39 +01:00
Joan Sanchez	b991fe73b2	Merge branch 'dev' into 3536-DbUserSync	2022-01-26 13:45:50 +00:00
Alex Moreno	5970a6dfde	refactor(client_defaulter): title of columns	2022-01-26 14:05:33 +01:00
Alex Moreno	8e75a28f7c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3052-client_defaulter	2022-01-26 12:46:59 +01:00
Alex Moreno	65c32c9ed3	fix(travel_summary): vn-check change value to ng-model	2022-01-26 11:40:44 +01:00
Joan Sanchez	bacc0101db	Updated tests	2022-01-26 10:55:55 +01:00
Alex Moreno	0a8153d44c	feat(travel_search-panel): add continent filter	2022-01-26 10:09:47 +01:00
Joan Sanchez	f8f9ece4a5	refactor(importBuys): get data from last item buy ... Refs: 3258	2022-01-26 09:20:49 +01:00
Alex Moreno	f8a0094321	word movible	2022-01-26 08:54:48 +01:00
Alex Moreno	57e4b400c9	Merge branch '3430-ticket_step-two' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-26 07:12:57 +01:00
Alex Moreno	442d58f59b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-26 07:11:22 +01:00
Alex Moreno	f67a4355db	refactor(ticket_sale): split e2e, change name backTest	2022-01-25 15:09:29 +01:00
Alex Moreno	8794f8639f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3542-ticket_sale_payback	2022-01-25 15:04:52 +01:00
Alex Moreno	2455a24b68	feat(client_defaulter): section and test	2022-01-25 14:27:30 +01:00
Juan Ferrer	022c2cde3c	Merge branch 'dev' into 3536-DbUserSync	2022-01-25 11:18:50 +01:00
Javi Gallego	5fbbae7ac6	Merge branch 'dev' into 2883-invoiceIn-Booking	2022-01-24 15:40:37 +01:00
Javi Gallego	dad4119300	getTotal remove ()	2022-01-24 15:35:32 +01:00
Joan Sanchez	ddf62d2496	Updated back unit test	2022-01-21 16:16:39 +01:00
Alex Moreno	6d9afd5f4c	feat(ticket_sale): role restriction to create payBack	2022-01-21 11:40:48 +01:00
Juan Ferrer	997b7990d4	Docker connectTimeout && MySQL/MariaDB user sync	2022-01-20 15:33:53 +01:00
Joan Sanchez	4237cd56df	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-01-20 14:12:21 +01:00
Joan Sanchez	2c05ed7c37	Disabled auto load	2022-01-20 13:17:08 +01:00
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	cf2ad0d61e	feat(smartTag): added sort priority between multiple sorting ... Refs: 3528	2022-01-20 12:29:12 +01:00
Joan Sanchez	a9e8c5b374	Merge branch 'dev' into 3521-Monitors_ticket_summary	2022-01-20 11:03:33 +00:00
Carlos Jimenez Ruiz	3741417fd6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3521-Monitors_ticket_summary	2022-01-20 11:06:23 +01:00
Carlos Jimenez Ruiz	4ac071d55c	#3521 refactor(descriptor): navigation to index after deletion	2022-01-20 11:06:15 +01:00
Joan Sanchez	e3795ea072	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3245-print_refactor	2022-01-20 11:05:25 +01:00
Joan Sanchez	464bc6d767	Merge branch 'dev' into 3456-entry_basic-data	2022-01-20 09:48:08 +00:00
Javi Gallego	6d66ab7bea	getTotals without transaction	2022-01-20 10:05:24 +01:00
Joan Sanchez	74b7b0592e	feat(smartTag): added sort priority between multiple sorting ... Refs: 3528	2022-01-20 09:34:53 +01:00
Alex Moreno	9b5e9a617d	feat(entry_basic-data): add new filter in travels	2022-01-20 08:31:30 +01:00
Javi Gallego	563b93a7be	test front checkToBook	2022-01-19 14:21:19 +01:00
Javi Gallego	3c8e6a16a2	Merge branch 'dev' into 2883-invoiceIn-Booking	2022-01-19 14:19:29 +01:00
Joan Sanchez	0b2d62b2bf	Added axios as http package	2022-01-18 17:08:58 +01:00
Carlos Jimenez Ruiz	ef6d8db495	added supplierFk to advanced invoiceIn search	2022-01-18 14:44:41 +01:00
Joan Sanchez	352c3205bf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3245-print_refactor	2022-01-18 13:57:26 +01:00
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
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
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	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
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	b86c32c97b	fix(importBuy): prevent action	2022-01-14 08:06:38 +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
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	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	98e621305d	Merge branch 'dev' into 3490-sms	2022-01-12 10:29:49 +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
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	de28bfec8e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3490-sms	2022-01-10 15:09:08 +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
Alex Moreno	5462af91ee	extract to variable	2022-01-10 11:38:02 +01:00
Alex Moreno	1f79a3047d	feat(monitors_ticket): add isTooLittle	2022-01-07 11:26:16 +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
Alex Moreno	a528161b93	refactor(supplier.summary): separate isFarmer()	2022-01-07 08:08:41 +01:00
Vicent Llopis	74d7dad243	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3448-worker_calendar-payedHolidays	2022-01-07 07:50:39 +01:00
Alex Moreno	19a6b55a72	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary	2022-01-07 07:43:14 +01:00
Joan Sanchez	c24df3ade9	Updated translations	2022-01-05 16:23:58 +01:00
Joan Sanchez	4e6d8d17f5	Throw invalid businessType for new clients	2022-01-05 15:41:26 +01:00
Joan Sanchez	2279b3d9ab	Prevent businessTypeFk validation for other invalid fields	2022-01-05 15:17:21 +01:00
Alex Moreno	e1c9195495	update condition	2022-01-05 14:53:29 +01:00
Alex Moreno	ed84aa46bd	feat(client): add more condition for businessType Validation	2022-01-05 14:29:03 +01:00
Alex Moreno	961dc100cc	feat(client): add isWorker condition in hasBusinessType	2022-01-05 12:44:18 +01:00
Vicent Llopis	d5e4d99625	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3448-worker_calendar-payedHolidays	2022-01-05 12:30:49 +01:00
Carlos Jimenez Ruiz	d86aa5535c	refactor(createFromSales): now claimManager can claim any time	2022-01-04 16:16:39 +01:00
Alex Moreno	e4db123672	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary	2022-01-04 13:55:36 +01:00
Vicent Llopis	914fca0814	fix: delete unnecessary ng-if	2022-01-04 10:28:06 +01:00
Carlos Jimenez Ruiz	8dbd184cce	invoiceOut donwload test fixed for any year	2022-01-04 10:01:34 +01:00
Alex Moreno	2a9cc2f465	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary	2022-01-03 09:54:11 +01:00
Carlos Jimenez Ruiz	7dbf03ed72	front unit test and e2e for change state	2021-12-30 10:45:19 +01:00
Carlos Jimenez Ruiz	48e4628c48	refactor(ticket.summary): change state button is now dropdown	2021-12-30 09:49:11 +01:00
Alex Moreno	83a28bc0ee	test(supplier_summary): test for sageWithholdingFk to isFarmer	2021-12-29 11:52:45 +01:00
Alex Moreno	e9f77bb9b4	feat(supplier_summary): remove supplier.isFarmer and add verification by sageWithholdingFk	2021-12-29 11:51:56 +01:00
Carlos Jimenez Ruiz	a969f1f234	Merge branch 'dev' into 3449-client_credit	2021-12-24 10:48:15 +00:00
Carlos Jimenez Ruiz	652cbe937f	Merge branch 'dev' into 3433-supplier_account	2021-12-24 10:35:28 +00:00
Vicent Llopis	7d2820c7ee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3448-worker_calendar-payedHolidays	2021-12-24 11:30:47 +01:00
Vicent Llopis	ac833ac625	feat: add field payedHolidays	2021-12-24 11:30:28 +01:00
Carlos Jimenez Ruiz	a1da6081b5	Merge branch 'dev' into 3439-item_search-panel	2021-12-24 09:51:41 +00:00
Carlos Jimenez Ruiz	e7f1d7a1ee	Merge branch 'dev' into 3451-client_balance	2021-12-24 09:16:34 +00:00
Vicent Llopis	e1c4f144a7	feat: add code	2021-12-23 14:57:22 +01:00
Vicent Llopis	671a35f8c9	upload branch	2021-12-23 13:11:17 +01:00
Alex Moreno	6a78ac46c7	fix(client): check businesTypeFk before clientCredit insert	2021-12-23 08:53:56 +01:00
Alex Moreno	d1c7dea218	fix(supplier_account): get countryFk in model.js	2021-12-23 08:09:48 +01:00
Vicent Llopis	a6e5123949	feat: add filter by item.longName	2021-12-22 13:16:45 +01:00
Alex Moreno	9287f25f24	fix(client_balance): fix if value is 0	2021-12-22 09:46:18 +01:00
Alex Moreno	e609994efa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2021-12-21 21:01:18 +01:00
Alex Moreno	18b6efe8f1	test(ticket_basic-data): test and fixtures	2021-12-21 20:58:58 +01:00
Vicent Llopis	6bd48ab30b	delete comment	2021-12-21 15:06:57 +01:00
Vicent Llopis	19e50d2156	fix(ticket_sale): front test	2021-12-21 15:00:06 +01:00
Vicent Llopis	bdb42437ae	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3427-ticket_line-abono	2021-12-21 14:45:40 +01:00
Vicent Llopis	5c899d28c3	feat(ticket_sale): add tests and refactor backRoute name	2021-12-21 14:43:53 +01:00
Carlos Jimenez Ruiz	31da353f07	Merge branch 'dev' into 3457-smart_table_order	2021-12-21 11:44:16 +00:00
Joan Sanchez	1d28508cba	Removed vn-focus directive	2021-12-21 12:42:18 +01:00
Carlos Jimenez Ruiz	707c9c33f7	Merge branch 'dev' into 3273-supplier_billing-data	2021-12-21 11:27:34 +00:00
Joan Sanchez	76ec1fceae	fear(smart-table): now shows the default order with the column arrows ... Refs: 3457	2021-12-21 09:19:28 +01:00
Alex Moreno	831bfb0352	change route for hasRoute	2021-12-21 08:52:39 +01:00
Alex Moreno	405494c85b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3426-ticket_index	2021-12-21 08:31:17 +01:00
Vicent Llopis	e30fb0fb37	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3427-ticket_line-abono	2021-12-21 07:10:19 +01:00
Alex Moreno	f67edffcf1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3273-supplier_billing-data	2021-12-20 13:51:44 +01:00
Alex Moreno	50db693e51	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2021-12-20 13:50:50 +01:00
Alex Moreno	b0019d09ad	feat(ticket_basic-data_step-two): adapted for available and transfer sales in back	2021-12-20 13:50:31 +01:00
Carlos Jimenez Ruiz	1440f29784	Merge branch 'dev' into 3423-ticket_sale	2021-12-20 10:01:08 +00:00
Joan Sanchez	872f5b488b	Merge branch 'dev' into 3411-route_ticket_fixtures	2021-12-20 09:40:34 +00:00
Alex Moreno	6426a629e0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2021-12-20 09:26:54 +01:00
Alex Moreno	7a0221c17d	test(supplier): add backTest to check changes in isPayMethodChecked	2021-12-20 08:02:28 +01:00
Alex Moreno	bcc50b0618	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3273-supplier_billing-data	2021-12-20 07:33:52 +01:00
Carlos Jimenez Ruiz	d2db3054a5	Merge branch 'dev' into 3256-order_transactions	2021-12-17 14:15:41 +00:00
Carlos Jimenez Ruiz	7fbbe2fddd	ctx was poluted by tests	2021-12-17 15:14:31 +01:00
Joan Sanchez	da59a556ca	refactor(monitor): limited width to the client and zone columns ... Refs: 3458	2021-12-17 13:09:00 +01:00
Joan Sanchez	4cb346c2a8	fix(monitor): changed order to prevent row duplication ... Refs: 3458	2021-12-17 12:40:23 +01:00
Alex Moreno	850ea2ef39	getVisible sql	2021-12-17 12:38:56 +01:00
Carlos Jimenez Ruiz	d83995e64e	filter worker id refactor	2021-12-17 10:41:59 +01:00
Alex Moreno	138f2110e5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3273-supplier_billing-data	2021-12-16 12:15:47 +01:00
Carlos Jimenez Ruiz	5a448234d6	transtaction commits on several endpoints	2021-12-16 10:56:10 +01:00