5414 Commits

Author	SHA1	Message	Date
Alexandre Riera	40ea9805cf	fixes #4547 check compensation and tests	2022-11-21 10:49:19 +01: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
Alexandre Riera	4a063cc310	refs #4780 verification deleted	2022-11-17 09:25:18 +01:00
Pau	7779059459	Merge branch 'dev' into 4157-send-sms-to-routes	2022-11-16 08:05:19 +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	90f69da3ca	Merge branch 'dev' into 4157-send-sms-to-routes	2022-11-15 10:30:14 +00:00
Alex Moreno	53fb575fc0	Merge branch 'dev' into 3569-refactor_isEditable-canEdit	2022-11-15 09:38:52 +00:00
Alex Moreno	31eb2c86b5	Merge branch 'dev' into 3569-refactor_isEditable-canEdit	2022-11-15 09:20:26 +00:00
Joan Sanchez	fdb35850ee	Merge branch 'dev' into 4811-invoice_storage	2022-11-15 09:05:39 +00:00
Joan Sanchez	174dd1fe5c	feat(invoice): send invoice from stored PDF - closes #4811	2022-11-15 10:00:21 +01:00
Vicent Llopis	b5f67425ff	Merge branch 'dev' into jenkins_backTest_solved	2022-11-15 08:54:05 +00:00
Alex Moreno	6fdcb52e2a	Merge branch 'dev' into 3569-refactor_isEditable-canEdit	2022-11-15 08:43:19 +00:00
Vicent Llopis	a58379579f	Merge branch 'dev' into 4090-global_invoincing	2022-11-15 08:38:53 +00:00
Pau	dc64d619f6	Merge branch 'dev' into 4484-ticket-withOutNegatives-default-true	2022-11-15 07:34:19 +00:00
Alex Moreno	bcab493f37	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-11-15 07:33:53 +01:00
Pau	e6e70703a6	Merge branch 'dev' into 4157-send-sms-to-routes	2022-11-15 06:09:40 +00:00
Pau	3610b3bf19	Merge branch 'dev' into 4492-item.create-same-as-item.isLaid	2022-11-15 06:07:56 +00:00
Vicent Llopis	63142a8861	refactor	2022-11-14 15:16:21 +01:00
Vicent Llopis	0637050375	fix: frontTest	2022-11-14 15:11:33 +01:00
Vicent Llopis	216108a576	refactor	2022-11-14 15:01:22 +01:00
Vicent Llopis	386e304958	fix: modelo incorreto para la transacción	2022-11-14 14:52:08 +01:00
Vicent Llopis	6e94d7f68e	fix: nombre variable incorrecto	2022-11-14 11:00:13 +01:00
Vicent Llopis	7e50f23563	refacor code	2022-11-11 08:55:56 +01:00
Vicent Llopis	a5b20bfb03	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing	2022-11-11 08:53:10 +01:00
Vicent Llopis	9d06f5c0f0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing	2022-11-11 07:47:29 +01:00
Pau	9004839e00	Merge branch '4484-ticket-withOutNegatives-default-true' of https://gitea.verdnatura.es/verdnatura/salix into 4484-ticket-withOutNegatives-default-true	2022-11-10 14:53:14 +01:00
Pau	01fe8c8997	requested changes	2022-11-10 14:53:08 +01:00
Vicent Llopis	918ea3030d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail	2022-11-10 14:41:12 +01:00
Alex Moreno	37d412bf3b	refactor: delete unnecessary test	2022-11-10 14:38:37 +01:00
Alex Moreno	32701794bc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-11-10 13:34:43 +01:00
Pau	c15d40b237	Merge branch 'dev' into 4484-ticket-withOutNegatives-default-true	2022-11-10 08:45:15 +00:00
Pau	2704017486	check default true	2022-11-10 09:43:19 +01:00
Joan Sanchez	5a56fb4b6a	Merge pull request '4590-Refactor-isBox-freightItemFk' (!1079) from 4590-Refactor-isBox-freightItemFk into dev ... Reviewed-on: #1079 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-10 07:50:10 +00:00
Pau	c4044ff70d	Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk	2022-11-10 07:40:14 +00:00
Pau	b1a068ea48	Merge branch '4157-send-sms-to-routes' of https://gitea.verdnatura.es/verdnatura/salix into 4157-send-sms-to-routes	2022-11-10 07:23:10 +01:00
Pau	891cd6b474	Added requestes changes refs #4157	2022-11-10 07:23:08 +01:00
Pau	747404521a	Merge branch 'dev' into 4157-send-sms-to-routes	2022-11-10 06:22:24 +00:00
Pau	da8ebf1509	Merge branch '4492-item.create-same-as-item.isLaid' of https://gitea.verdnatura.es/verdnatura/salix into 4492-item.create-same-as-item.isLaid	2022-11-10 07:17:57 +01:00
Pau	638fd62aae	added requested changes, refs #4492 @40m	2022-11-10 07:17:54 +01:00
Pau	dd10ec3154	Merge branch 'dev' into 4492-item.create-same-as-item.isLaid	2022-11-10 06:15:00 +00:00
Guillermo Bonet	6804c1a756	Merge branch 'dev' into 4550-printServer	2022-11-09 16:55:29 +01:00
Alexandre Riera	ff2ee4401e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4547-informe-compensacion	2022-11-09 13:26:54 +01:00
Vicent Llopis	0bd09ae366	fix: delete unnecessary column	2022-11-09 12:06:51 +01:00
Vicent Llopis	1ea5ffa6d3	fix: backTest	2022-11-09 12:04:19 +01:00
Vicent Llopis	be46f30dd7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail	2022-11-09 10:32:24 +01:00
Vicent Llopis	574f2757f4	refactor code	2022-11-09 10:19:27 +01:00
Vicent Llopis	79e9edcee9	delete: old code	2022-11-09 09:26:28 +01:00