4250 Commits

Author	SHA1	Message	Date
Joan Sanchez	a940d14256	fix(filterValue): fixed sql injection vulnerability ... Refs: 3369	2021-11-22 14:40:03 +01:00
Carlos Jimenez Ruiz	ff0a3acd6e	Merge branch 'dev' into 3379-payMethod_ibanRequired	2021-11-22 13:32:18 +00:00
Carlos Jimenez Ruiz	dd19ac975d	Merge branch 'dev' into 3338-worker_calendar	2021-11-22 13:18:53 +00:00
Vicent Llopis	cb81ad3722	delete unnecessay space	2021-11-22 14:02:21 +01:00
Vicent Llopis	709a300388	fix: extracting logic gates to constants	2021-11-22 13:44:22 +01:00
Vicent Llopis	abf3c1c84b	Merge branch '3338-worker_calendar' of https://gitea.verdnatura.es/verdnatura/salix into 3338-worker_calendar	2021-11-22 13:34:44 +01:00
Vicent Llopis	cdf7c20b16	feat(worker_createAbsense): update backTest	2021-11-22 13:34:42 +01:00
Vicent Llopis	a5ba02e2ec	feat(route_tickets): update frontTest	2021-11-22 13:28:12 +01:00
Vicent Llopis	fb6e443f03	feat(routes_tickets): button up when add tickets	2021-11-22 12:52:02 +01:00
Alex Moreno	80f651f37d	add entries less than a year ago	2021-11-22 12:34:20 +01:00
Alex Moreno	fe46dbd343	feat(entry_last-buys): add filter isFloramondo	2021-11-22 11:49:30 +01:00
Alex Moreno	97a66754a7	feat(item and entry): add back test	2021-11-22 08:58:54 +01:00
Alex Moreno	1e6805a161	remove unnecessary tabulation	2021-11-22 08:30:28 +01:00
Alex Moreno	d2729e67e9	feat(item and latest-buys: add supplier filter	2021-11-22 08:27:14 +01:00
Carlos Jimenez Ruiz	ca0c3be843	Merge branch 'dev' into 3381-item_diary-claim	2021-11-19 12:55:11 +00:00
Carlos Jimenez Ruiz	fad44c0b74	Merge branch 'dev' into 3374-itemPackingType	2021-11-19 11:59:50 +00:00
Carlos Jimenez Ruiz	e5977be502	Merge branch 'dev' into 3374-itemPackingType	2021-11-19 11:47:37 +00:00
Alex Moreno	e64e06b9ab	feat(client): change phone for payMethod in descriptor	2021-11-19 12:10:53 +01:00
Vicent Llopis	8f2e29787b	fix(payMethod): alter colums name	2021-11-19 10:07:33 +01:00
Alex Moreno	ac9ed90f4a	feat(item): modify item_getBalance and do test	2021-11-19 10:02:40 +01:00
Joan Sanchez	46d7a6e765	Added unit tests	2021-11-19 09:24:49 +01:00
Joan Sanchez	8c5f0d3019	feat(createClaim): disallow claim creation for a ticket delivered more than seven days ago ... Refs: 3278	2021-11-19 09:24:31 +01:00
Vicent Llopis	98195bf7b0	fix(route_tickets): dialog show the name of clients	2021-11-19 08:44:56 +01:00
Vicent Llopis	9de3db1961	fix(client_summary): show 10 tickets at least	2021-11-19 08:43:30 +01:00
Javi Gallego	c8e9416448	Merge branch 'dev' into 2883-invoiceIn-Booking	2021-11-19 07:33:54 +01:00
Carlos Jimenez Ruiz	92142c4f93	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3350-Smart_table_unit_tests	2021-11-18 17:00:33 +01:00
Joan Sanchez	c101bbb6be	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-11-18 16:10:11 +01:00
Joan Sanchez	9c5939b661	Updated styles	2021-11-18 16:02:47 +01:00
Carlos Jimenez Ruiz	cdc0d4dbe5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3350-Smart_table_unit_tests	2021-11-18 15:26:34 +01:00
Carlos Jimenez Ruiz	52cc927f85	Merge branch 'dev' into 3351-ticket_step-two-two	2021-11-18 14:10:23 +00:00
Carlos Jimenez Ruiz	c1adba3249	Merge branch 'dev' into 3338-worker_calendar	2021-11-18 14:01:25 +00:00
Carlos Jimenez Ruiz	334da3da9d	Merge branch 'dev' into 3370-client_create	2021-11-18 14:00:22 +00:00
Carlos Jimenez Ruiz	3eb7b4cf55	refactor(item.filter): buildFilter switch refactor	2021-11-18 14:49:05 +01:00
Alex Moreno	caf6320d53	feat(ticket): default ticketAction for salesAssistant	2021-11-18 14:27:05 +01:00
Joan Sanchez	c98730e6b9	Updated styles	2021-11-18 14:00:45 +01:00
Carlos Jimenez Ruiz	e31f98bfa9	Merge branch 'dev' into 3370-client_create	2021-11-18 12:57:33 +00:00
Carlos Jimenez Ruiz	2bfcaa810c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3341-item_search-panel	2021-11-18 12:40:50 +01:00
Joan Sanchez	ba60523012	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-11-18 12:31:43 +01:00
Joan Sanchez	5d2693f949	Updated latest buys icon	2021-11-18 12:23:21 +01:00
Alex Moreno	eea1e39a6a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3370-client_create	2021-11-18 12:21:31 +01:00
Alex Moreno	16c28cfa56	fix(client): validate businessType	2021-11-18 12:15:37 +01:00
Carlos Jimenez Ruiz	129e811271	Merge branch 'dev' into 3360-supplier_descriptor	2021-11-18 11:01:25 +00:00
Joan Sanchez	3ffbdc3fde	Updated fonts	2021-11-18 11:48:13 +01:00
Carlos Jimenez Ruiz	8676a1df90	updated method description	2021-11-18 11:28:11 +01:00
Carlos Jimenez Ruiz	4fc01e6a0d	typos corrected	2021-11-18 11:18:45 +01:00
Carlos Jimenez Ruiz	1d253fc53d	definitions corrected for myOptions of endpoints	2021-11-18 11:17:30 +01:00
Carlos Jimenez Ruiz	e53af13b3c	unit tests for smart table and ticket index	2021-11-18 11:04:51 +01:00
Carlos Jimenez Ruiz	a40e8ad2d8	Merge branch 'dev' into 3328-item_search-panel	2021-11-18 09:35:39 +00:00
Joan Sanchez	e9342af3f5	refactor(theme): enabled dark theme	2021-11-18 10:12:21 +01:00
Vicent Llopis	f87f60f00a	feat(item-itemPackingType): add model and dumpedFixtures	2021-11-18 09:16:36 +01:00
Javi Gallego	d46c590ccb	test	2021-11-18 08:21:02 +01:00
Javi Gallego	b936272898	Merge branch 'dev' into 2883-invoiceIn-Booking	2021-11-18 07:36:03 +01:00
Vicent Llopis	00a33fabb3	update backTest	2021-11-17 14:38:12 +01:00
Vicent Llopis	651a925708	feat(worker_calendar): only can choose one halfHoliday by year	2021-11-17 14:20:26 +01:00
Alex Moreno	40656da725	fix(zone): calendar event	2021-11-17 13:27:56 +01:00
Alex Moreno	146337b30f	change for error	2021-11-17 13:19:22 +01:00
Alex Moreno	a35d36b84f	fix(zone): calendar event	2021-11-17 13:15:59 +01:00
Alex Moreno	1a95b03359	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3364-zone_events	2021-11-17 12:38:52 +01:00
Alex Moreno	72c724c1e7	refactor(ticket): loadDefaultTicketAction()	2021-11-17 09:59:34 +01:00
Alex Moreno	b59cabe41a	feat(item): add filterParams in main	2021-11-17 09:11:26 +01:00
Alex Moreno	26815ad5a3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3341-item_search-panel	2021-11-17 08:36:35 +01:00
Alex Moreno	b45b8950fb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3351-ticket_step-two	2021-11-17 07:20:08 +01:00
Joan Sanchez	5672bfec7a	fix(client): businessTypeFk is not longer a required field	2021-11-16 15:23:54 +01:00
Alex Moreno	4981a41d0c	fix(supplier): delete verified supplier icon	2021-11-16 14:36:53 +01:00
Alex Moreno	6fa60e597a	refactor(item): activeBuyer.spec.js	2021-11-16 14:13:15 +01:00
Alex Moreno	f27420c14a	refactor(item): activeBuyers	2021-11-16 13:56:09 +01:00
Joan Sanchez	2bc20242e6	fix(salesMonitor): allow scope days to zero	2021-11-16 13:43:30 +01:00
Alex Moreno	23b567046b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3328-item_search-panel	2021-11-16 12:30:28 +01:00
Vicent Llopis	180fb95a00	feat(createAbsence): add backTest	2021-11-16 10:09:42 +01:00
Joan Sanchez	7894b32163	Merge pull request 'refactor(entry.buy): moved add button' (#780) from 3281-entry_buys_new into dev ... Reviewed-on: #780 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-11-16 09:05:11 +00:00
Carlos Jimenez Ruiz	6c02eca6cd	Merge branch 'dev' into 3281-entry_buys_new	2021-11-16 08:20:01 +00:00
Joan Sanchez	a6f8a682db	fix(fixed-price): confirm on deletion	2021-11-16 08:41:27 +01:00
Joan Sanchez	5b22892500	fix(fixed-price): changed active buyers endpoint and added pagination	2021-11-16 07:45:15 +01:00
Carlos Jimenez Ruiz	3f6e1ce9aa	refactor(entry.buy): moved add button	2021-11-15 18:24:01 +01:00
Alex Moreno	ec25df39e4	transaction activeWithBuyer.js	2021-11-15 14:50:02 +01:00
Vicent Llopis	7efb19ab83	feat(worker_calendar): add restriction to choose "Vacaciones 1/2 día"	2021-11-15 14:49:14 +01:00
Carlos Jimenez Ruiz	c011a82edc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table	2021-11-15 14:40:50 +01:00
Carlos Jimenez Ruiz	bdff28a465	removed unused code	2021-11-15 14:40:35 +01:00
Alex Moreno	54dc9aacaa	feat(item): add checkbox isFloramondo in search-panel	2021-11-15 13:53:18 +01:00
Alex Moreno	73211c5b3b	Merge branch '3328-item_search-panel' of https://gitea.verdnatura.es/verdnatura/salix into 3328-item_search-panel	2021-11-15 12:14:37 +01:00
Alex Moreno	adf295ebf3	fix(item): add ng-model, add fixture and transaction back test	2021-11-15 12:14:34 +01:00
Carlos Jimenez Ruiz	d69ee4a597	Merge branch 'dev' into 3328-item_search-panel	2021-11-15 09:34:48 +00:00
Carlos Jimenez Ruiz	8c5523a3d1	Merge branch 'dev' into 3317-client_create	2021-11-15 09:28:46 +00:00
Joan Sanchez	a41ab4d1dd	Merge pull request '3346-item_diary claim cambiar ruta' (#775) from 3346-item_diary into dev ... Reviewed-on: #775 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-15 09:19:04 +00:00
Alex Moreno	df7980f2f9	separate in two vn-horizontal	2021-11-15 10:16:23 +01:00
Joan Sanchez	fac1122438	Merge branch 'dev' into 3261-ticket_request	2021-11-15 09:14:55 +00:00
Carlos Jimenez Ruiz	4ef6e2b23b	Merge branch 'dev' into 3346-item_diary	2021-11-15 09:07:58 +00:00
Carlos Jimenez Ruiz	1f8a6b9636	Merge branch 'dev' into 3314-invoice-out_summary	2021-11-15 08:53:25 +00:00
Carlos Jimenez Ruiz	59cdf00134	Merge branch 'dev' into 3312-ibanRequired	2021-11-15 08:24:29 +00:00
Joan Sanchez	e62e57bcde	Monitor smart-table ammends	2021-11-15 08:45:21 +01:00
Alex Moreno	df6d547ad9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3328-item_search-panel	2021-11-15 08:34:40 +01:00
Alex Moreno	8a5ed6782a	feat(ticket): change default ticketUpdateOption for salesAssistant	2021-11-15 08:32:16 +01:00
Carlos Jimenez Ruiz	266b1c8073	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3256-order_transactions	2021-11-12 17:32:03 +01:00
Carlos Jimenez Ruiz	2e359fd8b7	Merge branch '2970-smart-table' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table	2021-11-12 16:14:14 +01:00
Joan Sanchez	3e35e7e0b8	Changed to single scope for all inputs	2021-11-12 14:15:35 +01:00
Alex Moreno	243113053e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3317-client_create	2021-11-12 13:10:43 +01:00
Alex Moreno	5faef913eb	feat(client): add field businessTypeFk and modify her tests	2021-11-12 13:10:11 +01:00
Carlos Jimenez Ruiz	aaed7c82f6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table	2021-11-12 11:45:57 +01:00
Carlos Jimenez Ruiz	62e03f4752	item create e2e fix	2021-11-12 11:03:23 +01:00
Joan Sanchez	02e651eac8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-11-12 09:45:05 +01:00
Joan Sanchez	f32db33ed9	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-11-12 09:43:50 +01:00
Joan Sanchez	93c766e3ca	fix(supplier): removed everyone read acl	2021-11-12 09:32:42 +01:00
Alex Moreno	6fe7875d73	change route	2021-11-12 09:28:19 +01:00
Alex Moreno	2581ce43a7	refactor(descriptor): separate es.yml	2021-11-12 08:32:15 +01:00
Joan Sanchez	c40a73b891	Merge branch '2970-smart-table' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table	2021-11-11 17:19:07 +01:00
Joan Sanchez	04da06d778	refactor(smart-table): style changes and added smart-table to sales monitor	2021-11-11 17:18:44 +01:00
Carlos Jimenez Ruiz	acd2d2e51f	front unit tests fix for lastests buys	2021-11-11 17:18:19 +01:00
Carlos Jimenez Ruiz	4fe7d4f566	ticket index rollback	2021-11-11 17:17:48 +01:00
Carlos Jimenez Ruiz	d2dc0bd147	multi check now behaves properly	2021-11-11 16:38:41 +01:00
Alex Moreno	dd47f209a2	feat(descriptor-menu): handle error empty input	2021-11-11 14:46:05 +01:00
Alex Moreno	509e002e34	feat(summary): get email	2021-11-11 13:14:34 +01:00
Alex Moreno	5c7efbb838	feat(item): back filter buyer in search panel ans test	2021-11-11 10:33:21 +01:00
Joan Sanchez	95dfd4c2dd	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-11-11 08:27:59 +01:00
Alex Moreno	62cdf52227	refactor(time-control): getWorkedHours.spec	2021-11-11 08:24:57 +01:00
Alex Moreno	a3bb3122ed	fix(time-control): modify select & refactor dates	2021-11-11 08:24:41 +01:00
Carlos Jimenez Ruiz	0bf553e11e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table	2021-11-10 17:07:39 +01:00
Carlos Jimenez Ruiz	d87e8ac226	refactor(entry.lastBuys): usage of smart table on latests buys	2021-11-10 17:07:16 +01:00
Vicent Llopis	41974669e5	fix(testBack): add context	2021-11-10 15:11:42 +01:00
Alex Moreno	7880fb8de9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3314-invoice-out_summary	2021-11-10 14:54:15 +01:00
Alex Moreno	f34130cbd7	feat(invoiceOut): separate index.js and jest test	2021-11-10 14:48:17 +01:00
Carlos Jimenez Ruiz	717ea60084	Merge branch 'dev' into 3116-client_balance	2021-11-10 13:40:56 +00:00
Vicent Llopis	d3ff60719c	fix(last-entries): dateFrom -75 days	2021-11-10 12:34:56 +01:00
Vicent Llopis	0849f40df7	feat: update backTest	2021-11-10 11:44:29 +01:00
Carlos Jimenez Ruiz	d8c3113adc	Merge branch 'dev' into 3308-supplier_basic-data	2021-11-10 09:57:06 +00:00
Alex Moreno	2ca48f2ae0	refactor(supplier): remove console.log	2021-11-10 10:48:05 +01:00
Carlos Jimenez Ruiz	766d9c6464	Merge branch 'dev' into 3319-worker_time-control	2021-11-10 09:38:54 +00:00
Vicent Llopis	18aec14fe9	update backTest	2021-11-10 08:46:09 +01:00
Alex Moreno	119d5e45b9	feat(supplier): add checkbox isPayMethodChecked	2021-11-10 08:43:25 +01:00
Alex Moreno	a52c06057f	feat(invoiceOut): separate descriptor	2021-11-09 15:10:43 +01:00
Vicent Llopis	833822978a	feat(client_balance): test e2e	2021-11-09 14:36:39 +01:00
Carlos Jimenez Ruiz	469c544536	item.index default columns and filter with like	2021-11-09 11:47:54 +01:00
Alex Moreno	0aa0358b50	refactor(events): name of variable	2021-11-09 10:21:28 +01:00
Alex Moreno	f45db68e0d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3319-worker_time-control	2021-11-09 10:10:20 +01:00
Alex Moreno	da80fee0e2	refactor(time-control): getWorkedHours.spec	2021-11-09 10:09:44 +01:00
Carlos Jimenez Ruiz	345be297f0	Merge branch 'dev' into 3116-client_balance	2021-11-09 08:26:41 +00:00
Alex Moreno	7009cc0cc0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3271-zone_calendar	2021-11-09 08:40:42 +01:00
Alex Moreno	9ab51fc21f	feat(eventsFiltered): add backTest & refactor zone	2021-11-09 08:39:20 +01:00
Carlos Jimenez Ruiz	e4ea05fd07	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table	2021-11-08 17:46:50 +01:00
Carlos Jimenez Ruiz	262e46d7c9	added autocompletes to item index	2021-11-08 17:46:40 +01:00
Vicent Llopis	395ad1c76d	fix(ibanRequired): set different ibanRequired for Client and Supplier	2021-11-08 15:04:33 +01:00
Joan Sanchez	eb36f86b9d	Added smart-table to item index	2021-11-08 14:46:23 +01:00
Alex Moreno	9e4627617d	fix(time-control): modify select & refactor dates	2021-11-08 14:08:44 +01:00
Joan Sanchez	2bf7250117	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-11-08 13:40:22 +01:00
Joan Sanchez	a48617e267	Group first	2021-11-08 13:39:12 +01:00
Vicent Llopis	bfbc9b50c4	feat(client_balance): add maxImport if "cash"	2021-11-08 13:02:42 +01:00
Joan Sanchez	7dc95b8cbf	Group first	2021-11-08 12:50:13 +01:00
Alex Moreno	9c877ceb7a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3271-zone_calendar	2021-11-08 11:31:26 +01:00
Alex Moreno	6e2f7d9e0d	feat(events): get range date of calendar	2021-11-08 11:30:00 +01:00
Vicent Llopis	fbbb1ecdf6	feat(client_balance): add maxImport if "cash"	2021-11-08 08:59:42 +01:00
Carlos Jimenez Ruiz	8fff96ca05	Merge branch 'dev' into 3295-claim_search-panel	2021-11-08 07:54:10 +00:00
Alex Moreno	3324f4acd2	fix(zone): back remoteMethod	2021-11-04 07:56:12 +01:00
Alex Moreno	bb0745532b	fix(claim): salesPersonFk where add officeBoss	2021-11-02 11:24:52 +01:00
Alex Moreno	b01298ed17	feat(entry_descriptor): add supplier button	2021-11-02 08:25:43 +01:00
Alex Moreno	b2dd9e6076	feat(zone): filter calendar	2021-11-02 07:55:35 +01:00
Carlos Jimenez Ruiz	04a31f4cff	vn table now receives show buttons options	2021-10-29 16:55:19 +02:00
Carlos Jimenez Ruiz	11f24372e5	autocomplete options added to smart table	2021-10-29 15:52:04 +02:00
Carlos Jimenez Ruiz	89b7f5ed7a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table	2021-10-28 13:46:41 +02:00
Joan Sanchez	dfb2b0b3d8	Updated checked property	2021-10-28 09:09:52 +02:00
Joan Sanchez	bfc9228eef	Restored ticket table and added table compatibility on contextmenu	2021-10-28 09:06:03 +02:00
Carlos Jimenez Ruiz	b27a443729	show/hide columns and load default view	2021-10-27 17:11:33 +02:00
Vicent Llopis	cd6f0057a1	test	2021-10-27 13:41:59 +02:00
Vicent Llopis	b1b6d93c8e	change column value : checkbox for text	2021-10-27 13:39:38 +02:00
Vicent Llopis	f60fa5a852	change receiver to requesterId	2021-10-27 12:22:32 +02:00
Vicent Llopis	d94e2900d0	feat(ticket-request): send rocket message when ticket-reques is denied	2021-10-27 12:16:37 +02:00
Alex Moreno	21686b4a92	feat(test): modify jest test	2021-10-27 09:55:35 +02:00
Carlos Jimenez Ruiz	c976f1ed07	multiple search by column feature	2021-10-26 17:16:01 +02:00
Alex Moreno	92b916580e	feat(description): concat bank with tickets	2021-10-26 10:20:35 +02:00
Joan Sanchez	bf386929d3	Deletion ammends and selection fixed	2021-10-25 17:18:57 +02:00
Carlos Jimenez Ruiz	7ce58c5f33	sorting arrows for multiple columns	2021-10-25 14:20:17 +02:00
Carlos Jimenez Ruiz	f62814e81e	refactor(order): catalogFilter, confirm and filter transactions	2021-10-25 13:13:05 +02:00
Joan Sanchez	6578a498ca	feat(exportation): added exportation report & send report with client invoicing ... Refs: 3254	2021-10-25 12:13:33 +02:00
Joan Sanchez	66830f32fd	feat(exportation): added exportation report & send report with client invoicing ... Refs: 3254	2021-10-25 11:58:23 +02:00
Joan Sanchez	d5264486c7	Simplified to one component	2021-10-23 14:26:42 +02:00
Carlos Jimenez Ruiz	13c06bf5be	refactor(monitors): added transactions to endpoints	2021-10-22 17:32:10 +02:00
Joan Sanchez	e6304d026c	feat(smart-table): added smart-table and smart-table-menu components	2021-10-22 15:01:54 +02:00
Joan Sanchez	2cdc22bc4d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-10-22 11:46:16 +02:00
Joan Sanchez	aa27ebffc9	renamed method	2021-10-22 10:47:44 +02:00
Joan Sanchez	8a679b2c8b	fix(invoice): fixed error for invoice with incoterms	2021-10-22 10:26:40 +02:00
Carlos Jimenez Ruiz	683f01ddd8	refactor(zone): removed deprecated column m3Max	2021-10-21 13:19:41 +02:00
Carlos Jimenez Ruiz	14a72b32bd	refactor(itemMaxSize): added itemMaxSize column and used it instead of m3Max	2021-10-21 11:37:09 +02:00
Carlos Jimenez Ruiz	5ea014aeff	feat(monitors): added auto-refresh feature to ticket monitors	2021-10-20 15:42:09 +02:00
Carlos Jimenez Ruiz	1c51d34f7d	feat(monitors): added auto-refresh feature to ticket monitors	2021-10-20 14:40:08 +02:00
Vicent Llopis	601d358b51	refactor(entry_summary): ident a line	2021-10-20 10:02:03 +02:00
Vicent Llopis	f6de57a9b5	Merge branch '3235-entry_summary' of https://gitea.verdnatura.es/verdnatura/salix into 3235-entry_summary	2021-10-20 07:50:55 +02:00
Vicent Llopis	4a5cf187a5	refactor(entry_summary): ident a line	2021-10-20 07:50:51 +02:00
Carlos Jimenez Ruiz	97242031eb	Merge branch 'dev' into 3235-entry_summary	2021-10-19 14:43:06 +00:00
Vicent Llopis	1ba7f16ad3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3235-entry_summary	2021-10-19 14:53:54 +02:00
Alex Moreno	b4986b619a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3105-ticket_sale	2021-10-19 14:50:39 +02:00
Carlos Jimenez Ruiz	5be2eb974f	refactor(test): adapted the new thermograph front unit test to expect thermograph data to be defined	2021-10-19 11:08:03 +02:00
Carlos Jimenez Ruiz	e3942c0bb9	refactor(thermograph): empty fields handler added and correct usage of thermograph.code	2021-10-19 10:58:58 +02:00
Alex Moreno	1cb0cda3a8	fix(sale): delete :: in image	2021-10-19 10:26:00 +02:00
Carlos Jimenez Ruiz	b41a0bd849	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3108-item_isBargain_isOnOffer_deprecation	2021-10-19 09:57:45 +02:00
Vicent Llopis	788bd76014	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3235-entry_summary	2021-10-19 07:34:53 +02:00
Carlos Jimenez Ruiz	fa067f94d9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3172-item_last-entries	2021-10-18 16:55:28 +02:00
Vicent Llopis	40ab2ce5bc	feat(entry_summary): add reference	2021-10-18 14:00:59 +02:00
Alex Moreno	44f174103c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3173-item_diary	2021-10-18 12:12:17 +02:00
Carlos Jimenez Ruiz	cec04a307d	refactor:(item): deprecation of isBargain and isOnOffer columns at model and fixtures	2021-10-18 12:05:38 +02:00
Vicent Llopis	e61e74ed36	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3172-item_last-entries	2021-10-18 10:27:59 +02:00
Alex Moreno	bf100f339e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3173-item_diary	2021-10-18 10:22:53 +02:00
Joan Sanchez	ee1a7952ad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3094-invoice_csv	2021-10-18 09:44:27 +02:00
Carlos Jimenez Ruiz	ace1c9c84b	fix(transaction): priceDifference now commits its created transaction	2021-10-15 16:02:50 +02:00
Carlos Jimenez Ruiz	c4c1aa929a	refactor(endpoints): corrected indentation and removed unused code	2021-10-15 16:00:50 +02:00
Carlos Jimenez Ruiz	de7af0fee2	fix(transaction): priceDifference now commits its created transaction	2021-10-15 15:59:59 +02:00
Carlos Jimenez Ruiz	270b2802c8	refactor(transactions): added transaction to sendChechingPresence and corrected a typo	2021-10-15 15:31:13 +02:00
Carlos Jimenez Ruiz	05df98939b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-10-15 14:47:34 +02:00
Carlos Jimenez Ruiz	580ba36357	refactor(jasmine): usage of done on async functions is deprecated	2021-10-15 14:45:41 +02:00
Joan Sanchez	d5cf57fbb1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-10-15 14:07:48 +02:00
Joan Sanchez	b6a9896cba	Fixed monitor problems filter	2021-10-15 12:10:28 +02:00
Joan Sanchez	85b4730c6c	feat(monitor): show client risk to future on tickets ... Refs: 2624	2021-10-15 10:49:23 +02:00
Vicent Llopis	6d05b046e8	feat(last-entries): add dateTo & delete style.scss	2021-10-15 10:34:32 +02:00
Carlos Jimenez Ruiz	99043bd94e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-10-14 16:21:55 +02:00
Carlos Jimenez Ruiz	b81d6b022c	refactor(buy): removed width limit for a column that was breaking e2e behavior	2021-10-14 16:18:04 +02:00
Carlos Jimenez Ruiz	35a2a71602	refactor(sales): transaction correctly passed to findById	2021-10-14 16:16:00 +02:00
Joan Sanchez	e278491ad2	refactor(order): index filter optimization	2021-10-14 08:48:57 +02:00
Joan Sanchez	d06385fc73	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-10-13 15:09:34 +02:00
Joan Sanchez	c0e1f2f0dc	Changed column order	2021-10-13 14:55:53 +02:00
Joan Sanchez	1b9b918812	Fixed format	2021-10-13 14:29:11 +02:00
Joan Sanchez	b2cdfd9785	Removed empty spaces	2021-10-13 14:29:01 +02:00
Joan Sanchez	31e160559b	fix(salesMonitor): now sorts correctly by practical and theorical hour ... Refs: 3219	2021-10-13 14:28:50 +02:00
Joan Sanchez	d951ca02f0	Fixed format	2021-10-13 14:21:42 +02:00
Joan Sanchez	491cca2bd6	Removed empty spaces	2021-10-13 14:19:29 +02:00
Joan Sanchez	a0a01de937	fix(salesMonitor): now sorts correctly by practical and theorical hour ... Refs: 3219	2021-10-13 14:17:45 +02:00
Alex Moreno	1684c1bf87	feat(diary): modify sql item_getBalance	2021-10-13 14:03:06 +02:00
Alex Moreno	a8f8248c41	feat(diary): Add column claim	2021-10-13 12:33:48 +02:00
Joan Sanchez	e641a947b3	Updated unit tests	2021-10-08 09:51:42 +02:00
Joan Sanchez	e6b60d73f1	Added unit tests	2021-10-07 13:36:23 +02:00
Joan Sanchez	4610ed83d9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3094-invoice_csv	2021-10-07 10:28:06 +02:00
Joan Sanchez	82a14088d0	Added options to invoiceOut	2021-10-07 10:04:50 +02:00
Carlos Jimenez Ruiz	8e05301792	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-10-07 09:58:32 +02:00
Carlos Jimenez Ruiz	cb7d1b24e8	refactor(ticket): all ticket endpoints are using transactions now	2021-10-07 09:57:07 +02:00
Javi Gallego	2dee9fec20	falta test checkToBook	2021-10-05 11:19:48 +02:00
Joan Sanchez	3d57e9a618	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-10-05 08:13:13 +02:00
Joan Sanchez	1ff3e1f429	Increased date range from +10 to +60 days	2021-10-05 08:12:25 +02:00
Joan Sanchez	b299efa63e	Changed zone_getShippedWarehouse() to zone_getShipped()	2021-10-04 14:58:38 +02:00
Joan Sanchez	bb4a32293d	Changed zone_getShippedWarehouse() to zone_getShipped()	2021-10-04 14:45:39 +02:00
Carlos Jimenez Ruiz	0b46e9ce35	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-10-04 10:21:09 +02:00
Joan Sanchez	6b59bdd01c	fix(descriptorMenu): show PDF regeneration option	2021-10-04 10:19:53 +02:00
Carlos Jimenez Ruiz	a61a7f7d49	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-10-04 09:37:27 +02:00
Joan Sanchez	495b06b932	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-10-04 09:37:15 +02:00
Joan Sanchez	b3a34489b0	fix(calendar): Event colors were not showing properly ... Refs: 3166	2021-10-04 09:30:55 +02:00
Carlos Jimenez Ruiz	16b27c2074	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-10-04 09:23:28 +02:00
Joan Sanchez	580231d30b	Updated unit tests	2021-10-01 14:59:12 +02:00
Joan Sanchez	313db4960e	refactor(invoice): Show generate PDF option if it was never generated before ... Refs: 3162	2021-10-01 14:59:08 +02:00
Joan Sanchez	68178bdb1f	Updated unit tests	2021-10-01 14:48:25 +02:00
Joan Sanchez	f60c754c59	refactor(invoice): Show generate PDF option if it was never generated before ... Refs: 3162	2021-10-01 14:31:42 +02:00
Joan Sanchez	1ec20e250c	feat(invoice): Send invoice and delivery-note on CSV format	2021-10-01 12:41:31 +02:00
Joan Sanchez	1c8bb35eae	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-10-01 11:41:55 +02:00
Joan Sanchez	3df03b31a3	fix(invoice): invalid date for PDF storage	2021-10-01 10:56:40 +02:00
Joan Sanchez	c80457142f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-10-01 08:18:56 +02:00
Joan Sanchez	a41ae85226	Removed PDF creation on download	2021-10-01 08:11:26 +02:00
Joan Sanchez	26df12a70a	fix(invoice): fixed pdf generation condition race	2021-09-30 15:28:34 +02:00
Joan Sanchez	54fa419255	fix(invoice): was storing invoices on incorrect path folder	2021-09-30 14:43:37 +02:00
Joan Sanchez	479d4892ce	Updated unit test	2021-09-29 12:23:55 +02:00
Joan Sanchez	a7c75fcbd4	fix(invoicePdf): Create PDF document on invoice download ... Refs: 3109, 3110	2021-09-29 12:23:47 +02:00
Joan Sanchez	458d2670b3	Updated unit test	2021-09-29 12:17:21 +02:00
Joan Sanchez	197ed2009f	fix(invoicePdf): Create PDF document on invoice download ... Refs: 3109, 3110	2021-09-29 12:15:42 +02:00
Carlos Jimenez Ruiz	156ecb32ec	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-09-29 08:27:53 +02:00
Carlos Jimenez Ruiz	392c4dcba3	refactor(sale): ticket.sale endpoints now use transactions	2021-09-29 08:27:18 +02:00
Carlos Jimenez Ruiz	e690febc7f	refactor(updateAll): usage of documented methods as update alias is not documented in loopback	2021-09-29 08:26:10 +02:00
Carlos Jimenez Ruiz	6cf1737c0d	refactor(thermograph): temperature column now displays the correct data	2021-09-28 11:59:04 +02:00
Javi Gallego	4f1fd5412d	faltan test	2021-09-28 10:57:51 +02:00
Joan Sanchez	06b49f36b6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-09-28 10:03:00 +02:00
Joan Sanchez	19d3b19e5a	Updated translation	2021-09-28 09:59:00 +02:00
Joan Sanchez	ee0e1e122b	Removed crudModel default params	2021-09-24 13:02:20 +02:00
Joan Sanchez	4ea0f92c35	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-09-24 12:54:22 +02:00
Joan Sanchez	4545a5c8fa	fix(filter): single search results don't use scopeDates	2021-09-24 12:51:20 +02:00
Carlos Jimenez Ruiz	8c446edc9e	Merge branch 'dev' into 3098-item_tag_productor	2021-09-24 08:02:19 +00:00
Carlos Jimenez Ruiz	c6692ca951	Merge branch 'dev' into 3059-ticket_index_filter	2021-09-24 07:54:50 +00:00
Carlos Jimenez Ruiz	5f0e2825b8	Merge branch 'dev' into 3059-ticket_index_filter	2021-09-24 07:46:09 +00:00
Carlos Jimenez Ruiz	7369f4aa54	Merge branch 'dev' into 3010-send_invoice	2021-09-24 07:44:24 +00:00
Carlos Jimenez Ruiz	14b92e530a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-09-24 09:37:37 +02:00
Javi Gallego	e5c9ea850b	testback done	2021-09-24 08:24:34 +02:00
Carlos Jimenez Ruiz	8fc17f05c6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3098-item_tag_productor	2021-09-23 17:35:07 +02:00
Carlos Jimenez Ruiz	368f54b872	refactor(tags): unified the style rules for tags under fetched-tags component and all display subName if present	2021-09-23 17:19:47 +02:00
Carlos Jimenez Ruiz	f74d2cc302	test(tags): moved code used on a single test to the correct place	2021-09-22 15:16:45 +02:00
Carlos Jimenez Ruiz	95ff46db09	refactor(buys): entry buys now show item.subName	2021-09-22 15:15:52 +02:00
Carlos Jimenez Ruiz	23ba5657c5	refactor(sales): ticket sales now shows item.subName	2021-09-22 15:14:29 +02:00
Carlos Jimenez Ruiz	c971d3ee01	refactor(consumption): client consuption now shows item.subName	2021-09-22 15:13:29 +02:00
Javi Gallego	40e589203e	test fixed	2021-09-22 07:42:58 +02:00
Carlos Jimenez Ruiz	aae54b5707	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-09-21 18:49:35 +02:00
Carlos Jimenez Ruiz	cc90a08f03	refactor(ticket): ticket endpoins now can receive transactions	2021-09-21 18:48:59 +02:00
Joan Sanchez	08cba0a9c8	fix(filter): search limit by date range was not being applied ... Refs: 3059	2021-09-21 15:49:59 +02:00
Javi Gallego	3365eadf5e	Merge branch 'dev' into 2995-supplierAccount-modificaciones	2021-09-21 14:02:07 +02:00
Joan Sanchez	6e89fa1b5e	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-09-21 12:56:49 +02:00
Joan Sanchez	689662f9bb	fix code duplication	2021-09-21 12:48:51 +02:00
Carlos Jimenez Ruiz	95b4d23599	added agency and route columns to client.summary tickets	2021-09-21 12:39:54 +02:00
Joan Sanchez	786589f214	fix(tickets): fixed ticket duplications on ticket summary and ticket index caused by pagination ... Refs: 3093	2021-09-21 12:25:22 +02:00
Joan Sanchez	cd478a9f7b	Removed line break	2021-09-20 14:02:04 +02:00
Joan Sanchez	369b79c6af	refactor(invoice): removed unnecessary class	2021-09-20 14:01:40 +02:00
Joan Sanchez	a0ac55bc3e	refactor(invoice): send invoice to specific email address from descriptor option ... Refs: 3010	2021-09-20 13:59:57 +02:00
Joan Sanchez	e07e8ec658	Merge branch 'dev' into 2389-calendar_weeks	2021-09-20 08:11:21 +00:00
Joan Sanchez	7223344aa0	Merge pull request 'fix(tickets): fixed ticket duplications on ticket summary and ticket index caused by pagination' (#736) from 3093-fix_dup_tickets into dev ... Reviewed-on: #736 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-09-17 09:59:29 +00:00
Joan Sanchez	01db0f6ece	Merge branch 'dev' into 3081-newbankentity_component_refactor	2021-09-17 07:47:25 +00:00
Carlos Jimenez Ruiz	b3c70de6e0	Merge branch 'dev' into 3093-fix_dup_tickets	2021-09-17 07:38:12 +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	d8a2302b18	refactor(newbankentity): both client.billingdata and supplier.account now use newbankentity component	2021-09-15 13:25:26 +02:00
Carlos Jimenez Ruiz	6e67dd408e	prevented an error if resultant length is 0	2021-09-13 10:29:35 +02:00