5724 Commits

Author	SHA1	Message	Date
Joan Sanchez	7e12938de3	Merge branch 'dev' into test	2022-11-22 12:53:03 +00:00
Alexandre Riera	5552cd654e	Merge branch 'dev' into 4547-fix-compensation	2022-11-22 10:48:11 +00:00
Alexandre Riera	d5521adb6b	working on tests	2022-11-22 11:44:36 +01:00
Alexandre Riera	6656ea4f54	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-22 10:20:42 +01:00
Alexandre Riera	2651081838	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour	2022-11-22 10:15:31 +01:00
Alexandre Riera	c51354b13f	refs #3949 textfield, edit and create dialog added	2022-11-22 09:29:25 +01:00
Vicent Llopis	8876bc2b68	Merge branch 'dev' into 4793-models_translation	2022-11-22 08:12:07 +00:00
Pau	3b66da20ca	Merge branch 'dev' into 4791-refactor-sendsms	2022-11-22 07:01:33 +00:00
Pau	4bd643143b	requested changes refs #4791 @1h	2022-11-22 07:59:18 +01:00
Pau	cb6ae41c13	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-21 13:45:28 +00:00
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	0099b42fe3	requested changes	2022-11-21 14:06:38 +01: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	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
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
Pau	65fd5e2c8f	Possible change?	2022-11-18 08:51:17 +01: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
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
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
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
Pau	a733bc8c2f	refs #4789 hasInvoice on ticket searchbar @3h30m	2022-11-16 13:36:26 +01:00
Alexandre Riera	66002968f6	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-16 11:10:21 +01:00
Alexandre Riera	489df60afc	suggested filter added	2022-11-16 11:10:00 +01:00
Alexandre Riera	4feb2bea2c	working on e2e	2022-11-16 10:57:15 +01:00
Alexandre Riera	294f806bd9	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-16 09:52:13 +01: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
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
Vicent Llopis	0089b821cf	fix: corregido test intermitente	2022-11-16 07:26:30 +01:00
Vicent Llopis	46c7aa24b8	fix: corregidas traducciones	2022-11-16 07:14:45 +01:00
Pau	d7dc7c4329	Merge branch 'dev' into 4507-greuge-add-userFk	2022-11-16 06:08:01 +00:00
Alexandre Riera	b7c9d6ea50	refs #3963 front and back tests fixed	2022-11-15 15:30:00 +01:00
Vicent Llopis	c200e1af32	refactor: optimizado select	2022-11-15 15:09:41 +01:00
Pau	192d7336a4	change test	2022-11-15 14:22:09 +01:00
Pau	6e58b1de8b	refs #4511 Changed fixtures to fix broken test @30min	2022-11-15 14:17:24 +01:00
Vicent Llopis	dd8117b6a4	feat: añadidas traducciones	2022-11-15 14:02:31 +01:00
Pau	56893ea58b	Merge branch 'dev' into 4511-kkear-expedition.itemFk	2022-11-15 13:42:06 +01:00
Alex Moreno	8dcd567a68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-15 13:20:52 +01:00
Alexandre Riera	09d7c450a2	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-15 13:08:36 +01:00
Alexandre Riera	97a6aff499	fix workerFk	2022-11-15 13:08:06 +01:00
Alexandre Riera	607f61092a	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-15 13:06:10 +01:00
Alexandre Riera	01607c71b6	fix rocket message and order table	2022-11-15 13:03:55 +01:00
Vicent Llopis	fc516d4029	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4793-models_translation	2022-11-15 12:23:59 +01:00
Vicent Llopis	843e5ae736	feat: traducciones en los modelos	2022-11-15 11:41:57 +01:00
Pau	90f69da3ca	Merge branch 'dev' into 4157-send-sms-to-routes	2022-11-15 10:30:14 +00:00
Pau	4e2741a9cd	Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente	2022-11-15 11:01:02 +01:00
Pau	31a0aae8e9	Fixed notification not getting inserted	2022-11-15 11:01:00 +01:00
Pau	2b3b2086d9	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-15 09:39:03 +00:00
Alex Moreno	53fb575fc0	Merge branch 'dev' into 3569-refactor_isEditable-canEdit	2022-11-15 09:38:52 +00:00
Pau	f1b706d178	Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente	2022-11-15 10:37:13 +01:00
Pau	6339634756	refs #4457 move sql, remove await on front @2h	2022-11-15 10:37:12 +01: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	60d12826e4	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-15 07:59:53 +00:00
Pau	9d0cd36afe	Merge branch 'dev' into 4457'	2022-11-15 08:49:21 +01:00
Pau	dc64d619f6	Merge branch 'dev' into 4484-ticket-withOutNegatives-default-true	2022-11-15 07:34:19 +00:00
Pau	5c249dcbcc	refs #4767 @1h30m	2022-11-15 08:24:10 +01: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	29b299f36a	Merge branch 'dev' into 4507-greuge-add-userFk	2022-11-15 06:10:31 +00: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
Alexandre Riera	23ed6c6031	refs #3963 test front done	2022-11-14 14:30:35 +01:00
Alexandre Riera	99aa674995	refs #3963 working on mockup	2022-11-14 14:29:40 +01:00
Vicent Llopis	d6a0580203	feat: traducciones modelo Ticket	2022-11-14 11:08:23 +01:00
Vicent Llopis	6e94d7f68e	fix: nombre variable incorrecto	2022-11-14 11:00:13 +01:00
Alexandre Riera	dc06ba7d89	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-14 09:58:18 +01:00
Alexandre Riera	7dd87b1ea8	refs #4700 icons future	2022-11-14 09:56:23 +01:00
Alexandre Riera	05f0eba741	Merge branch 'split-tour' into 3963-ticket-advance	2022-11-14 09:06:51 +01:00
Alexandre Riera	c16210dd8a	refs #4700 working on e2e	2022-11-11 15:58:11 +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
Alexandre Riera	117e2c03f5	refs #4700 tests back y empezando e2e	2022-11-10 15:54:00 +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	4c216c4556	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-10 14:40:55 +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
Alex Moreno	517422be8c	refactor: not use axios	2022-11-10 13:32:07 +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	8b06243041	Fix link being the whole column	2022-11-10 08:36:26 +01:00
Pau	8dd6012b1f	Added worker descriptor popover	2022-11-10 08:27:47 +01:00
Pau	c53e309071	Fix typo	2022-11-10 08:19:54 +01:00
Pau	1327f0ae9d	Added requested changes, refs #4507 @1:20h	2022-11-10 08:18:05 +01:00
Pau	eab9289408	Merge branch 'dev' into 4507-greuge-add-userFk	2022-11-10 06:26:05 +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
Alex Moreno	5339bc1143	feat(recoverPassword): use loopback	2022-11-09 14:51:30 +01:00
Alex Moreno	cace29f75c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-09 14:20:17 +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
Vicent Llopis	2ab475791c	refactor code	2022-11-09 09:16:58 +01:00
Vicent Llopis	dbd0e77e12	feat: send mail with the invoice pdf	2022-11-09 09:14:32 +01:00
Vicent Llopis	9bcfebcae6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing	2022-11-09 07:26:56 +01:00
Alex Moreno	8c137b57f4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-09 07:10:35 +01:00
Alexandre Riera	ff00066138	refs #4700 tests front y fixtures	2022-11-08 15:56:58 +01:00
Guillermo Bonet	6744b3f797	added collection-label	2022-11-08 14:40:38 +01:00
Pau	2fc12dff52	#4457 @1h notifications working, need refactor ACL	2022-11-08 13:59:00 +01:00
Pau	e85505ee8e	#4457 implement notification system, @1h 30m	2022-11-08 12:26:01 +01:00
Pau	f21907855f	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-08 10:04:47 +01:00
Pau	f45eaa07f9	refs #4511 fixed test, changed drop to rename @1h	2022-11-08 09:45:56 +01:00
Pau	f1e832ee66	Merge branch 'dev' into 4490-transfer-tickets-between-clients	2022-11-08 08:06:30 +00:00
Vicent Llopis	9cd57bfde9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail	2022-11-08 08:56:56 +01:00
Vicent Llopis	4d81991d86	delete focus test	2022-11-08 08:47:08 +01:00
Vicent Llopis	8d7296cc8f	feat: add backTest	2022-11-08 08:46:47 +01:00
Vicent Llopis	11459bbd56	refactor: change column name	2022-11-08 08:46:36 +01:00
Pau	0da6bd44e7	Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk	2022-11-08 07:06:27 +00:00
Pau	2df195764d	Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk	2022-11-08 08:05:13 +01:00
Pau	ab3d0a2549	Merge branch 'dev' into 4157-send-sms-to-routes	2022-11-08 06:59:45 +00:00
Vicent Llopis	51b047eacc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail	2022-11-08 07:40:31 +01:00
Alexandre Riera	896a7eb6f0	refs #4700 arreglar filtro y traducciones	2022-11-07 15:55:17 +01:00
Vicent Llopis	7fc18c89df	feat: error handlers	2022-11-07 13:57:54 +01:00
Vicent Llopis	ffa0ff650e	feat: add time control	2022-11-07 12:21:14 +01:00
Vicent Llopis	b1eb7d469f	fix: error duplicated key	2022-11-07 09:51:33 +01:00
Alex Moreno	2165ca0f34	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-07 09:34:24 +01:00
Alex Moreno	03ec8e27e6	feat(ticket_isEditable): use ticketWeekly	2022-11-07 09:19:20 +01:00
Alex Moreno	5051f8b590	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-11-07 07:24:44 +01:00
Vicent Llopis	6858de83a3	feat: backTest	2022-11-04 14:55:47 +01:00
Vicent Llopis	892094f85c	feat: add backTest	2022-11-04 13:41:45 +01:00
Vicent Llopis	98cc2b5866	refactor: endpoint	2022-11-04 13:41:38 +01:00
Vicent Llopis	626355d251	fix: sustituido insert por insert ignore	2022-11-04 12:37:07 +01:00
Vicent Llopis	ae513fb2b3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing	2022-11-04 09:12:16 +01:00
Vicent Llopis	158fc56555	Merge branch 'dev' into 3951-invoiceOut.index_downloadPdfs	2022-11-04 08:03:55 +00:00
Joan Sanchez	f53b74c04c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-11-04 09:02:33 +01:00
Joan Sanchez	16554c23a8	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-11-04 09:02:18 +01:00
Pau	6a5ba6a929	Merge branch 'dev' into 4157-send-sms-to-routes	2022-11-04 07:36:46 +00:00
Pau	7ff4c4d33c	Merge branch 'dev' into 4507-greuge-add-userFk	2022-11-04 07:35:01 +00:00
Pau	a975f37fc3	Merge branch 'dev' into 4490-transfer-tickets-between-clients	2022-11-04 07:27:15 +00:00
Pau	ae95b5d3ef	Merge branch 'dev' into 4492-item.create-same-as-item.isLaid	2022-11-04 07:22:37 +00:00
Alexandre Riera	98dd5963bf	refs #4547 traduccion añadida	2022-11-04 08:15:12 +01:00
Pau	37292cee89	remove comments	2022-11-04 08:12:46 +01:00
Alex Moreno	28edb2e53a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-11-04 08:09:15 +01:00
Vicent Llopis	e1d187ef68	Merge branch 'dev' into 3951-invoiceOut.index_downloadPdfs	2022-11-04 07:01:45 +00:00
Pau	11cf1ba414	fix back test error	2022-11-04 07:50:54 +01:00
Pau	42dd56a78c	Merge branch 'dev' into 4490-transfer-tickets-between-clients	2022-11-04 06:46:23 +00:00
Pau	7d7af6eb49	Modified model to allow modifications to isLaid	2022-11-04 07:42:21 +01:00
Vicent Llopis	ab739f412f	feat: add test	2022-11-03 15:00:55 +01:00
Alexandre Riera	8e5f518eb6	refs #4753 texto y fecha sms cambiados	2022-11-03 14:16:11 +01:00
Vicent Llopis	b6d3a08871	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3951-invoiceOut.index_downloadPdfs	2022-11-03 10:17:46 +01:00
Alex Moreno	e6e8f15d64	Merge branch 'dev' into 3569-refactor_isEditable-canEdit	2022-11-03 08:39:10 +00:00
Alex Moreno	36894c31de	Merge branch 'dev' into 4077-login_recover-password	2022-11-03 08:39:04 +00:00
Alexandre Riera	6663b600a7	Merge branch 'dev' into 4644-supplier.fiscal-data	2022-11-03 07:54:06 +00:00
Alex Moreno	e370f20cec	Merge branch 'dev' into 4159-tableQ_filter	2022-11-03 07:49:18 +00:00
Alexandre Riera	3376f301b1	Merge branch 'dev' into 4644-supplier.fiscal-data	2022-11-03 07:49:02 +00:00
Alex Moreno	12df808844	Merge branch 'dev' into 4159-tableQ_filter	2022-11-03 07:43:14 +00:00
Joan Sanchez	254a56cd78	Merge branch 'dev' into 4548-invoiceIn-pdf	2022-11-03 07:42:41 +00:00
Alex Moreno	d100ab4112	Merge branch 'dev' into 4159-tableQ_filter	2022-11-03 07:39:47 +00:00
Joan Sanchez	009e9e3bb7	Merge branch 'dev' into 4548-invoiceIn-pdf	2022-11-03 07:35:02 +00:00
Alexandre Riera	8304c849e4	Merge branch 'dev' into 2818-sincronizar-usuarios	2022-11-03 07:34:49 +00:00
Alexandre Riera	4be3106245	Merge branch 'dev' into 4645-refactor-entry.ref	2022-11-03 07:29:49 +00:00
Alexandre Riera	0736fb4818	Merge branch 'dev' into 2818-sincronizar-usuarios	2022-11-03 07:28:47 +00:00
Alex Moreno	ec9139f985	Merge branch 'dev' into 4159-tableQ_filter	2022-11-03 07:24:05 +00:00
Alex Moreno	6d85cf7cf5	translations	2022-11-03 08:21:03 +01:00
Alex Moreno	67697784cd	Merge branch 'dev' into 4548-invoiceIn-pdf	2022-11-03 06:48:38 +00:00
Vicent Llopis	35c50cb314	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3951-invoiceOut.index_downloadPdfs	2022-11-03 07:11:54 +01:00
Juan Ferrer	dc2b61a0a4	Merge branch 'dev' into 2818-sincronizar-usuarios	2022-11-02 15:20:11 +00:00
Alexandre Riera	908908a643	refs #4547 correcciones	2022-11-02 15:54:23 +01:00
Vicent Llopis	f96fc0f91e	Merge branch 'dev' into 3852-client.search-panel2	2022-11-02 14:13:41 +00:00
Alex Moreno	621158badc	fix(checkInbox): fix condition	2022-11-02 15:11:36 +01:00
Vicent Llopis	8c4e70c11d	Merge branch 'dev' into 3095-item.shelving	2022-11-02 14:06:06 +00:00
Vicent Llopis	3cc89c170c	Merge branch 'dev' into 3811-ticket.sale_updatePrice	2022-11-02 13:55:07 +00:00
Vicent Llopis	8a4aa6285b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-11-02 14:49:39 +01:00
Vicent Llopis	7eaafa36a0	Merge branch 'dev' into 4616-ticket.sale_mana	2022-11-02 13:42:26 +00:00
Vicent Llopis	6df74facdc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail	2022-11-02 14:23:20 +01:00
Vicent Llopis	57564325e1	feat: añadidas opciones para confirmar o no confirmar el registro de horas	2022-11-02 14:22:18 +01:00
Alexandre Riera	8d8d217fe7	refs #4547 formateo arreglado	2022-11-02 13:59:13 +01:00
Alex Moreno	59e66e1f49	typo	2022-11-02 13:55:06 +01:00
Alex Moreno	2c3b735650	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf	2022-11-02 13:49:09 +01:00
Alex Moreno	6a9134d8f9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-11-02 13:48:36 +01:00
Alex Moreno	9c671ed3a4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-02 13:47:00 +01:00
Alex Moreno	acf76aeeef	Merge branch 'dev' into 4159-tableQ_filter	2022-11-02 12:25:38 +00:00
Alex Moreno	2a8a8ed84a	Merge branch 'dev' into 4146-claim_pickup_order	2022-11-02 12:01:11 +00:00
Joan Sanchez	34997b72f5	Merge branch 'dev' into 3811-ticket.sale_updatePrice	2022-11-02 11:55:47 +00:00
Alex Moreno	4cded53347	Merge branch 'dev' into 4077-login_recover-password	2022-11-02 11:23:03 +00:00
Joan Sanchez	2fba17ab15	Merge branch 'dev' into 4548-invoiceIn-pdf	2022-11-02 09:33:27 +00:00
Alexandre Riera	dc3ee2c30d	refs #2818 sincronización quitada en test	2022-11-02 10:18:38 +01:00
Alex Moreno	9891f7060d	fix(smart-table): monitor only ticketFilter use url and add ?q in routes	2022-11-02 09:40:09 +01:00
Joan Sanchez	fe3ebe8e0c	Merge branch 'dev' into 3095-item.shelving	2022-11-02 06:43:43 +00:00
Joan Sanchez	177b448441	Merge branch 'dev' into 4616-ticket.sale_mana	2022-11-02 06:42:35 +00:00
Alex Moreno	755a1667dc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-02 07:35:04 +01:00
Joan Sanchez	33c92a0f24	Merge pull request '4563-Worker-Description-workerDisableExcluded-checkbox' (!1076) from 4563-Worker-Description-workerDisableExcluded-checkbox into dev ... Reviewed-on: #1076 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-02 06:34:49 +00:00
Alex Moreno	fc7a39e910	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order	2022-11-02 07:33:07 +01:00
Alex Moreno	e7047e982f	fix e2e	2022-10-31 15:07:22 +01:00
Vicent Llopis	d9107719fa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail	2022-10-31 15:04:33 +01:00
Vicent Llopis	3243d35bd7	feat: send email	2022-10-31 14:48:37 +01:00
Pau	ff5e601a1e	Item islaid and test	2022-10-31 14:43:31 +01:00
Alex Moreno	b37c257885	feat(canEdit): use checkAccess	2022-10-31 14:13:06 +01:00
Alex Moreno	36c0cc1a38	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-31 14:12:40 +01:00
Vicent Llopis	1f2ea2c4d8	fix: incorrect number of params	2022-10-31 13:30:08 +01:00
Vicent Llopis	273a8cd7c7	refactor code	2022-10-31 13:00:32 +01:00
Joan Sanchez	231575d23e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-10-31 12:40:07 +01:00
Joan Sanchez	d34936015b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-10-31 12:39:54 +01:00
Joan Sanchez	463d3e6e12	Fixes	2022-10-31 12:39:26 +01:00
Vicent Llopis	b17fe0d18c	refator code	2022-10-31 09:55:11 +01:00
Pau	0739608de3	Merge branch 'dev' into 4457-hasInvoiceElectronic	2022-10-31 07:57:50 +01:00
Vicent Llopis	786ba0d614	feat: inserta fichadas de los teletrabajadores	2022-10-31 07:34:34 +01:00
Alexandre Riera	1246a65f32	refs #4547 informe y email generados	2022-10-28 14:49:22 +02:00
Alex Moreno	445c6f1cc9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-28 09:32:08 +02:00
Alex Moreno	9170c22d6f	fix send email	2022-10-28 09:21:28 +02:00
Alex Moreno	e9731c4ac0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order	2022-10-28 09:11:40 +02:00
Alex Moreno	9225e8f176	fix tests	2022-10-27 15:11:57 +02:00
Pau	00061caa65	Merge branch '4490-transfer-tickets-between-clients' of https://gitea.verdnatura.es/verdnatura/salix into 4490-transfer-tickets-between-clients	2022-10-27 09:05:06 +02:00
Alex Moreno	926ab0e35c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order	2022-10-27 09:05:05 +02:00
Pau	c576e503cf	fix httpBack.flush error	2022-10-27 09:05:05 +02:00
Alex Moreno	3ffc098b56	feat(privileges): check if user has role from userToUpdate	2022-10-27 09:01:09 +02:00
Pau	d64f0e4b34	Merge branch 'dev' into 4490-transfer-tickets-between-clients	2022-10-27 06:52:08 +00:00
Pau	04514804b7	fix tests	2022-10-27 08:51:22 +02:00
Pau	bfb9484e02	Merge branch '4490-transfer-tickets-between-clients' of https://gitea.verdnatura.es/verdnatura/salix into 4490-transfer-tickets-between-clients	2022-10-27 08:46:24 +02:00
Pau	d4a22f7962	Apply requested changes	2022-10-27 08:46:22 +02:00