8282 Commits

All Branches

Search

Author	SHA1	Message	Date
Javi Gallego	8b4d25d506	test arreglados windows	2020-10-02 08:57:51 +02:00
Javi Gallego	8d1709ea51	Merge branch 'dev' into 2443	2020-10-01 16:46:33 +02:00
Javi Gallego	78e22df177	test e2e de expense ok	2020-10-01 16:45:28 +02:00
Carlos Jimenez Ruiz	a2232f659b	Merge pull request 'refactor selectors' (#398) from 2485-refactor_selectors into dev ... Reviewed-on: #398 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-10-01 09:28:26 +00:00
Bernat Exposito Domenech	5807f6ca38	delete selector	2020-10-01 11:21:23 +02:00
Bernat Exposito Domenech	a7bee03b3d	refactor selectors	2020-10-01 10:38:02 +02:00
Juan Ferrer	6d8b13423f	SQL hotfix	2020-10-01 10:02:19 +02:00
Bernat Exposito Domenech	998bfcd4df	refactor selectors	2020-10-01 08:53:31 +02:00
Bernat Exposito	cdd71d00ec	Merge pull request 'fix test and refactor transferlines' (#397) from 2480-transfer_line into dev ... Reviewed-on: #397 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-09-30 12:19:57 +00:00
Javi Gallego	2714857227	Merge branch 'dev' into 2443	2020-09-30 14:07:38 +02:00
Javi Gallego	891a113326	package	2020-09-30 14:07:34 +02:00
Bernat Exposito Domenech	90e948aeda	fix lastActiveTickets	2020-09-30 13:35:37 +02:00
Bernat Exposito Domenech	1bff4e3c4e	fix test and refactor transferlines	2020-09-30 12:24:33 +02:00
Joan Sanchez	9423216616	Fix	2020-09-30 11:19:52 +02:00
Joan Sanchez	503e1d0ed9	2455 - Validate socialname when isDataChecked is changed	2020-09-30 09:31:01 +02:00
Joan Sanchez	58965a9687	Enabled loggable on calendar model	2020-09-30 07:38:43 +02:00
Joan Sanchez	eb99ce2f43	Disabled back tests	2020-09-30 07:23:37 +02:00
Joan Sanchez	79a9363a83	Merge pull request 'fix backend unit test for ticket.weekly' (#393) from 2457-fix_regularizeClaim_unit_test into dev ... Reviewed-on: #393 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-09-29 12:32:55 +00:00
Joan Sanchez	5bdc67f96e	Merge branch 'dev' into 2457-fix_regularizeClaim_unit_test	2020-09-29 12:22:11 +00:00
Joan Sanchez	aca6577f23	Merge pull request 'Added functions to call sql from def' (#389) from 1047-print_sql_def into dev ... Reviewed-on: #389 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-09-29 12:21:50 +00:00
Joan Sanchez	e0d78014c8	Merge branch 'dev' into 1047-print_sql_def	2020-09-29 12:12:27 +00:00
Joan Sanchez	2ab7999816	Removed unused param dirname	2020-09-29 14:10:13 +02:00
Carlos Jimenez Ruiz	6e6306a183	Merge branch 'dev' into 2457-fix_regularizeClaim_unit_test	2020-09-29 12:03:16 +00:00
Carlos Jimenez Ruiz	4847e83fc3	Merge pull request '2462 - Prevent searchbarfocus on 'state' source' (#394) from 2462-focus_fix into dev ... Reviewed-on: #394 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-09-29 11:41:21 +00:00
Carlos Jimenez Ruiz	a3c11b4e00	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2457-fix_regularizeClaim_unit_test	2020-09-29 13:33:34 +02:00
Carlos Jimenez Ruiz	1e55632b94	refactor & fix regularize claim and prices Diff	2020-09-29 13:28:02 +02:00
Carlos Jimenez Ruiz	40abd68734	fix byWarehouse and ticket.filter tests	2020-09-29 13:11:11 +02:00
Juan Ferrer	611aa9cafa	SQL hotfix	2020-09-29 10:55:04 +02:00
Carlos Jimenez Ruiz	0f557c5286	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2457-fix_regularizeClaim_unit_test	2020-09-29 10:45:50 +02:00
Carlos Jimenez Ruiz	d37a362756	Merge pull request 'Enabled back unit tests' (#390) from 2460-back_pool_closed into dev ... Reviewed-on: #390 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-09-29 07:24:24 +00:00
Carlos Jimenez Ruiz	438a4b936e	Merge branch 'dev' into 2460-back_pool_closed	2020-09-29 07:14:49 +00:00
Joan Sanchez	d9b43a8da2	Merge pull request '2381-mariaDB' (#391) from 2381-mariaDB into dev ... Reviewed-on: #391 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-09-29 06:56:47 +00:00
Joan Sanchez	ec2385cd15	Merge branch 'dev' into 2381-mariaDB	2020-09-29 06:53:14 +00:00
Carlos Jimenez Ruiz	6afee4924c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2457-fix_regularizeClaim_unit_test	2020-09-29 08:44:33 +02:00
Joan Sanchez	38df5a4d83	2462 - Prevent searchbarfocus on 'state' source	2020-09-29 08:13:49 +02:00
Joan Sanchez	1dee164f17	Merge branch 'dev' into 2460-back_pool_closed	2020-09-29 05:54:26 +00:00
Joan Sanchez	38351cd331	Merge pull request 'export structure db' (#392) from 2468-export_production into dev ... Reviewed-on: #392 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-09-29 05:51:47 +00:00
Bernat Exposito Domenech	5f9ef3aea3	export structure db	2020-09-29 07:37:29 +02:00
Juan Ferrer	991bece64a	SQL fixes	2020-09-28 21:25:53 +02:00
Joan Sanchez	2c9f664d01	Enabled back unit tests	2020-09-28 14:14:14 +02:00
Joan Sanchez	f17e9058b3	Refactor	2020-09-28 13:54:02 +02:00
Juan Ferrer	82de0a30a4	Merge branch 'dev' into 2381-mariaDB	2020-09-28 10:41:16 +02:00
Juan Ferrer	5264b615d4	Optimización docker salix-db	2020-09-28 10:40:50 +02:00
Joan Sanchez	dee7e844ad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1047-print_sql_def	2020-09-28 08:36:46 +02:00
Joan Sanchez	a573fa4bbb	Merge pull request '2381-mariaDB' (#374) from 2381-mariaDB into dev ... Reviewed-on: #374 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-09-28 06:25:28 +00:00
Joan Sanchez	a1349de32d	Merge branch 'dev' into 2381-mariaDB	2020-09-28 06:18:53 +00:00
Joan Sanchez	a5ec5d0d6c	Merge pull request '#2458 - Removed states from pending tickets' (#387) from 2458-ticket_index_pending into dev ... Reviewed-on: #387 Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-09-28 06:18:14 +00:00
Joan Sanchez	3e2f85dbd2	Merge branch 'dev' into 2458-ticket_index_pending	2020-09-28 06:13:39 +00:00
Joan Sanchez	0438171a47	Merge branch 'dev' into 2381-mariaDB	2020-09-28 06:09:48 +00:00
Joan Sanchez	64de4fdf72	Merge pull request 'Update models and fixtures' (#388) from 2442-update_fixtures into dev ... Reviewed-on: #388 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-09-28 06:09:20 +00:00