4067 Commits

Author	SHA1	Message	Date
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
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	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
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