12689 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	02c2588e78	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2469-e2e_n_refactor_account_module	2021-05-03 08:01:37 +02:00
Carlos Jimenez Ruiz	8a8c2fa39f	e2e partially working for account module	2021-05-03 08:01:29 +02:00
Joan Sanchez	3ed6e65f33	Style fixes to osticket report	2021-05-03 07:31:06 +02:00
Joan Sanchez	4d90006aa6	Updated unit test	2021-04-30 14:27:50 +02:00
Joan Sanchez	07dbeaf515	2727 - Send consumption report to an email address	2021-04-30 13:50:41 +02:00
Joan Sanchez	fcc8ab4236	Added model ACL	2021-04-30 10:08:40 +02:00
Joan Sanchez	dbe22844a6	Removed unused method	2021-04-30 09:53:20 +02:00
Joan Sanchez	29b5cac351	Fixtures for supplier 442	2021-04-30 09:48:28 +02:00
Joan Sanchez	d77e06a5a0	Changed city name	2021-04-30 08:30:21 +02:00
Joan Sanchez	5445764043	Added supplier address fixtures	2021-04-30 08:26:05 +02:00
Juan Ferrer	43b416e640	Merge branch 'master' into test	2021-04-30 00:42:33 +02:00
Juan Ferrer	d22403167b	Docker stack deploy	2021-04-30 00:39:44 +02:00
Joan Sanchez	61a63ad76f	Merge branch 'dev' into 2770-supplier_address	2021-04-29 12:42:42 +00:00
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