9558 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	e952e995cb	Merge branch 'dev' into 2893-show-expedition.externalId	2021-04-26 11:52:42 +00:00
Joan Sanchez	5ad0f15720	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-04-26 13:41:05 +02:00
Joan Sanchez	1c52bd1618	SQL fixes	2021-04-26 13:40:52 +02:00
Javi Gallego	9ee1385cd1	test ok	2021-04-26 12:33:33 +02:00
Javi Gallego	f45315f373	Merge branch 'dev' into 2893-show-expedition.externalId	2021-04-26 12:26:03 +02:00
Javi Gallego	2395a0af63	done	2021-04-26 12:24:16 +02:00
Joan Sanchez	42957f9ace	Added new SQL version	2021-04-26 11:12:13 +02:00
Joan Sanchez	a2d886bccf	Merge pull request 'test ok' (#610) from 2889-ticket-service into dev ... Reviewed-on: #610 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-04-23 10:41:40 +00:00
Javi Gallego	4a7a4f6dcf	test ok	2021-04-22 09:06:08 +02:00
Carlos Jimenez Ruiz	2630fa8c43	Merge pull request '2873-create-supplier-beneficiary' (#593) from 2873-create-supplier-beneficiary into dev ... Reviewed-on: #593 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-04-21 13:29:19 +00:00
Carlos Jimenez Ruiz	0abb8f2d5f	Merge branch 'dev' into 2873-create-supplier-beneficiary	2021-04-21 13:21:16 +00:00
Joan Sanchez	d46c643dc0	Merge pull request 'watcher aint looking after data changed to disable test conn button' (#609) from 2680-watcher_fix into dev ... Reviewed-on: #609 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-04-19 11:31:46 +00:00
Carlos Jimenez Ruiz	94cd6cfb3e	watcher aint looking after data changed to disable test conn button	2021-04-19 13:23:08 +02:00
Joan Sanchez	1cd8ee0d01	Merge pull request 'removed waitForTimeouts with 1 to 3 seconds' (#608) from 2865-e2e_run_optimization into dev ... Reviewed-on: #608 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-04-19 08:36:30 +00:00
Carlos Jimenez Ruiz	14303cca4e	Merge branch 'dev' into 2865-e2e_run_optimization	2021-04-19 08:05:03 +00:00
Carlos Jimenez Ruiz	cffe7e72e8	Merge pull request '2729 - Prices popover refactor' (#603) from 2729-prices_popover into dev ... Reviewed-on: #603 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-04-19 08:04:02 +00:00
Carlos Jimenez Ruiz	857c508391	Merge branch 'dev' into 2729-prices_popover	2021-04-19 07:59:09 +00:00
Joan Sanchez	42f1df9fef	Merge branch '2729-prices_popover' of https://gitea.verdnatura.es/verdnatura/salix into 2729-prices_popover	2021-04-19 09:56:01 +02:00
Joan Sanchez	b73045e7dc	Increase input width	2021-04-19 09:55:56 +02:00
Javi Gallego	cd4f93f326	minor fixes	2021-04-16 18:35:03 +02:00
Javi	f7fa363fa5	Merge branch 'dev' into 2873-create-supplier-beneficiary	2021-04-16 18:32:00 +02:00
Carlos Jimenez Ruiz	a445632c29	removed waitForTimeouts with 1 to 3 seconds	2021-04-16 16:16:05 +02:00
Joan Sanchez	adaece5cf9	Merge pull request 'mocked api client due to service instability' (#607) from 2887-sms_send_tests_fix into dev ... Reviewed-on: #607 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-04-16 11:02:33 +00:00
Carlos Jimenez Ruiz	420f05bb03	mocked api client due to service instability	2021-04-16 12:40:41 +02:00
Joan Sanchez	87ea8078da	Merge pull request 'only undo and save buttons are disabled until data changed now' (#605) from 2881-accounts_accounts_buttons_refactor into dev ... Reviewed-on: #605 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-04-16 08:38:46 +00:00
Joan Sanchez	ea5c254469	Merge branch 'dev' into 2881-accounts_accounts_buttons_refactor	2021-04-16 08:24:33 +00:00
Joan Sanchez	7e51fe3775	Merge pull request 'e2e paths for invoiceIn summary, descriptor and basicData' (#604) from 2886-invoiceIn_descriptor_n_basicdata_e2e into dev ... Reviewed-on: #604 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-04-16 08:22:15 +00:00
Carlos Jimenez Ruiz	56ec7b4729	input number made wider	2021-04-16 10:17:59 +02:00
Carlos Jimenez Ruiz	9a4c056059	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2729-prices_popover	2021-04-16 10:07:18 +02:00
Carlos Jimenez Ruiz	17904c4edb	only undo and save buttons are disabled until data changed now	2021-04-16 09:20:02 +02:00
Carlos Jimenez Ruiz	d392b50209	e2e paths for invoiceIn summary, descriptor and basicData	2021-04-15 18:00:21 +02:00
Joan Sanchez	2cdafeecf4	Added unit tests	2021-04-15 14:30:47 +02:00
Joan Sanchez	bf976a3e8f	2729 - Prices popover refactor	2021-04-15 14:30:30 +02:00
Joan Sanchez	bb299a3547	Merge pull request '2744-invoiceIn-module_rdy_n_summary' (#602) from 2744-invoiceIn-module_rdy_n_summary into dev ... Reviewed-on: #602 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-04-15 10:06:30 +00:00
Carlos Jimenez Ruiz	2ebd812a1f	updated model + translations	2021-04-15 11:54:40 +02:00
Carlos Jimenez Ruiz	41ab1bbe35	fixed a test where invoiceIn was nested into the summary	2021-04-15 10:50:10 +02:00
Carlos Jimenez Ruiz	38f43eca3b	invoiceIn basicData + index preview of summary	2021-04-15 10:47:39 +02:00
Carlos Jimenez Ruiz	69069d5e28	invoiceIn summary frontend	2021-04-15 10:46:23 +02:00
Carlos Jimenez Ruiz	ec378a17ae	invoiceIn model updated a summary registered	2021-04-15 10:45:27 +02:00
Carlos Jimenez Ruiz	8faa1531c6	summary route + test	2021-04-15 10:44:25 +02:00
Carlos Jimenez Ruiz	5931dd238c	Anomalous trigger disabled	2021-04-15 10:43:28 +02:00
Carlos Jimenez Ruiz	d8628379dd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2744-invoiceIn-module_rdy_n_summary	2021-04-14 11:11:40 +02:00
Carlos Jimenez Ruiz	7e6b7ec491	Merge pull request '2878 - Splitted method into activeWithRole and activeWithInheritedRole' (#600) from 2878-activeWorkers_refactor into dev ... Reviewed-on: #600 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-04-14 08:17:18 +00:00
Carlos Jimenez Ruiz	b2ecd7d3c2	Merge branch 'dev' into 2878-activeWorkers_refactor	2021-04-14 08:15:06 +00:00
Carlos Jimenez Ruiz	14155ff2ec	Merge pull request '2882 - Replaced worker userFk property by user id' (#601) from 2882-subordinate_by_user into dev ... Reviewed-on: #601 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-04-14 07:14:17 +00:00
Joan Sanchez	dac95805e8	2882 - Replaced worker userFk property by user id	2021-04-14 09:02:08 +02:00
Joan Sanchez	55b3a048e7	Updated E2E	2021-04-14 08:49:10 +02:00
Joan Sanchez	78313bd9a7	Updated unit tests	2021-04-14 08:15:03 +02:00
Joan Sanchez	6b8074e32f	2878 - Splitted method into activeWithRole and activeWithInheritedRole	2021-04-13 14:08:10 +02:00
Carlos Jimenez Ruiz	8c9ad39762	Merge pull request '2483 - Added replyTo param when sending an email to a client' (#597) from 2483-email_replyTo into dev ... Reviewed-on: #597 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-04-13 08:57:59 +00:00