11264 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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
Carlos Jimenez Ruiz	36bac4725d	Merge pull request '3481-client add isWorker condition in hasBusinessType' (#839) from 3481-client_businessType into dev ... Reviewed-on: #839 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-01-05 15:28:09 +00: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
Joan Sanchez	63ea0902d1	refactor(print): print service refactor with better router handler ... Refs: 3245, 3477, 2800	2022-01-05 14:48:21 +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
Joan Sanchez	30da0b7ed1	Merge pull request 'refactor(createFromSales): now claimManager can claim any time' (#838) from 3483-ticket_sale_claim into dev ... Reviewed-on: #838 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-01-05 08:24:49 +00: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
Joan Sanchez	2a2c54e06a	Merge pull request '3476-detele_ticket_bug' (#837) from 3476-detele_ticket_bug into dev ... Reviewed-on: #837 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-01-04 11:17:29 +00:00
Carlos Jimenez Ruiz	b59e710104	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3476-detele_ticket_bug	2022-01-04 10:48:03 +01:00
Carlos Jimenez Ruiz	60aa908309	Merge pull request '3468-export-database' (#836) from 3468-export-database into dev ... Reviewed-on: #836 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-01-04 09:30:54 +00: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
Carlos Jimenez Ruiz	7b2b274cd5	.icon-deletedTicket icon name	2022-01-04 08:54:19 +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
Alex Moreno	644202ba0e	year in one line	2022-01-03 08:44:48 +01:00
Alex Moreno	db609c1713	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3468-export-database	2022-01-03 08:39:06 +01:00
Alex Moreno	e8a4a9cd8c	update today	2022-01-03 08:38:46 +01:00
Joan Sanchez	568d5fdb97	Merge pull request 'updated fixtured to amend failing test' (#835) from 3459-getSuggestedTickets_test_fix into dev ... Reviewed-on: #835 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-12-30 12:47:42 +00:00
Carlos Jimenez Ruiz	ea4fc5c262	updated fixtured to amend failing test	2021-12-30 12:08:05 +01:00
Joan Sanchez	100fef0a8e	Merge pull request 'refactor(ticket.summary): change state button is now dropdown' (#834) from 3432-ticket_summary_ok_button into dev ... Reviewed-on: #834 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-12-30 10:23:32 +00: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	a57999aaad	unnecessary space	2021-12-29 11:55:48 +01:00
Alex Moreno	83a28bc0ee	test(supplier_summary): test for sageWithholdingFk to isFarmer	2021-12-29 11:52:45 +01:00