9776 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	330b6bdf8a	2770 - Added supplier addresses section	2021-04-29 14:41:10 +02:00
Carlos Jimenez Ruiz	b4f1e293e2	Merge pull request '280 - OsTicket weelky ticket report' (#612) from 2890-osticket_report into dev ... Reviewed-on: #612 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-04-29 08:25:19 +00:00
Joan Sanchez	d13a57c9e9	Merge branch 'dev' into 2890-osticket_report	2021-04-29 07:11:53 +00:00
Joan Sanchez	1733433027	Merge pull request '2167-entry_buy' (#613) from 2167-entry_buy into dev ... Reviewed-on: #613 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-04-29 07:11:28 +00:00
Joan Sanchez	fdfddb8bde	Merge branch 'dev' into 2167-entry_buy	2021-04-29 07:09:32 +00:00
Joan Sanchez	b41b0ca15a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-04-29 08:48:29 +02:00
Joan Sanchez	5a53cb09da	Create receipt button changed role to salesAssistant	2021-04-29 08:48:11 +02:00
Carlos Jimenez Ruiz	eea8ed9a3c	front unit test entry import buys fix	2021-04-28 22:56:02 +02:00
Carlos Jimenez Ruiz	3c280eed2e	e2e path for entry buy after entry import path	2021-04-28 18:29:29 +02:00
Carlos Jimenez Ruiz	9ef4497ea6	translations and tittles	2021-04-28 12:11:49 +02:00
Carlos Jimenez Ruiz	d3b22d7078	controller refactor to remove repeated code	2021-04-28 11:55:04 +02:00
Carlos Jimenez Ruiz	e53298f35c	test new uses transaction	2021-04-28 11:24:02 +02:00
Carlos Jimenez Ruiz	ddc19ddbcd	enpoint now receives all data for a buy + css refactor	2021-04-28 11:15:02 +02:00
Carlos Jimenez Ruiz	65457d6dac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2167-entry_buy	2021-04-28 10:32:35 +02:00
Carlos Jimenez Ruiz	daa94e4eb5	entry buy index	2021-04-28 10:32:24 +02:00
Joan Sanchez	68b81f176e	Merge branch 'dev' into 2890-osticket_report	2021-04-27 08:30:59 +00:00
Joan Sanchez	38af26aca2	Mysql pool refactor	2021-04-27 10:29:09 +02:00
Joan Sanchez	50b3c840dc	Merge pull request '2893-show-expedition.externalId' (#611) from 2893-show-expedition.externalId into dev ... Reviewed-on: #611 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-04-27 07:40:47 +00:00
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