4906 Commits

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	bdf4ecdf50	Merge branch 'dev' into 4223-claim_observations	2022-06-28 07:03:44 +00:00
Javi Gallego	4c5c51a319	claim basic-data minor bug	2022-06-27 18:20:26 +02:00
Alex Moreno	8e2ed4e182	fix(worker_getWorkedHours): fix fixtures and test	2022-06-27 15:09:43 +02:00
Alex Moreno	7980a941a9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests	2022-06-27 14:03:24 +02:00
Alex Moreno	a98a927663	fix back test and e2e that now fail	2022-06-27 11:17:45 +02:00
Carlos Jimenez Ruiz	6370471bd5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4223-claim_observations	2022-06-27 11:01:42 +02:00
Vicent Llopis	fcf79a507c	Merge branch 'dev' into 4213-item.summary	2022-06-27 05:32:21 +00:00
Alex Moreno	4155b45785	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests	2022-06-27 07:22:43 +02:00
Carlos Jimenez Ruiz	d183ccb843	feat(claim.notes): added the observations setction to claim plus refactors	2022-06-25 15:22:47 +02:00
Alex Moreno	4d4e09fb9f	test(worker_time-control): new backTest and e2e using workerTimeControl_clockIn	2022-06-23 14:07:53 +02:00
Carlos Jimenez Ruiz	3c963b5ab2	refactor(routes json): fixed indentation	2022-06-22 16:42:59 +02:00
Vicent Llopis	2c721867fc	feat(item.summary): add description	2022-06-22 14:30:25 +02:00
Joan Sanchez	2381a5d09a	Updated e2e tests	2022-06-22 12:40:11 +02:00
Joan Sanchez	2a758fd12a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4045-incoterms_authorization	2022-06-22 11:38:01 +02:00
Joan Sanchez	f7d64e89ab	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-22 08:59:06 +02:00
Joan Sanchez	004f1390fc	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-06-22 08:58:51 +02:00
Joan Sanchez	e7bf88c703	Fix order	2022-06-21 14:26:34 +02:00
Alex Moreno	20f886e933	change email and text info in email field	2022-06-21 13:58:47 +02:00
Alex Moreno	17fd50ee33	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4088-client_web-access_email	2022-06-21 13:40:24 +02:00
Joan Sanchez	9751514b10	Merge branch 'dev' into 4138-ticket_create_address_isActive	2022-06-21 11:15:33 +00:00
Joan Sanchez	e5b1bfeec2	Merge branch 'dev' into 4231-worker.calendar_payedHolidays	2022-06-21 10:59:46 +00:00
Vicent Llopis	ec852b898c	fix: check if services exists	2022-06-21 12:44:19 +02:00
Joan Sanchez	16d677528a	FIX: Sort by id as last field	2022-06-21 12:18:33 +02:00
Alex Moreno	8d9d64b49d	feat(client_web-access): add email field	2022-06-20 07:31:10 +02:00
Carlos Jimenez Ruiz	7c580da6b8	refactor(ticket.create): display only active addresses	2022-06-17 16:42:59 +02:00
Carlos Jimenez Ruiz	ba0975fe0e	Merge branch 'dev' into 4081-ticket.setDeleted	2022-06-17 10:48:18 +00:00
Carlos Jimenez Ruiz	c22e36ff1e	Merge branch 'dev' into 4081-ticket.setDeleted	2022-06-17 10:45:13 +00:00
Vicent Llopis	6611fcb40e	fix: show correct payedHolidays	2022-06-17 12:34:33 +02:00
Joan Sanchez	9250cc78ff	Merge branch 'dev' into 4197-entry.lastetBuysFilter	2022-06-17 10:34:00 +00:00
Carlos Jimenez Ruiz	1e504b6b9f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2808-e2e_account_descriptor	2022-06-16 16:46:33 +02:00
Carlos Jimenez Ruiz	e151e35f7e	replaced isActive by active as per it's model and updated original data in controller	2022-06-16 16:25:21 +02:00
Carlos Jimenez Ruiz	aa6ec3f770	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4185-secure_client_pass_changes	2022-06-16 12:01:05 +02:00
Carlos Jimenez Ruiz	0f44f072ee	refactor(client): added updateUser and setPassword methods to client module	2022-06-16 11:32:42 +02:00
Vicent Llopis	00e48f5257	feat: add backTest	2022-06-16 10:59:31 +02:00
Vicent Llopis	84ffe3f594	feat: delete from ticketCollection and sectorCollection when a ticket is deleted	2022-06-16 09:58:15 +02:00
Vicent Llopis	f41b9b0b57	refator: delete console.log	2022-06-15 14:25:31 +02:00
Vicent Llopis	f3cca1c930	fix: warehouse changed from 'silla' to 'algemesi'	2022-06-15 14:24:35 +02:00
Alex Moreno	8474fb5692	Merge branch 'dev' into 3498-staticDate	2022-06-15 07:15:34 +00:00
Vicent Llopis	363c5f349a	fix: solved bug to create temporary table	2022-06-13 10:04:12 +02:00
Alex Moreno	5e586bf1d0	test(client_defaulter): getBalanceDueTotal tested	2022-06-13 07:44:21 +02:00
Joan Sanchez	9ab8b84290	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4045-incoterms_authorization	2022-06-10 13:16:27 +02:00
Carlos Jimenez Ruiz	096f225656	Merge branch 'dev' into 4024-client_defaulter	2022-06-10 07:21:54 +00:00
Alex Moreno	de0f7c98fa	Merge branch 'dev' into 3653-clientInsurance	2022-06-10 05:32:58 +00:00
Alex Moreno	f74c7a6999	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4024-client_defaulter	2022-06-09 15:13:04 +02:00
Alex Moreno	f786cdd33d	fix pass dates	2022-06-09 14:39:51 +02:00
Alex Moreno	eb9bd66ddb	prepare for static dates	2022-06-09 13:33:01 +02:00
Carlos Jimenez Ruiz	92088c00f7	Merge branch 'dev' into 4163-supplier.account	2022-06-09 09:04:14 +00:00
Carlos Jimenez Ruiz	ad8eace5cb	Merge branch 'dev' into 3817-updatePortfolio	2022-06-09 07:52:52 +00:00
Vicent Llopis	fb7f26216c	feat: update combo "Banck entity"	2022-06-09 08:43:33 +02:00
Alex Moreno	7eec9de0aa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate	2022-06-09 07:47:03 +02:00
Alex Moreno	61cc3c19f3	refactor(client): creditInsuarnce change creditClassification for creditClassificationFk	2022-06-09 07:13:54 +02:00
Vicent Llopis	aa99424476	deleted unnecessary 'await'	2022-06-08 12:50:32 +02:00
Joan Sanchez	c92f444776	Ammends	2022-06-07 14:59:18 +02:00
Carlos Jimenez Ruiz	27e8c99604	Merge branch 'dev' into 4067-client_detail	2022-06-07 12:50:37 +00:00
Carlos Jimenez Ruiz	6ebcf4bc02	Merge branch 'dev' into 3817-updatePortfolio	2022-06-07 12:35:31 +00:00
Joan Sanchez	58a1eea642	Merge branch 'dev' into 4111-claim.summary	2022-06-07 12:27:12 +00:00
Joan Sanchez	13e0772f0b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-03 14:28:39 +02:00
Alex Moreno	4e3380cf65	hotFix(ticket_expedition): delete e.checked in filter	2022-06-02 15:28:11 +02:00
Juan Ferrer	ea0a43d0fb	Merge branch 'dev' into 4108-mdb_backend	2022-06-02 06:45:50 +00:00
Joan Sanchez	b6d0d9f210	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-01 14:26:20 +02:00
Joan Sanchez	fab4705618	Rollback	2022-06-01 14:01:19 +02:00
Joan Sanchez	4ecffc2448	Merge branch 'dev' into 4067-client_detail	2022-06-01 11:45:02 +00:00
Joan Sanchez	a4a9ea45b7	Removed front unit test	2022-06-01 13:44:07 +02:00
Joan Sanchez	571e2f03d3	Removed focus	2022-06-01 13:07:47 +02:00
Joan Sanchez	0faabeb145	Added back unit tests	2022-06-01 13:07:28 +02:00
Joan Sanchez	0bc48dc27b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-01 09:39:53 +02:00
Joan Sanchez	4ac26895ba	fix(regularizeClaim): refound with negative quantity ... Refs: #4148	2022-06-01 09:36:47 +02:00
Alex Moreno	8340041b33	throw userError and maxFileSize	2022-06-01 07:57:32 +02:00
Joan Sanchez	c369453bfc	Added model fields	2022-05-31 13:36:27 +02:00
Vicent Llopis	0c996f7915	fix: excluded backTest fixed	2022-05-31 12:23:56 +02:00
Alex Moreno	7c7c64415d	fix(monitor_ticket): add isTooLittle problem	2022-05-31 12:00:15 +02:00
Alex Moreno	cac4e74793	refactor	2022-05-31 09:06:15 +02:00
Joan Sanchez	a5e833af2c	feat(client): detail section with smart-table	2022-05-31 07:56:17 +02:00
Alex Moreno	1e2f827233	fix	2022-05-27 13:39:33 +02:00
Alex Moreno	863977915e	fix	2022-05-27 13:27:05 +02:00
Alex Moreno	2b10abbe24	typo	2022-05-27 10:08:40 +02:00
Alex Moreno	ff264ab930	hotFix(client): fiscal-data edit by salesAssistant	2022-05-27 09:45:08 +02:00
Alex Moreno	aa7074f303	test(mdb): back test	2022-05-27 08:23:52 +02:00
Joan Sanchez	a5f3580b17	derp	2022-05-26 16:14:10 +02:00
Alex Moreno	79c42d04f9	feat(mdb): start section	2022-05-25 14:59:28 +02:00
Vicent Llopis	4baf1afb83	fix: show videos in claim.summary	2022-05-25 07:51:47 +02:00
Joan Sanchez	f9b9dfaf4b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-05-24 14:54:06 +02:00
Joan Sanchez	caa9a63c4c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2022-05-24 08:45:37 +02:00
Carlos Jimenez Ruiz	c721d9ae82	Merge branch 'dev' into 4022-client.balance.create	2022-05-23 12:43:00 +00:00
Carlos Jimenez Ruiz	a76dd11825	Merge branch 'dev' into 3870-models	2022-05-23 12:33:08 +00:00
Vicent Llopis	db7638f153	refactor: sectorFk property deleted	2022-05-23 12:45:20 +02:00
Vicent Llopis	9bbdeb2840	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType	2022-05-23 12:41:01 +02:00
Vicent Llopis	1b3f0ee026	refactor: added itemPackingType and temperature relations	2022-05-23 12:40:11 +02:00
Vicent Llopis	9736a68dd9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4022-client.balance.create	2022-05-20 13:16:58 +02:00
Vicent Llopis	875e9503c3	refactor: request changes	2022-05-20 13:16:47 +02:00
Vicent Llopis	a043c5d346	refactor: request changes	2022-05-20 13:10:48 +02:00
Carlos Jimenez Ruiz	d86ac41b70	Merge branch 'dev' into 3905-invoice-out_refund	2022-05-20 10:54:08 +00:00
Vicent Llopis	f4b080243c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3870-models	2022-05-20 12:53:23 +02:00
Vicent Llopis	fd80fc58fc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType	2022-05-20 12:33:23 +02:00
Vicent Llopis	3c9800a7a3	refactor: pull request changes	2022-05-20 12:33:12 +02:00
Joan Sanchez	4d093d37bd	Merge branch 'dev' into 3905-invoice-out_refund	2022-05-20 10:22:48 +00:00
Carlos Jimenez Ruiz	b3c0aa7933	Merge branch 'dev' into 4082-zone.basic-data	2022-05-20 10:19:00 +00:00
Vicent Llopis	c125fd54eb	refactor: pull request changes	2022-05-20 12:08:12 +02:00
Vicent Llopis	0425b17b4e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3905-invoice-out_refund	2022-05-20 11:57:20 +02:00
Vicent Llopis	69e12e0dd8	refactor: 'bonus' can be a negative value	2022-05-20 09:21:33 +02:00
Carlos Jimenez Ruiz	ed4718922e	prevented logs on non-existent clients	2022-05-17 15:37:52 +02:00
Alex Moreno	4a9c5742c0	fix(entry_latest-buys): fix multi_check	2022-05-17 13:50:06 +02:00
Vicent Llopis	605ab2ec62	refactor: delete sms.detinationFk	2022-05-17 12:37:54 +02:00
Vicent Llopis	eeede417eb	feat: update date depending of accountingType	2022-05-17 12:24:35 +02:00
Vicent Llopis	ebbb0466a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3870-models	2022-05-17 10:13:05 +02:00
Vicent Llopis	76515bdd3f	add: search-panel	2022-05-17 09:54:49 +02:00
Vicent Llopis	3335cb8a01	feat(item.itemType): add fields	2022-05-17 08:32:45 +02:00
Vicent Llopis	7ad56327a1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType	2022-05-17 08:21:49 +02:00
Alex Moreno	a37be3e5fe	refactor(client_defaulter): search in smart-table	2022-05-16 14:30:48 +02:00
Alex Moreno	8bcdf96aad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4024-client_defaulter	2022-05-16 14:15:37 +02:00
Carlos Jimenez Ruiz	d31f7f1b6b	all type Dates replaced to date as per convention	2022-05-16 10:19:43 +02:00
Carlos Jimenez Ruiz	b5ccd32800	Merge branch 'dev' into 3409-clientCredit_maxRows	2022-05-16 07:23:08 +00:00
Vicent Llopis	10cd9c5b87	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3893-supplier.fiscal-data	2022-05-16 07:22:16 +02:00
Carlos Jimenez Ruiz	990f7fe4b1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into gulp-jasmine_deprecation	2022-05-13 18:37:48 +02:00
Joan Sanchez	9cbee7a38a	Merge branch 'dev' into 3771-ticket.expedition	2022-05-13 13:05:08 +00:00
Joan Sanchez	913b76880a	Merge branch 'dev' into 3977-invoiceIn.tax	2022-05-13 12:59:30 +00:00
Joan Sanchez	f8db3c31df	Proper test result	2022-05-13 10:02:34 +02:00
Joan Sanchez	6b18432f87	Force test to fail	2022-05-13 09:53:47 +02:00
Alex Moreno	ec49dd67be	refactor(client_defaulter)	2022-05-12 14:18:16 +02:00
Carlos Jimenez Ruiz	cce1d93dde	jasmine reporters config for CI	2022-05-12 11:43:41 +02:00
Javi Gallego	0d63f3c3af	Merge branch 'dev' into 3851-dms_delete	2022-05-12 11:13:34 +02:00
Alex Moreno	5021315ed4	refactor(clientCredit): test and types	2022-05-12 09:47:47 +02:00
Vicent Llopis	6441393249	refactor: pull request changes	2022-05-12 08:47:17 +02:00
Vicent Llopis	568579f461	refactor: pull request changes	2022-05-12 08:27:04 +02:00
Alex Moreno	7f46d4e50a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3409-clientCredit_maxRows	2022-05-12 08:06:39 +02:00
Alex Moreno	af1fa8051f	refactor(clientCredit): refactor test	2022-05-12 08:06:30 +02:00
Vicent Llopis	16fdf982c8	feat(item.itemtype): add frontTest	2022-05-12 07:40:24 +02:00
Carlos Jimenez Ruiz	833addcb75	gulp-jasmine replaced by jasmine	2022-05-11 19:38:10 +02:00
Vicent Llopis	13a6f1f8c1	feat(item): add section itemType	2022-05-11 14:47:54 +02:00
Joan Sanchez	d39147689d	Merge branch 'dev' into 3771-ticket.expedition	2022-05-11 12:47:33 +00:00
Joan Sanchez	afe4f0ba94	Merge branch 'dev' into 3977-invoiceIn.tax	2022-05-11 12:46:39 +00:00
Vicent Llopis	734f9cb60d	feat(item.itemType): added section itemType	2022-05-11 07:28:17 +02:00
Carlos Jimenez Ruiz	a7b56b3b89	Merge branch 'dev' into 3327-global_invoicing	2022-05-10 12:19:31 +00:00
Carlos Jimenez Ruiz	a47c0dbaea	Merge branch 'dev' into 3752-claim_action	2022-05-10 11:47:14 +00:00
Carlos Jimenez Ruiz	0e65f382f9	Merge branch 'dev' into 3752-claim_action	2022-05-10 11:36:35 +00:00
Alex Moreno	5919c42df2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3887-multi-check	2022-05-10 11:42:35 +02:00
Joan Sanchez	7f19f0bebe	Merge pull request '3795-client_administraive' (#938) from 3795-client_administraive into dev ... Reviewed-on: #938	2022-05-10 08:26:38 +00:00
Joan Sanchez	866834d1d7	Merge pull request '3948-invoceIn.index' (#956) from 3948-invoceIn.index into dev ... Reviewed-on: #956 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-05-10 08:25:47 +00:00
Joan Sanchez	aa431bbe0f	Merge branch 'dev' into 3795-client_administraive	2022-05-10 08:24:32 +00:00
Joan Sanchez	93829eeff5	Merge branch 'dev' into 3948-invoceIn.index	2022-05-10 08:22:06 +00:00
Joan Sanchez	c0f2b9dca9	Merge branch 'dev' into 3996-entry_summary	2022-05-10 08:09:31 +00:00
Alex Moreno	fde73b35e7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3887-multi-check	2022-05-10 08:57:28 +02:00
Alex Moreno	5bad0592a5	change errors	2022-05-10 08:48:51 +02:00
Alex Moreno	263d0e3f79	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3795-client_administraive	2022-05-10 07:55:41 +02:00
Vicent Llopis	bb4dbb60b8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3752-claim_action	2022-05-10 07:11:26 +02:00
Carlos Jimenez Ruiz	5c55caaec6	Merge branch 'dev' into 3978-invoiceIn.summary	2022-05-09 14:59:32 +00:00
Carlos Jimenez Ruiz	e71003778a	Merge branch 'dev' into 3950-invoiceIn.create	2022-05-09 14:41:33 +00:00
Carlos Jimenez Ruiz	6fb83f5c65	Merge branch 'dev' into 3941-order.index	2022-05-09 14:21:24 +00:00
Carlos Jimenez Ruiz	9c085fa653	Merge branch 'dev' into 3927-monitor_ticket	2022-05-09 14:14:01 +00:00
Joan Sanchez	7365143eac	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-05-09 16:09:17 +02:00