11436 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Alex Moreno	e9f77bb9b4	feat(supplier_summary): remove supplier.isFarmer and add verification by sageWithholdingFk	2021-12-29 11:51:56 +01:00
Alex Moreno	5401c1ebf6	export database and fixture train	2021-12-24 12:29:47 +01:00
Carlos Jimenez Ruiz	48e22f7762	Merge pull request '3449-client check businesTypeFk before clientCredit insert' (#832) from 3449-client_credit into dev ... Reviewed-on: #832 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-12-24 10:53:56 +00:00
Carlos Jimenez Ruiz	a969f1f234	Merge branch 'dev' into 3449-client_credit	2021-12-24 10:48:15 +00:00
Carlos Jimenez Ruiz	9f7e4a059b	Merge pull request '3433-supplier_account get countryFk in model.js' (#831) from 3433-supplier_account into dev ... Reviewed-on: #831 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-12-24 10:48:04 +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	67dc173f83	Merge pull request 'feat: add filter by item.longName' (#830) from 3439-item_search-panel into dev ... Reviewed-on: #830 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-12-24 10:12:32 +00:00
Carlos Jimenez Ruiz	a1da6081b5	Merge branch 'dev' into 3439-item_search-panel	2021-12-24 09:51:41 +00:00
Carlos Jimenez Ruiz	f07e92aa58	Merge pull request '3444-print_claim-pickup-order add client.phone' (#829) from 3444-print_claim-pickup-order into dev ... Reviewed-on: #829 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-12-24 09:51:20 +00:00
Carlos Jimenez Ruiz	ea51c53f08	Merge branch 'dev' into 3444-print_claim-pickup-order	2021-12-24 09:27:42 +00:00
Carlos Jimenez Ruiz	4b2c309672	Merge pull request '3451-client_balance fix amountToReturn is 0' (#828) from 3451-client_balance into dev ... Reviewed-on: #828 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-12-24 09:27:28 +00:00
Carlos Jimenez Ruiz	e7f1d7a1ee	Merge branch 'dev' into 3451-client_balance	2021-12-24 09:16:34 +00:00
Carlos Jimenez Ruiz	57a8c47283	Merge pull request '3427-ticket_line-abono' (#827) from 3427-ticket_line-abono into dev ... Reviewed-on: #827 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-12-24 09:14: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	5d3fedcbed	feat(print_claim-pickup-order): add client.phone	2021-12-22 12:52:14 +01:00
Alex Moreno	9287f25f24	fix(client_balance): fix if value is 0	2021-12-22 09:46:18 +01:00
Alex Moreno	1e6355cdde	fixtures	2021-12-22 08:37:50 +01:00
Alex Moreno	67dc5c2cbc	refactor(ticket_basic-data): test e2e	2021-12-22 08:11:33 +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