1524 Commits

Author	SHA1	Message	Date
Vicent Llopis	ad80d0501c	add fixtures	2022-04-28 07:48:09 +02:00
Vicent Llopis	39f4c4a6e8	feat: updated backTest	2022-04-25 12:36:05 +02:00
Vicent Llopis	76ff6330f9	feat(supllier.summary): add two fields	2022-04-25 12:23:03 +02:00
Vicent Llopis	5211a0d9d7	feat(supplier.fiscal-data): add two fields	2022-04-25 11:51:34 +02:00
Vicent Llopis	4ffb61b75c	refactor: refund	2022-04-22 11:45:14 +02:00
Vicent Llopis	d1bd2f9c77	refactor: refund	2022-04-21 14:59:41 +02:00
Vicent Llopis	579ff3aa4a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3750-claim_photo	2022-04-21 07:13:34 +02:00
Alex Moreno	8b68fcf088	change new code	2022-04-20 14:40:29 +02:00
Alex Moreno	e00d63d7af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate	2022-04-20 14:30:23 +02:00
Carlos Jimenez Ruiz	8efcb6233f	feat(user): added userConfig.darkMode relation towards account.user	2022-04-20 10:25:01 +02:00
Carlos Jimenez Ruiz	9085098a04	Merge branch 'dev' into 3830-ticket_sale	2022-04-13 09:19:50 +00:00
Vicent Llopis	a47349646f	change versions db	2022-04-13 09:50:29 +02:00
Alex Moreno	88d91d8b47	change db changes folder	2022-04-13 08:19:33 +02:00
Alex Moreno	14933d13cb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3758-client_unpaid	2022-04-13 08:17:44 +02:00
Vicent Llopis	013390fae9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3830-ticket_sale	2022-04-12 12:49:34 +02:00
Joan Sanchez	3d8f851de8	Added version	2022-04-12 11:46:14 +02:00
Joan Sanchez	2bc7b2db0c	Removed keep file	2022-04-12 10:15:30 +02:00
Alex Moreno	c9e8826627	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3758-client_unpaid	2022-04-12 07:08:55 +02:00
Joan Sanchez	7228394393	Merge branch 'dev' into 3837-edi_import	2022-04-11 12:43:52 +00:00
Carlos Jimenez Ruiz	018047b6be	Merge branch 'dev' into 3347-worker_basic-data	2022-04-11 10:52:56 +00:00
Carlos Jimenez Ruiz	56e52c35d8	Merge branch 'dev' into 3802-ticket_sale_mana	2022-04-11 10:40:52 +00:00
Carlos Jimenez Ruiz	b087d275dc	Merge branch 'dev' into 3605-invoiceIn_intrastat3	2022-04-11 10:29:01 +00:00
Joan Sanchez	39d18093eb	Updated SQL files	2022-04-11 12:04:34 +02:00
Joan Sanchez	47a2f76aa4	3837 - Import data from external service	2022-04-11 11:58:40 +02:00
Vicent Llopis	d88a404ce6	refactor: pull request changes	2022-04-11 10:01:00 +02:00
Vicent Llopis	655db502f7	refactor: pull request changes	2022-04-11 09:04:05 +02:00
Vicent Llopis	d8a1bd1b1c	fix: pull request changes	2022-04-11 08:23:54 +02:00
Vicent Llopis	c00be015ab	feat(claim_photo): add fixtures and backTest	2022-04-08 13:53:25 +02:00
Joan Sanchez	8414f94cf6	Merge pull request '3736-worker-timeControl_calculate' (#926) from 3736-worker-timeControl_calculate into dev ... Reviewed-on: #926 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-04-08 06:49:39 +00:00
Joan Sanchez	381b37b1ff	Merge branch 'dev' into 3043-client_search-panel	2022-04-08 06:31:16 +00:00
Alex Moreno	b8a954caec	feat(client): section unpaid	2022-04-07 11:41:35 +02:00
Carlos Jimenez Ruiz	a72b1cd591	Merge branch 'dev' into 3467-travelThermograph	2022-04-07 08:36:39 +00:00
Joan Sanchez	0a4b7bd000	Added new version folder	2022-04-07 10:31:15 +02:00
Carlos Jimenez Ruiz	6216d6fa9b	Merge branch 'dev' into 3467-travelThermograph	2022-04-07 08:29:26 +00:00
Joan Sanchez	f5a6521f20	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-04-06 14:34:23 +02:00
Alex Moreno	98755656dc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph	2022-04-06 12:43:12 +02:00
Alex Moreno	dd9a38d1bf	feat(client_search-panel): filter by province	2022-04-06 12:29:00 +02:00
Joan Sanchez	7a8dbdfb16	Updated SQL files	2022-04-05 09:56:39 +02:00
Alex Moreno	d616367714	fix(test): use static dates	2022-04-05 07:46:49 +02:00
Vicent Llopis	5f2424dc44	feat(ticket): add option 'refund all' in descriptor menu	2022-04-04 13:26:53 +02:00
Vicent Llopis	fdf285dd5f	fix(worker_timeControl): corrected db procedure	2022-04-04 10:31:28 +02:00
Alex Moreno	c904bf0bdf	feat(back): new Date mocked time	2022-04-01 13:55:45 +02:00
Alex Moreno	d86f4da425	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate	2022-04-01 07:37:29 +02:00
Vicent Llopis	5f29b272e1	feat: add fixtures	2022-03-31 11:38:08 +02:00
Vicent Llopis	fe32b81d9e	sql update	2022-03-31 10:50:05 +02:00
Vicent Llopis	bb267dad16	feat: add fixtures	2022-03-31 09:17:27 +02:00
Vicent Llopis	1f826e1214	sql code for production	2022-03-31 09:16:55 +02:00
Alex Moreno	eec1c1ff86	feat(db): static dates	2022-03-30 12:45:01 +02:00
Vicent Llopis	3bf2b46689	feat(ticket_line): update workerMana if check claimMana option	2022-03-30 10:09:01 +02:00
Vicent Llopis	e29f820e60	feat(ticket_line): new table ticketRefund and update proc ticket_doRefund	2022-03-30 08:56:35 +02:00
Vicent Llopis	e0244f388c	refator: single quotes in sql files	2022-03-30 07:39:42 +02:00
Vicent Llopis	d06b2e8bb7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3605-invoiceIn_intrastat3	2022-03-30 07:30:39 +02:00
Vicent Llopis	8e27ab612d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3802-ticket_sale_mana	2022-03-29 15:08:48 +02:00
Vicent Llopis	a5ca116571	feat(ticket_sale): add mana options	2022-03-29 13:42:37 +02:00
Joan Sanchez	bbbb0df1cd	Merge branch 'dev' into 3781-export_database	2022-03-29 10:15:33 +00:00
Carlos Jimenez Ruiz	74fb7c95c2	Merge branch 'dev' into 3621-worker_calendar	2022-03-29 08:18:13 +00:00
Alex Moreno	fd02038c8e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3621-worker_calendar	2022-03-29 10:08:29 +02:00
Carlos Jimenez Ruiz	407fe2850b	Merge branch 'dev' into 3408-worker_calendar	2022-03-29 08:06:25 +00:00
Vicent Llopis	889dcf8763	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3781-export_database	2022-03-29 08:56:59 +02:00
Vicent Llopis	2ab45fe2eb	delete jenkins changes	2022-03-29 07:34:35 +02:00
Vicent Llopis	9faf9d8688	test Jenkins NOT PUSH	2022-03-28 15:01:58 +02:00
Alex Moreno	f853696d03	change fixture name	2022-03-28 13:59:39 +02:00
Vicent Llopis	f4d53c4040	pull request changes required	2022-03-28 13:35:36 +02:00
Carlos Jimenez Ruiz	23c473de89	Merge branch 'dev' into 3408-worker_calendar	2022-03-28 10:26:13 +00:00
Carlos Jimenez Ruiz	8d70bac5c6	Merge branch 'dev' into 3621-worker_calendar	2022-03-28 10:13:21 +00:00
Alex Moreno	7cd33619e3	change db version	2022-03-28 11:47:20 +02:00
Alex Moreno	89d7d27061	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph	2022-03-28 11:47:09 +02:00
Carlos Jimenez Ruiz	39694b31b8	Merge branch 'dev' into 3607-supplier_agencyTerm	2022-03-28 08:40:32 +00:00
Juan Ferrer	85de742630	Export data & structure	2022-03-28 09:44:29 +02:00
Alex Moreno	79c74d92b5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph	2022-03-25 13:22:04 +01:00
Vicent Llopis	e02ab9dd2d	feat: add fixtures	2022-03-24 11:39:19 +01:00
Vicent Llopis	67a90c356f	updated FK for production db	2022-03-24 10:58:04 +01:00
Alex Moreno	254fee5036	feat(worker_calendar): repaint, fix front test and add fixtures	2022-03-23 14:02:48 +01:00
Vicent Llopis	fd7afc962f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm	2022-03-23 12:53:33 +01:00
Vicent Llopis	1056060957	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3721-claim_basic-data	2022-03-23 12:37:34 +01:00
Alex Moreno	f6ff8ea081	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3682-item_fixed-price	2022-03-23 12:17:14 +01:00
Joan Sanchez	0099b48865	Merge pull request '3704-feat(print_claim-pickup-order): add claimConfig' (#902) from 3704-print_claim-pickup-order into dev ... Reviewed-on: #902 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-03-23 11:09:18 +00:00
Alex Moreno	dc03a66c6b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3682-item_fixed-price	2022-03-23 12:01:50 +01:00
Joan Sanchez	52b61d16ac	Merge pull request '3638-export_database' (#899) from 3638-export_database into dev ... Reviewed-on: #899 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-03-23 10:43:14 +00:00
Alex Moreno	9a1c0a07fd	Merge branch 'dev' into 3680-claim_basic-data_packages	2022-03-23 08:42:52 +00:00
Vicent Llopis	31a5e19151	move db changes to correct folder	2022-03-21 13:19:19 +01:00
Vicent Llopis	35312911b0	move db changes to correct folder	2022-03-21 13:16:42 +01:00
Vicent Llopis	84ebeed8ef	add fixtures	2022-03-21 13:04:25 +01:00
Vicent Llopis	e4eed95724	notify rocket when claimState change to canceled	2022-03-21 10:02:56 +01:00
Alex Moreno	a2b06e7248	feat(print_claim-pickup-order): add claimConfig	2022-03-18 13:22:39 +01:00
Vicent Llopis	f501d20c65	update sql	2022-03-18 12:41:15 +01:00
Alex Moreno	b56e1810c3	test(item_fixedPrice): fix back test & e2e	2022-03-18 10:30:30 +01:00
Vicent Llopis	c660786e45	refactor chaneg name	2022-03-17 14:52:06 +01:00
Vicent Llopis	a32f7b5ef1	add new row	2022-03-17 14:27:55 +01:00
Vicent Llopis	644c24fa3b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm	2022-03-17 11:55:07 +01:00
Vicent Llopis	afa7345d22	delete old db changes	2022-03-17 09:00:13 +01:00
Vicent Llopis	a3dbec82bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database	2022-03-17 07:59:07 +01:00
Carlos Jimenez Ruiz	3098fc36fb	Merge branch 'dev' into 3604-route_agencyTerm	2022-03-15 14:14:16 +00:00
Alex Moreno	f337f82b35	feat(claim): add packages, and next button	2022-03-15 12:51:33 +01:00
Vicent Llopis	6742d7aa43	upload db changes	2022-03-15 07:22:15 +01:00
Alex Moreno	31eb22c1b4	feat(db): update users to role deliveryBoss	2022-03-14 11:34:09 +01:00
Vicent Llopis	189fe2ed41	update acl	2022-03-10 08:14:50 +01:00
Vicent Llopis	a32ebc37da	add supplier autonomous	2022-03-09 23:54:23 +01:00
Juan Ferrer	d49d1b437c	User.login() error fixed	2022-03-09 15:34:26 +01:00
Vicent Llopis	91a23088c3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm	2022-03-09 08:40:55 +01:00
Vicent Llopis	97f2341ae0	pull request changes	2022-03-08 13:42:44 +01:00
Vicent Llopis	527387aad5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3626-client_basic-data	2022-03-08 08:45:40 +01:00
Alex Moreno	efa32a3dc7	export structure	2022-03-04 13:04:28 +01:00
Alex Moreno	138e2ee9b1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database	2022-03-04 12:25:05 +01:00
Vicent Llopis	f972afb13e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm	2022-03-04 09:38:33 +01:00
Carlos Jimenez Ruiz	63fc58b6ba	Merge branch 'dev' into 3649-claim_log	2022-03-03 12:00:02 +00:00
Vicent Llopis	5ea8c5b06c	delete vendedores_updatePortfolio.sql	2022-03-03 11:38:32 +01:00
Vicent Llopis	4811254ccb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm	2022-03-02 15:07:38 +01:00
Vicent Llopis	ade34c1e0a	add section Autonomous	2022-03-02 14:59:30 +01:00
Alex Moreno	5efb678a53	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3598-worker_calendar_absences	2022-03-02 10:32:18 +01:00
Alex Moreno	ccb5261ff6	Merge branch '3598-worker_calendar_absences' of https://gitea.verdnatura.es/verdnatura/salix into 3598-worker_calendar_absences	2022-03-02 10:31:27 +01:00
Carlos Jimenez Ruiz	2b0f54c3aa	Merge branch 'dev' into 3646-claim-summary	2022-03-02 09:17:19 +00:00
Alex Moreno	44318903e7	feat(claim): add log section	2022-03-01 15:15:58 +01:00
Joan Sanchez	cb21a51065	Added SQL version 10430-ash	2022-03-01 12:12:40 +01:00
Alex Moreno	ab6b5aa803	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3352-docuware	2022-02-28 13:14:34 +01:00
Alex Moreno	bf712ba5af	feat(worker): absences can return all absences of worker	2022-02-25 10:33:47 +01:00
Vicent Llopis	72bfc1ef6e	export db	2022-02-25 08:21:53 +01:00
Vicent Llopis	19887bdd16	feat: add section autonomous	2022-02-24 14:52:32 +01:00
Alex Moreno	fc3a46eb26	refactor(claim): removed importTicketSales and fix tests	2022-02-24 13:52:26 +01:00
Vicent Llopis	b3263fb97e	add fixtures	2022-02-23 12:58:09 +01:00
Vicent Llopis	dedecb492e	sql modify	2022-02-23 12:58:01 +01:00
Alex Moreno	52cf79516a	refactor(claim_summary): move responsability and improve fixtures	2022-02-23 12:23:47 +01:00
Vicent Llopis	591194d710	export db	2022-02-23 09:05:31 +01:00
Alex Moreno	f3ff64c44d	refactor(docuware): name for code	2022-02-23 08:11:54 +01:00
Alex Moreno	4606b0d7ea	change name for code	2022-02-22 15:23:23 +01:00
Alex Moreno	8bbb5d5c27	variable name	2022-02-21 11:28:00 +01:00
Alex Moreno	0f4649c50f	feat(ticket_descriptor-menu): docuware implemented	2022-02-21 08:48:53 +01:00
Vicent Llopis	a152e22f6e	update sql changes	2022-02-18 12:26:16 +01:00
Alex Moreno	89eee042b5	refactor(ticket_basic-data): zeroFill and move getMovable	2022-02-17 08:02:02 +01:00
Alex Moreno	3aeb2adb56	feat(ticket): docuware pdf	2022-02-16 14:57:47 +01:00
Vicent Llopis	d7f252a57d	feat(invoiceIn): add section intrastat	2022-02-16 10:30:56 +01:00
Alex Moreno	651c92698f	feat(docuware): start download docuware	2022-02-15 16:48:37 +01:00
Alex Moreno	135aff27a4	fix(getMovable): show correct movable	2022-02-10 09:13:48 +01:00
Alex Moreno	b4bed608ab	refactor(ticket): getMovable	2022-02-09 15:01:02 +01:00
Alex Moreno	e09e84c36b	refactor(setSaleQuantity): rename, remove transaction	2022-02-08 12:41:55 +01:00
Alex Moreno	dc78cd2dc5	feat(collection): setQuantitySale	2022-02-07 08:05:05 +01:00
Carlos Jimenez Ruiz	e9189509c2	Merge branch 'dev' into 3552-monitor_ticket_state	2022-02-03 09:50:01 +00:00
Alex Moreno	c004ee638c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3563-item_index_producer	2022-02-03 10:34:48 +01:00
Alex Moreno	e5548fe2a0	remove delete.keep	2022-02-02 07:24:15 +01:00
Alex Moreno	cb5c4146cd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3552-monitor_ticket_state	2022-02-02 07:23:17 +01:00
Joan Sanchez	d6ba1247d4	Added version 10420-valentines	2022-02-01 14:37:34 +01:00
Alex Moreno	13230a2fe9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3563-item_index_producer	2022-02-01 12:40:04 +01:00
Alex Moreno	f90607c8c7	change changes folder name	2022-02-01 12:39:58 +01:00
Alex Moreno	a012740742	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3552-monitor_ticket_state	2022-02-01 12:38:22 +01:00
Alex Moreno	128612a5ab	Merge branch '3552-monitor_ticket_state' of https://gitea.verdnatura.es/verdnatura/salix into 3552-monitor_ticket_state	2022-02-01 12:38:09 +01:00
Alex Moreno	90ed2fdfac	change changes folder name	2022-02-01 12:38:05 +01:00
Carlos Jimenez Ruiz	01e269db6d	Merge branch 'dev' into 3052-client_defaulter	2022-02-01 09:03:47 +00:00
Alex Moreno	56331da20b	feat(item_index): add column producer	2022-02-01 09:37:11 +01:00
Alex Moreno	7cf252a8f1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3052-client_defaulter	2022-02-01 07:29:38 +01:00
Alex Moreno	3d2f661bf0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-02-01 07:20:21 +01:00
Joan Sanchez	9878780006	Merge branch 'dev' into 3552-monitor_ticket_state	2022-01-31 15:41:20 +00:00
Alex Moreno	78b3df0b6a	feat(monitor_ticket): classColor in db	2022-01-31 13:15:37 +01:00
Joan Sanchez	d30e8d9bcc	Removed already uploaded changes	2022-01-28 14:50:19 +01:00
Joan Sanchez	26f980998a	renamed folder	2022-01-28 14:49:11 +01:00
Alex Moreno	8936e02cd4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3052-client_defaulter	2022-01-28 14:23:22 +01:00
Joan Sanchez	2480f37e24	Renamed version number (olrder version already applied on production)	2022-01-28 14:20:54 +01:00
Vicent Llopis	44e6219df5	update table companyGroup	2022-01-28 09:30:54 +01:00
Alex Moreno	072ac5fb6a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3052-client_defaulter	2022-01-28 09:28:13 +01:00
Alex Moreno	b25ffa8feb	feat(ticket_step-two): redirect to new ticket	2022-01-28 09:15:41 +01:00
Alex Moreno	74916c182a	Merge branch '3430-ticket_step-two' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-27 07:22:39 +01:00
Alex Moreno	d0c4099255	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-27 07:20:39 +01:00
Alex Moreno	f8a0094321	word movible	2022-01-26 08:54:48 +01:00
Alex Moreno	57e4b400c9	Merge branch '3430-ticket_step-two' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-26 07:12:57 +01:00
Alex Moreno	442d58f59b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-26 07:11:22 +01:00
Alex Moreno	2455a24b68	feat(client_defaulter): section and test	2022-01-25 14:27:30 +01:00
Juan Ferrer	022c2cde3c	Merge branch 'dev' into 3536-DbUserSync	2022-01-25 11:18:50 +01:00
Javi Gallego	5fbbae7ac6	Merge branch 'dev' into 2883-invoiceIn-Booking	2022-01-24 15:40:37 +01:00
Joan Sanchez	6de82caf0c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-01-21 16:17:53 +01:00
Joan Sanchez	ddf62d2496	Updated back unit test	2022-01-21 16:16:39 +01:00
Joan Sanchez	5ff950d078	refactor(invoice): hide report logo for non group companies #3519	2022-01-21 10:33:40 +01:00
Juan Ferrer	997b7990d4	Docker connectTimeout && MySQL/MariaDB user sync	2022-01-20 15:33:53 +01:00
Javi Gallego	6d66ab7bea	getTotals without transaction	2022-01-20 10:05:24 +01:00
Javi Gallego	3c8e6a16a2	Merge branch 'dev' into 2883-invoiceIn-Booking	2022-01-19 14:19:29 +01:00
Joan Sanchez	352c3205bf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3245-print_refactor	2022-01-18 13:57:26 +01:00
Alex Moreno	8e1c3e107c	refactor(ticket): advanceable code	2022-01-18 12:48:39 +01:00
Alex Moreno	b8355320f2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-17 14:50:10 +01:00
Carlos Jimenez Ruiz	dc0a498b4d	Merge branch 'dev' into 3513-export_database	2022-01-17 13:02:32 +00:00
Alex Moreno	4b2153d638	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-17 13:37:25 +01:00
Joan Sanchez	7d16d7aaf2	Closure refactor	2022-01-17 12:33:11 +01:00
Alex Moreno	b05f464517	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3491-ticket_volume	2022-01-17 10:14:58 +01:00
Carlos Jimenez Ruiz	941d43b9a2	Merge branch 'dev' into 3448-worker_calendar-payedHolidays	2022-01-17 09:06:27 +00:00
Alex Moreno	61859a23c9	feat(ticket): getAdvanceable	2022-01-17 07:14:29 +01:00
Alex Moreno	bf6d196414	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph	2022-01-13 08:33:27 +01:00
Alex Moreno	245161375c	update database	2022-01-13 08:27:56 +01:00
Alex Moreno	c90a2b6e5c	update folder changes	2022-01-13 07:24:46 +01:00
Alex Moreno	c87e3e1210	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-13 07:20:23 +01:00
Alex Moreno	6f7c1b6a46	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary	2022-01-12 14:56:34 +01:00
Alex Moreno	757fe73ecd	test(ticket_volume): backTest	2022-01-12 14:55:20 +01:00
Alex Moreno	fba09e8c40	feat(ticket_volume): volume for packingType	2022-01-12 14:02:58 +01:00
Vicent Llopis	f387551835	add sql	2022-01-12 12:27:12 +01:00
Alex Moreno	9e491082e7	test(send): backTest and fixtures	2022-01-11 08:39:06 +01:00
Alex Moreno	ebac06e4fc	refactor(send): update got sms	2022-01-10 15:14:05 +01:00
Alex Moreno	fc69151f7f	update sms	2022-01-10 13:20:57 +01:00
Alex Moreno	1983eb012b	refactor(sms): got and apiKey	2022-01-10 12:28:39 +01:00
Alex Moreno	e4db123672	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary	2022-01-04 13:55:36 +01:00
Alex Moreno	2a9cc2f465	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary	2022-01-03 09:54:11 +01:00
Alex Moreno	db609c1713	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3468-export-database	2022-01-03 08:39:06 +01:00
Alex Moreno	e8a4a9cd8c	update today	2022-01-03 08:38:46 +01:00
Carlos Jimenez Ruiz	ea4fc5c262	updated fixtured to amend failing test	2021-12-30 12:08:05 +01:00
Alex Moreno	a57999aaad	unnecessary space	2021-12-29 11:55:48 +01:00
Alex Moreno	e9f77bb9b4	feat(supplier_summary): remove supplier.isFarmer and add verification by sageWithholdingFk	2021-12-29 11:51:56 +01:00
Alex Moreno	5401c1ebf6	export database and fixture train	2021-12-24 12:29:47 +01:00
Alex Moreno	8e274f4f17	refactor(travel): deprecated travelThermograph.temperature	2021-12-24 10:10:28 +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	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
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
Joan Sanchez	872f5b488b	Merge branch 'dev' into 3411-route_ticket_fixtures	2021-12-20 09:40:34 +00:00
Alex Moreno	9247bc98f1	feat(db): sql for supplier isPayMethodChecked	2021-12-20 08:01:13 +01:00
Alex Moreno	0ea1dea8b5	refactor sqls	2021-12-17 12:52:37 +01:00
Alex Moreno	850ea2ef39	getVisible sql	2021-12-17 12:38:56 +01:00
Alex Moreno	7c17250919	trigger payment_beforeInsert sql	2021-12-16 15:19:56 +01:00
Alex Moreno	f4a07cab70	sql update supplier	2021-12-16 12:21:47 +01:00
Alex Moreno	138f2110e5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3273-supplier_billing-data	2021-12-16 12:15:47 +01:00
Vicent Llopis	a6b755138f	feat(abono): add option "abono" in ticket_sale	2021-12-15 15:24:45 +01:00
Joan Sanchez	15b78787df	Added version 10400-christmas	2021-12-14 10:46:05 +01:00
Joan Sanchez	b45263af30	Merge branch 'dev' into export_production	2021-12-14 09:23:15 +00:00
Vicent Llopis	9de1d59d98	fix: deleted repeated tickets	2021-12-14 09:56:38 +01:00
Javi Gallego	a99174e42a	Merge branch 'dev' into 2883-invoiceIn-Booking	2021-12-14 09:50:39 +01:00
Alex Moreno	6465a5c460	feat(supplier): payMethodChecked for financial	2021-12-14 08:23:11 +01:00
Vicent Llopis	ac3dc039fe	feat: add fixtures of ticket and update test	2021-12-01 12:49:53 +01:00
Vicent Llopis	b9893220cd	export database	2021-12-01 08:19:28 +01:00
Alex Moreno	c7e5c25a28	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3372-ticket_sale	2021-11-30 15:13:38 +01:00
Alex Moreno	decd4b5a95	separate sql procedures	2021-11-30 15:13:20 +01:00
Vicent Llopis	238577ec8f	refactor: change ids by codes and add fixtures	2021-11-30 13:57:17 +01:00
Alex Moreno	d5c0be5a9d	refactor(ticket_sale): logic and tests	2021-11-30 13:47:16 +01:00
Carlos Jimenez Ruiz	51a608cb5a	Merge branch 'dev' into 3325-notify_absence	2021-11-29 09:49:58 +00:00
Vicent Llopis	2f7295020c	update column notificationEmail	2021-11-26 13:30:40 +01:00
Alex Moreno	771100ccab	remove unnecessary intro and comment	2021-11-26 08:40:20 +01:00
Alex Moreno	eea9413628	fix(item_basic-data): controller, test e2e and model	2021-11-26 08:34:32 +01:00
Alex Moreno	9fce06dfe0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data	2021-11-25 11:53:26 +01:00
Carlos Jimenez Ruiz	5914e8e1ac	fixed e2e by adding acls where needed	2021-11-25 11:30:55 +01:00
Carlos Jimenez Ruiz	09c2b813b5	ACL update	2021-11-24 15:27:09 +01:00
Alex Moreno	c03fe359b1	add acl	2021-11-24 14:36:12 +01:00
Alex Moreno	fc2e81826d	export database	2021-11-24 13:02:58 +01:00
Alex Moreno	00072a7dd1	landing searchable false	2021-11-24 10:02:52 +01:00
Alex Moreno	5931692fac	test(item_basic-data): add genericFk e2e	2021-11-24 09:21:41 +01:00
Alex Moreno	b460579834	feat(entry_latest-buys): add from and to in search-panel	2021-11-23 09:00:46 +01:00
Carlos Jimenez Ruiz	1f2417b55e	Merge branch 'dev' into 3290-entry_latest-buys	2021-11-22 15:34:55 +00:00
Carlos Jimenez Ruiz	cbcfdd33ec	Merge branch 'dev' into 3379-payMethod_ibanRequired	2021-11-22 14:21:46 +00:00
Carlos Jimenez Ruiz	9fdfe64909	Merge branch 'dev' into 3381-item_diary-claim	2021-11-22 13:51:51 +00: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
Alex Moreno	fe46dbd343	feat(entry_last-buys): add filter isFloramondo	2021-11-22 11:49:30 +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	e5977be502	Merge branch 'dev' into 3374-itemPackingType	2021-11-19 11:47:37 +00: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
Javi Gallego	fe97b9472c	db changes en el sprint actual	2021-11-19 07:46:08 +01:00
Javi Gallego	c8e9416448	Merge branch 'dev' into 2883-invoiceIn-Booking	2021-11-19 07:33:54 +01:00
Carlos Jimenez Ruiz	c1adba3249	Merge branch 'dev' into 3338-worker_calendar	2021-11-18 14:01:25 +00:00
Carlos Jimenez Ruiz	924e6d063d	moved getBalance modifications to correct version	2021-11-18 12:42:31 +01: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
Vicent Llopis	f87f60f00a	feat(item-itemPackingType): add model and dumpedFixtures	2021-11-18 09:16:36 +01:00
Javi Gallego	b936272898	Merge branch 'dev' into 2883-invoiceIn-Booking	2021-11-18 07:36:03 +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	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
Alex Moreno	ec25df39e4	transaction activeWithBuyer.js	2021-11-15 14:50:02 +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
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	59cdf00134	Merge branch 'dev' into 3312-ibanRequired	2021-11-15 08:24:29 +00:00
Joan Sanchez	b83f0fb52f	fix(smart-table): load default viewConfig	2021-11-12 17:51:27 +01:00
Carlos Jimenez Ruiz	d2dc0bd147	multi check now behaves properly	2021-11-11 16:38:41 +01:00
Joan Sanchez	f99e0c5648	Updated default hidden columns	2021-11-11 10:40:21 +01:00
Alex Moreno	5c7efbb838	feat(item): back filter buyer in search panel ans test	2021-11-11 10:33:21 +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
Carlos Jimenez Ruiz	717ea60084	Merge branch 'dev' into 3116-client_balance	2021-11-10 13:40:56 +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
Vicent Llopis	f5977d9f01	delete maxAmount from structure.sql	2021-11-09 14:35:34 +01:00
Carlos Jimenez Ruiz	469c544536	item.index default columns and filter with like	2021-11-09 11:47:54 +01:00
Carlos Jimenez Ruiz	a53f98dea9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table	2021-11-09 09:56:13 +01:00
Carlos Jimenez Ruiz	345be297f0	Merge branch 'dev' into 3116-client_balance	2021-11-09 08:26:41 +00:00
Vicent Llopis	395ad1c76d	fix(ibanRequired): set different ibanRequired for Client and Supplier	2021-11-08 15:04:33 +01:00
Vicent Llopis	bfbc9b50c4	feat(client_balance): add maxImport if "cash"	2021-11-08 13:02:42 +01:00
Alex Moreno	45b36a5c77	export-database	2021-11-08 09:28:34 +01:00
Vicent Llopis	000ae21ce5	create colum sql	2021-11-08 09:16:27 +01:00
Carlos Jimenez Ruiz	b27a443729	show/hide columns and load default view	2021-10-27 17:11:33 +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
Alex Moreno	9c4e46f363	export_database	2021-10-20 13:32:03 +02:00
Joan Sanchez	f87f3e85b4	Merge branch 'dev' into 3211-closure_invoicing	2021-10-19 12:42:13 +00:00
Joan Sanchez	5209414613	feat(closure): should mail the PDF invoice invoiceable clients ... Refs: 3211	2021-10-19 13:46:17 +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
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
Carlos Jimenez Ruiz	cec04a307d	refactor:(item): deprecation of isBargain and isOnOffer columns at model and fixtures	2021-10-18 12:05:38 +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	e9539c7675	Restored SQL version	2021-10-15 14:09:07 +02:00