12113 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Alex Moreno	8e274f4f17	refactor(travel): deprecated travelThermograph.temperature	2021-12-24 10:10:28 +01: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
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	3b5b490a78	Merge pull request 'fear(smart-table): now shows the default order with the column arrows' (#825) from 3457-smart_table_order into dev ... Reviewed-on: #825 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-12-21 12:45:38 +00: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	73f9de2743	Merge pull request '3273-feat(supplier): payMethodChecked for financial' (#818) from 3273-supplier_billing-data into dev ... Reviewed-on: #818 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-12-21 11:34:48 +00:00
Carlos Jimenez Ruiz	707c9c33f7	Merge branch 'dev' into 3273-supplier_billing-data	2021-12-21 11:27:34 +00:00
Carlos Jimenez Ruiz	35a24cecfa	Merge pull request '3426-ticket_search_panel filter by route' (#821) from 3426-ticket_index into dev ... Reviewed-on: #821 Reviewed-by: Joan Sanchez <joan@verdnatura.es> Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-12-21 11:08:16 +00:00
Joan Sanchez	9790f0cdb1	Updated unit tests	2021-12-21 10:37:29 +01:00
Alex Moreno	7a7bcf217a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2021-12-21 09:34:32 +01:00
Joan Sanchez	018e3cc8f6	Merge branch 'dev' into 3426-ticket_index	2021-12-21 08:29:15 +00:00
Joan Sanchez	79a6e66701	Merge pull request '3461-test(ticket_descriptor): repair' (#824) from 3461-e2e_ticket_descriptor into dev ... Reviewed-on: #824 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-12-21 08:21:39 +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
Alex Moreno	df34debcc6	test(ticket_descriptor): repair	2021-12-21 08:05:22 +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	412acfbff2	refactor(payment_afterInsert): email	2021-12-20 14:46:09 +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	2e604f61d9	Merge pull request '3423-ticket_descriptor add field client.id' (#822) from 3423-ticket_sale into dev ... Reviewed-on: #822 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-12-20 10:02:56 +00:00
Carlos Jimenez Ruiz	1440f29784	Merge branch 'dev' into 3423-ticket_sale	2021-12-20 10:01:08 +00:00