13730 Commits

All Branches

Search

Author	SHA1	Message	Date
Pau	fc08b27fb6	Merge branch 'dev' into 4789-search-ticket-without-invoice	2022-11-21 13:42:53 +00:00
Pau	3003290e61	refs #4551 @20min requested changes	2022-11-21 14:38:51 +01:00
Pau	40398da48d	refs #4789 @30m tested the requested changes	2022-11-21 14:21:23 +01:00
Pau	0099b42fe3	requested changes	2022-11-21 14:06:38 +01:00
Pau	6711593a87	Merge pull request 'Closes #4767 - route.index delete route' (!1154) from 4767-route.index-delete-route into dev ... Reviewed-on: #1154 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-21 12:56:35 +00:00
Alex Moreno	26be27c2ee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-21 13:13:25 +01:00
Alexandre Riera	6ddd2d95a5	insert acl	2022-11-21 11:48:18 +01:00
Alexandre Riera	4c21ffac3b	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-21 11:44:53 +01:00
Alexandre Riera	463e56b631	corrections	2022-11-21 11:41:17 +01:00
Alexandre Riera	40ea9805cf	fixes #4547 check compensation and tests	2022-11-21 10:49:19 +01:00
Pau	b788415920	Merge branch 'dev' into 4767-route.index-delete-route	2022-11-21 08:46:32 +00:00
Pau	4302f0be02	Merge pull request '#4507 greuge.js/json now insert userFk @2h' (!1101) from 4507-greuge-add-userFk into dev ... Reviewed-on: #1101 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-21 08:44:45 +00:00
Pau	cb0735d136	Merge branch 'dev' into 4507-greuge-add-userFk	2022-11-21 08:34:18 +00:00
Pau	68e4eea2e3	Merge branch 'dev' into 4767-route.index-delete-route	2022-11-21 08:32:39 +00:00
Pau	153f5f56fa	fix test refs #4791 @30min	2022-11-21 09:11:17 +01:00
Vicent Llopis	3fde11c3ed	Merge branch 'dev' into 4793-models_translation	2022-11-21 08:06:39 +00:00
Pau	4e97d931f7	refs #4791 @2h	2022-11-21 08:45:45 +01:00
Joan Sanchez	1f857d5b10	4859 - Export production database	2022-11-21 08:01:21 +01:00
Vicent Llopis	83aec89adb	Merge pull request 'fixed 4832-refactor_workerTimeControl.sendMail' (!1147) from 4832-refactor_workerTimeControl.sendMail into dev ... Reviewed-on: #1147 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-21 06:41:52 +00:00
Vicent Llopis	4c4482c40a	Merge branch 'dev' into 4832-refactor_workerTimeControl.sendMail	2022-11-21 06:09:05 +00:00
Pau	c320342476	Merge branch 'dev' into 4507-greuge-add-userFk	2022-11-21 06:05:43 +00:00
Joan Sanchez	813cf78128	Merge branch 'dev' into 4793-models_translation	2022-11-18 14:03:09 +00:00
Pau	0f17c082a3	refs #4557 @1h left join note only delivery	2022-11-18 12:07:33 +01:00
Joan Sanchez	3d3a317b52	Merge pull request 'MASTER fix: use vn email' (!1159) from hotFix_useVerdnaturaEmail into master ... Reviewed-on: #1159 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-18 09:42:13 +00:00
Alex Moreno	f8e6b71bc6	typo	2022-11-18 10:27:05 +01:00
Alex Moreno	77b2f9cbd9	user emailUser	2022-11-18 10:25:25 +01:00
Alex Moreno	d70d848717	fix: use vn email	2022-11-18 09:57:07 +01:00
Alexandre Riera	a952fc0330	space fixtures	2022-11-18 09:38:22 +01:00
Alexandre Riera	67f0346980	space fixtures	2022-11-18 09:37:38 +01:00
Alexandre Riera	fd58eaf838	drop procedure	2022-11-18 09:36:38 +01:00
Pau	65fd5e2c8f	Possible change?	2022-11-18 08:51:17 +01:00
Alex Moreno	0dfdcda1a6	Merge pull request 'invoiceIn-disable-options' (!1158) from invoiceIn-disable-options into test ... Reviewed-on: #1158	2022-11-18 06:43:23 +00:00
Alex Moreno	8e758f5456	invoiceIn-disable-options	2022-11-18 06:36:30 +00:00
Joan Sanchez	d7729654ee	fix(ordersFilter): wrong table schema	2022-11-17 16:48:31 +01:00
Joan Sanchez	f501707adf	fix(ordersFilter): wrong table schema	2022-11-17 16:47:01 +01:00
Joan Sanchez	721f89b76c	fix(ordersFilter): wrong table schema	2022-11-17 16:39:12 +01:00
Vicent Llopis	d4712e27c3	fix: no repite la llamada filter cada vez q cambias de seccion	2022-11-17 11:31:36 +01:00
Alexandre Riera	844eed55b6	Merge pull request 'fixes #4780 Quitar verificación de rol salesPerson del código' (!1156) from 4780-quitar-verificacion into dev ... Reviewed-on: #1156 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2022-11-17 10:30:00 +00:00
Alexandre Riera	4a063cc310	refs #4780 verification deleted	2022-11-17 09:25:18 +01:00
Alexandre Riera	c4430b4bca	fix acl	2022-11-17 08:56:51 +01:00
Alexandre Riera	153cb48ff0	fix test	2022-11-17 08:55:35 +01:00
Vicent Llopis	161886c936	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4832-refactor_workerTimeControl.sendMail	2022-11-17 07:22:26 +01:00
Alex Moreno	9405333c07	try	2022-11-16 15:29:02 +01:00
Pau	9257a02390	Merge branch 'dev' into 4507-greuge-add-userFk	2022-11-16 13:34:49 +00:00
Pau	f56c226fba	Merge branch 'dev' into 4767-route.index-delete-route	2022-11-16 13:32:32 +00:00
Alexandre Riera	566d384483	Merge branch '3557-back-missingTrash' of https://gitea.verdnatura.es/verdnatura/salix into 3557-back-missingTrash	2022-11-16 13:46:20 +01:00
Alexandre Riera	e4a6585b6a	fix test back	2022-11-16 13:46:16 +01:00
Pau	a733bc8c2f	refs #4789 hasInvoice on ticket searchbar @3h30m	2022-11-16 13:36:26 +01:00
Vicent Llopis	3d352fa0fd	fix: locale no puede ser undefined	2022-11-16 12:06:50 +01:00
Vicent Llopis	b2e3d61954	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4793-models_translation	2022-11-16 11:53:47 +01:00