10916 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	8d8740a33b	Merge branch 'dev' into 2910-route_closure	2021-09-17 07:27:14 +00:00
Joan Sanchez	ad24432e54	Merge pull request '3086-monitor_index_hours' (#732) from 3086-monitor_index_hours into dev ... Reviewed-on: #732 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-09-17 07:26:54 +00:00
Carlos Jimenez Ruiz	183fe85e07	Merge branch 'dev' into 3086-monitor_index_hours	2021-09-17 07:22:12 +00:00
Joan Sanchez	079f99ca0d	fix(tickets): fixed ticket duplications on ticket summary and ticket index caused by pagination ... Refs: 3093	2021-09-17 08:50:22 +02:00
Joan Sanchez	4494522ad1	feat(calendar): component shows now the year week numbers ... Refs: 2389	2021-09-16 12:13:20 +02:00
Carlos Jimenez Ruiz	34038b885c	refactor(newBankEntity): client.billingData and supplier.account refactor to use newBankEntity Dialog	2021-09-15 17:58:58 +02:00
Carlos Jimenez Ruiz	47e70f7c3c	refactor(newbankentity): the component now extends from Dialog	2021-09-15 15:54:54 +02:00
Carlos Jimenez Ruiz	e81c1046f6	test(e2e): e2e and selectors amended according to newbankentity refactor	2021-09-15 13:26:08 +02:00
Carlos Jimenez Ruiz	d8a2302b18	refactor(newbankentity): both client.billingdata and supplier.account now use newbankentity component	2021-09-15 13:25:26 +02:00
Carlos Jimenez Ruiz	0f1b33802e	refactor(newbankentity): added id as entity code input + translation	2021-09-15 13:24:01 +02:00
Joan Sanchez	59efc24077	Updated unit test	2021-09-14 11:26:22 +02:00
Joan Sanchez	c442073eae	feat(upload-photo): added options to choose between upload from computer or external url ... Refs: 2627	2021-09-14 09:33:23 +02:00
Joan Sanchez	25fb02deff	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-09-13 10:30:56 +02:00
Joan Sanchez	c5491bc4ab	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-09-13 10:30:34 +02:00
Carlos Jimenez Ruiz	6e67dd408e	prevented an error if resultant length is 0	2021-09-13 10:29:35 +02:00
Joan Sanchez	f5b1eb3ccd	feat(closure): send to driver the route report on route closure	2021-09-10 10:38:19 +02:00
Carlos Jimenez Ruiz	087a5e9404	Merge pull request 'refactor(client): added restriction to change the credit amount from zero set by a manager' (#731) from 3087-client_credit into dev ... Reviewed-on: #731 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-09-09 14:49:49 +00:00
Joan Sanchez	b0d291e49c	Fixed error for clients without a previous credit	2021-09-09 16:44:15 +02:00
Carlos Jimenez Ruiz	f7e2dd25e4	refactor(monitors): added column practicalHour to tickets monitor and renamed two columns	2021-09-09 16:07:46 +02:00
Carlos Jimenez Ruiz	46b59473a3	refactor(lastbuyrefresh): moved last buy refresh calls to fixtures + some more fixtures	2021-09-09 16:06:44 +02:00
Joan Sanchez	e8792d5686	refactor(client): added restriction to change the credit amount from zero set by a manager ... Refs: 3087	2021-09-09 14:43:18 +02:00
Joan Sanchez	001b712c14	Merge pull request '3049-item_index_show_lastbuy_landed' (#730) from 3049-item_index_show_lastbuy_landed into dev ... Reviewed-on: #730 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-09-08 14:20:22 +00:00
Carlos Jimenez Ruiz	76c55cb551	Merge branch 'dev' into 3049-item_index_show_lastbuy_landed	2021-09-08 09:27:23 +00:00
Carlos Jimenez Ruiz	4c6d5cfa64	Merge pull request 'refactor(isTaxDataChecked): client fiscal data now needs business type to change isTaxDataChecked' (#729) from 3065-client_businessTypeFk_required into dev ... Reviewed-on: #729 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-09-08 09:26:43 +00:00
Carlos Jimenez Ruiz	4daf2e12b2	Merge branch '3065-client_businessTypeFk_required' of https://gitea.verdnatura.es/verdnatura/salix into 3065-client_businessTypeFk_required	2021-09-08 11:24:38 +02:00
Carlos Jimenez Ruiz	a0fd0ba8f3	refactor(fiscaldata): added translation for the backend error	2021-09-08 11:22:59 +02:00
Carlos Jimenez Ruiz	8370b5dc1d	refactor(fiscaldata): isTaxDataChecked checkbox no longer disabled by businessType presence	2021-09-08 11:03:58 +02:00
Javi Gallego	8160912fe7	Merge branch 'dev' into 2995-supplierAccount-modificaciones	2021-09-08 10:41:26 +02:00
Carlos Jimenez Ruiz	0472deb9b4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3049-item_index_show_lastbuy_landed	2021-09-08 10:40:07 +02:00
Carlos Jimenez Ruiz	538805828e	refactor(item): item index now shows last buy landing	2021-09-08 10:39:54 +02:00
Joan Sanchez	ed2922b185	Merge branch 'dev' into 3065-client_businessTypeFk_required	2021-09-08 08:13:04 +00:00
Joan Sanchez	e1de1154ad	Merge pull request 'refactor(isTaxDataChecked): client fiscal data now needs business type to change isTaxDataChecked' (#728) from 3065-client_businessTypeFk_required into dev ... Reviewed-on: #728 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-09-08 08:06:35 +00:00
Carlos Jimenez Ruiz	398e79c069	Merge branch 'dev' into 3065-client_businessTypeFk_required	2021-09-08 07:55:55 +00:00
Carlos Jimenez Ruiz	41011091ff	Merge pull request 'feat(monitor): Sort by amount of problems on a ticket list' (#723) from 3041-monitor_sort_problems into dev ... Reviewed-on: #723 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-09-08 07:53:06 +00:00
Javi Gallego	2fe4fad28a	test front ok	2021-09-08 09:44:46 +02:00
Joan Sanchez	903caef155	fix(path): Was not showing the old inactive client	2021-09-08 08:39:37 +02:00
Joan Sanchez	db538a3f6f	Merge branch 'dev' into 3041-monitor_sort_problems	2021-09-08 06:11:39 +00:00
Joan Sanchez	29bc0c04fb	test(monitor): Updated back unit tests	2021-09-08 08:08:10 +02:00
Carlos Jimenez Ruiz	99f4a2ed7d	refactor(isTaxDataChecked): client fiscal data now needs business type to change isTaxDataChecked	2021-09-07 16:07:46 +02:00
Carlos Jimenez Ruiz	fa54dc5fa9	Merge pull request 'fix(osticket): Filter by non-merged tickets' (#727) from 3080-osticket_report into dev ... Reviewed-on: #727 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-09-07 10:17:50 +00:00
Carlos Jimenez Ruiz	21c34b90ec	Merge branch 'dev' into 3080-osticket_report	2021-09-07 10:16:02 +00:00
Joan Sanchez	afece39bdc	Merge pull request '3061-send_thermograph' (#725) from 3061-send_thermograph into dev ... Reviewed-on: #725 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-09-07 10:14:38 +00:00
Joan Sanchez	2bf55f04bc	fix(osticket): Filter by non-merged tickets	2021-09-07 12:12:58 +02:00
Carlos Jimenez Ruiz	2ce79a8d49	Merge branch 'dev' into 3061-send_thermograph	2021-09-07 10:10:09 +00:00
Carlos Jimenez Ruiz	471da0f4da	fix(clone): invoiceIn clone now adds (2) to the ref	2021-09-07 11:55:26 +02:00
Carlos Jimenez Ruiz	c7558dfb0b	refactor(temperatures): added crudmodel autoload for temperatures	2021-09-07 11:54:53 +02:00
Carlos Jimenez Ruiz	8bdb02c0fc	refactor(createThermograph): endpoint rollsback only if transaction was created in it	2021-09-07 10:30:53 +02:00
Joan Sanchez	6ca7ced067	refactor(monitor): removed unused code	2021-09-07 10:27:19 +02:00
Carlos Jimenez Ruiz	7c66517964	Merge pull request 'fix(bank): the search by bank was not searching by numerical and string values' (#724) from 3084-client_balance_bank into dev ... Reviewed-on: #724 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-09-07 08:09:21 +00:00
Joan Sanchez	04a817c4f9	fix(problems): problems filter was not working properly on sales monitor ... Refs: 3040	2021-09-07 07:41:57 +02:00