13596 Commits

All Branches

Search

Author	SHA1	Message	Date
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	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
Alexandre Riera	edb495c744	fix describe	2022-11-16 11:52:35 +01:00
Alexandre Riera	489df60afc	suggested filter added	2022-11-16 11:10:00 +01:00
Pau	46af56922c	Merge pull request 'fix(e2e test expected withoutNegatives checkbox to not be checked already)' (!1150) from fix-e2e-test-withoutNegatives into dev ... Reviewed-on: #1150 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2022-11-16 09:25:08 +00:00
Alexandre Riera	78dc7db7a7	correcciones	2022-11-16 09:46:35 +01:00
Vicent Llopis	9bbaa7c718	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4793-models_translation	2022-11-16 09:41:43 +01:00
Alexandre Riera	655338d79e	Merge branch 'dev' into 3557-back-missingTrash	2022-11-16 08:19:57 +00:00
Pau	34b189ea10	Merge branch 'dev' into fix-e2e-test-withoutNegatives	2022-11-16 08:10:06 +00:00
Pau	67f8db6166	Merge pull request '4157-send-sms-to-routes' (!1106) from 4157-send-sms-to-routes into dev ... Reviewed-on: #1106 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-16 08:09:25 +00:00
Alex Moreno	ccb0cfdf01	Merge branch 'dev' into fix-e2e-test-withoutNegatives	2022-11-16 08:08:08 +00:00
Pau	7779059459	Merge branch 'dev' into 4157-send-sms-to-routes	2022-11-16 08:05:19 +00:00
Pau	78ba047df0	Merge pull request '4492-item.create-same-as-item.isLaid' (!1125) from 4492-item.create-same-as-item.isLaid into dev ... Reviewed-on: #1125 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-16 08:04:53 +00:00
Pau	2a4af7ac78	Merge branch 'dev' into 4492-item.create-same-as-item.isLaid	2022-11-16 07:29:09 +00:00
Pau	b21d4b698e	Merge branch 'dev' into 4157-send-sms-to-routes	2022-11-16 07:29:03 +00:00
Pau	a3f56f1622	Merge branch 'dev' into 4507-greuge-add-userFk	2022-11-16 07:28:39 +00:00
Pau	7b3a1bfb22	requested changes	2022-11-16 08:28:12 +01:00
Pau	66e6a47692	fix(e2e test expected withoutNegatives checkbox to not be checked already)	2022-11-16 08:25:07 +01:00
Alexandre Riera	8d4d6fa94c	Merge branch 'dev' into 3557-back-missingTrash	2022-11-16 07:24:58 +00:00
Alex Moreno	080d6aedf4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-16 08:19:39 +01:00
Alex Moreno	e32ddd9f44	Merge pull request 'remove-focus' (!1149) from remove-focus into dev ... Reviewed-on: #1149 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2022-11-16 07:17:08 +00:00
Alexandre Riera	7c8178b423	Merge branch 'dev' into 3557-back-missingTrash	2022-11-16 07:07:20 +00:00
Alex Moreno	925c384622	Actualizar 'e2e/paths/05-ticket/02_expeditions_and_log.spec.js' ... remove focus	2022-11-16 06:36:35 +00:00
Vicent Llopis	0089b821cf	fix: corregido test intermitente	2022-11-16 07:26:30 +01:00