1948 Commits

Author	SHA1	Message	Date
Vicent Llopis	c258587e02	feat: plantilla email para asientos contables importados incorrectamente	2022-11-29 15:06:21 +01:00
Pau	cc87565190	Merge branch 'dev' into 4732-previa-label	2022-11-29 14:16:15 +01:00
Alexandre Riera	cd8d5efa88	corrections	2022-11-29 10:29:18 +01:00
Alexandre Riera	acbd0474a5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-29 08:50:48 +01:00
Carlos Andrés	8a0c810a84	refs #4613	2022-11-28 17:45:19 +01:00
Alex Moreno	7f1478f2e9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db	2022-11-28 14:48:37 +01:00
Carlos Andrés	2a4e8cdde9	Merge branch 'dev' into 4613-Eliminar-cálculo-portfolio	2022-11-28 12:19:58 +00:00
Carlos Andrés	bc83b9fd1f	Merge branch '4613-Eliminar-cálculo-portfolio' of https://gitea.verdnatura.es/verdnatura/salix into 4613-Eliminar-cálculo-portfolio	2022-11-28 10:07:21 +01:00
Carlos Andrés	2b0e6ab5ed	test	2022-11-28 10:07:18 +01:00
Alex Moreno	e4bbb6e83a	Merge branch 'dev' into 4613-Eliminar-cálculo-portfolio	2022-11-28 08:43:55 +00:00
Alex Moreno	804db15ece	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-28 07:53:51 +01:00
Alex Moreno	6db1a9e8ae	refs #4859 fix: fixtures db exportation	2022-11-28 07:19:30 +01:00
Vicent Llopis	7f3265be55	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel	2022-11-25 12:24:00 +01:00
Vicent Llopis	5415338f55	refactor: movidos changes sql	2022-11-25 12:17:16 +01:00
Vicent Llopis	4ef2e3dfcd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-11-25 12:16:40 +01:00
Alexandre Riera	9f10129152	sql moved to 10510	2022-11-25 10:27:45 +01:00
Alexandre Riera	8fec0670ea	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-25 10:25:46 +01:00
Vicent Llopis	e540bf7b31	feat: inserta en la nueva tabla ticketSms	2022-11-25 09:38:34 +01:00
Carlos Andrés	8d2e532167	#4613 eliminar uso de portfolio	2022-11-25 09:32:54 +01:00
Alex Moreno	c9347a929a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db	2022-11-25 08:52:11 +01:00
Vicent Llopis	d023ec0a13	update fixtures	2022-11-25 08:24:25 +01:00
Joan Sanchez	92557ea22d	Added version 10510	2022-11-25 07:43:34 +01:00
Vicent Llopis	dbbce77cc8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-11-25 07:41:43 +01:00
Joan Sanchez	4e7ef47b88	SQL fixes	2022-11-25 07:41:08 +01:00
Pau	02f2724f2b	Merge branch 'dev' into 4732-previa-label	2022-11-25 06:35:15 +00:00
Pau	9252fc896f	Merge branch '#288-traducir-state-i18n' of https://gitea.verdnatura.es/verdnatura/salix into #288-traducir-state-i18n	2022-11-25 07:08:57 +01:00
Pau	724c1e6e8a	remove unnecessary index	2022-11-25 07:08:54 +01:00
Vicent Llopis	84c6604dd9	feat: enviar sms con cambios en el pedido	2022-11-24 15:04:15 +01:00
Pau	0b15236129	Merge branch 'dev' into #288-traducir-state-i18n	2022-11-24 13:18:40 +00:00
Pau	15f14062ca	Requested changes	2022-11-24 14:06:52 +01:00
Vicent Llopis	d233286a3f	Merge branch 'dev' into DEV_fix_closeTicket	2022-11-24 12:44:37 +00:00
Vicent Llopis	74e8789439	Merge branch 'dev' into 4793-models_translation	2022-11-24 10:54:40 +00:00
Pau	f74b257d75	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-24 09:27:49 +00:00
Vicent Llopis	927b5a63ec	Merge branch 'dev' into 4793-models_translation	2022-11-24 09:14:01 +00:00
Alexandre Riera	32e4a7273c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-24 09:59:59 +01:00
Alexandre Riera	5124b3b681	Merge branch 'dev' into 4547-fix-compensation	2022-11-24 08:42:09 +00:00
Vicent Llopis	7ccf37c079	Merge branch 'dev' into 4793-models_translation	2022-11-24 08:08:56 +00:00
Vicent Llopis	6f2a7a5cef	feat: enviar sms con cambios en las líneas	2022-11-23 15:15:40 +01:00
Vicent Llopis	7f89899d6c	fix: closeTicket	2022-11-23 12:54:52 +01:00
Vicent Llopis	f313a53cde	refactor: cambiadas fixtures, backTest y traducciones	2022-11-23 10:56:55 +01:00
Vicent Llopis	6a2af344aa	feat: antes de bloquear comprobar que no existe un bloqueo previo	2022-11-23 10:41:32 +01:00
Vicent Llopis	9cfab2b3f4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-11-23 10:23:17 +01:00
Pau	a8520f851c	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-23 08:28:07 +00:00
Pau	ad38f50ae3	Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente	2022-11-23 08:55:46 +01:00
Pau	ade2e777d6	refs #4457 @30min requested changes	2022-11-23 08:55:44 +01:00
Pau	51d3091a40	Merge branch 'dev' into 4511-kkear-expedition.itemFk	2022-11-22 13:45:03 +00:00
Alex Moreno	660648e01f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-22 14:35:25 +01:00
Vicent Llopis	32f28e91b5	feat: sistema de bloque para ficheros mdb	2022-11-22 14:29:42 +01:00
Alexandre Riera	5552cd654e	Merge branch 'dev' into 4547-fix-compensation	2022-11-22 10:48:11 +00:00
Vicent Llopis	e148284332	jenkins test	2022-11-22 11:02:19 +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
Vicent Llopis	8876bc2b68	Merge branch 'dev' into 4793-models_translation	2022-11-22 08:12:07 +00:00
Alexandre Riera	8e1505d5ee	Merge branch 'dev' into 3557-back-missingTrash	2022-11-22 07:02:56 +00:00
Pau	cb6ae41c13	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-21 13:45:28 +00:00
Pau	3003290e61	refs #4551 @20min requested changes	2022-11-21 14:38:51 +01:00
Pau	52630f0a25	add collections with sectorFk	2022-11-21 13:38:53 +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	cb0735d136	Merge branch 'dev' into 4507-greuge-add-userFk	2022-11-21 08:34:18 +00:00
Pau	7475aa8389	Merge branch 'dev' into 3681-move-sign_save-to-salix	2022-11-21 08:33:51 +00:00
Vicent Llopis	3fde11c3ed	Merge branch 'dev' into 4793-models_translation	2022-11-21 08:06:39 +00:00
Joan Sanchez	1f857d5b10	4859 - Export production database	2022-11-21 08:01:21 +01:00
Pau	d41269bbbe	Change fixtures so the provider is present in the label	2022-11-18 11:58:46 +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
Alexandre Riera	153cb48ff0	fix test	2022-11-17 08:55:35 +01:00
Pau	8059e54a26	Merge branch 'dev' into #288-traducir-state-i18n	2022-11-16 12:54:47 +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	5b4c1ad4e6	Merge branch 'dev' into 3681-move-sign_save-to-salix	2022-11-16 12:26:59 +01:00
Pau	6ab28678c5	Removed unused require and insert statement	2022-11-16 11:56:03 +01:00
Pau	0f0c4c0554	feat(save-sign implemented in salix back, refs 3681 @2h	2022-11-16 10:28:13 +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
Pau	7b3a1bfb22	requested changes	2022-11-16 08:28:12 +01:00
Pau	8e7e7901af	Implement needed functions refs #3681 @1h	2022-11-16 08:11:29 +01:00
Alexandre Riera	7c8178b423	Merge branch 'dev' into 3557-back-missingTrash	2022-11-16 07:07:20 +00: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	6e58b1de8b	refs #4511 Changed fixtures to fix broken test @30min	2022-11-15 14:17:24 +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
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	2b3b2086d9	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-15 09:39:03 +00: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
Alex Moreno	72400ebf02	change folder db	2022-11-15 09:37:14 +01:00
Alexandre Riera	5acbaf036a	refs #3557 back and test done	2022-11-15 09:30:36 +01:00
Pau	9d0cd36afe	Merge branch 'dev' into 4457'	2022-11-15 08:49:21 +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
Alexandre Riera	23ed6c6031	refs #3963 test front done	2022-11-14 14:30:35 +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
Pau	58c90b3bbc	refs #288	2022-11-11 13:41:22 +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
Joan Sanchez	163f7fd284	Added version 10503	2022-11-11 08:31:45 +01:00
Joan Sanchez	5e0a31f244	Merge pull request '3928-worker.time-control_sendMail' (!1129) from 3928-worker.time-control_sendMail into dev ... Reviewed-on: #1129	2022-11-11 07:30:01 +00: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
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
Joan Sanchez	6a2977a2cf	Fixed SQL changes	2022-11-10 14:19:20 +01:00
Pau	56201f4c1a	Start implementing method refs #3681 @3h	2022-11-10 13:37:16 +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
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	1327f0ae9d	Added requested changes, refs #4507 @1:20h	2022-11-10 08:18:05 +01:00
Guillermo Bonet	6804c1a756	Merge branch 'dev' into 4550-printServer	2022-11-09 16:55:29 +01:00
Vicent Llopis	79e9edcee9	delete: old code	2022-11-09 09:26:28 +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
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	d1be14605b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4511-kkear-expedition.itemFk	2022-11-08 09:32:09 +01:00
Pau	78e6c8da15	Merge branch 'dev' into 4511-kkear-expedition.itemFk	2022-11-08 09:08:06 +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
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	ffa0ff650e	feat: add time control	2022-11-07 12:21:14 +01:00
Joan Sanchez	92a2367db2	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-11-07 10:52:53 +01:00
Joan	be1fbc4d68	Added version 10502	2022-11-07 10:49:17 +01:00
Joan	17d6308126	Already on prod	2022-11-07 10:48:38 +01:00
Alex Moreno	c3ee9da6c6	hotFix: force apply changes	2022-11-07 10:18:32 +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	98cc2b5866	refactor: endpoint	2022-11-04 13:41:38 +01:00
Joan Sanchez	1bcde47ab1	Merge pull request '3951-invoiceOut.index_downloadPdfs' (!1110) from 3951-invoiceOut.index_downloadPdfs into dev ... Reviewed-on: #1110 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-04 10:42:32 +00:00
Joan Sanchez	2afb47fe14	Added version 10501 - November	2022-11-04 10:01:23 +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	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	67697784cd	Merge branch 'dev' into 4548-invoiceIn-pdf	2022-11-03 06:48:38 +00:00
Pau	30fb8b1bd2	Merge branch 'dev' into 1885-delete-orderConfirmUser.spec.js	2022-11-03 06:30:47 +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
Vicent Llopis	f96fc0f91e	Merge branch 'dev' into 3852-client.search-panel2	2022-11-02 14:13:41 +00: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
Alex Moreno	943103c254	Merge branch 'dev' into 4548-invoiceIn-pdf	2022-11-02 13:33:45 +00:00
Vicent Llopis	04f165d901	solved conflits	2022-11-02 14:23:35 +01: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
Alex Moreno	c1ed0f2226	Merge branch 'dev' into changesInCorrectFolder	2022-11-02 12:58:32 +00: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	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
Joan Sanchez	e2101db706	Merge branch 'dev' into 4155-close_tickets_fix2	2022-11-02 11:53:47 +00:00
Joan Sanchez	2fba17ab15	Merge branch 'dev' into 4548-invoiceIn-pdf	2022-11-02 09:33:27 +00:00
Joan Sanchez	fe3ebe8e0c	Merge branch 'dev' into 3095-item.shelving	2022-11-02 06:43:43 +00: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	a7b1ee85fe	fix changes folder	2022-11-02 07:27:57 +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
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
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
Vicent Llopis	838402f05a	add fixtures	2022-10-31 09:55:05 +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
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	e9731c4ac0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order	2022-10-28 09:11:40 +02:00
Vicent Llopis	264b56378a	Merge branch 'dev' into 4155-close_tickets_fix2	2022-10-28 06:31:12 +00:00
Alex Moreno	9eb3b09be1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-10-28 08:26:45 +02:00
Alex Moreno	80617dd578	Merge branch 'dev' into 4320-notificationQueue	2022-10-28 05:33:45 +00:00
Alex Moreno	9225e8f176	fix tests	2022-10-27 15:11:57 +02:00
Pau	736de00e77	deleted the test as requested on #1885	2022-10-27 09:18:00 +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
Alex Moreno	3ffc098b56	feat(privileges): check if user has role from userToUpdate	2022-10-27 09:01:09 +02:00
Alex Moreno	99fca9834f	Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk	2022-10-27 06:10:14 +00:00
Vicent Llopis	1d908002e2	feat: add backTest	2022-10-26 14:25:27 +02:00
Vicent Llopis	fa89d1f944	fix: comentario corregido	2022-10-26 13:10:50 +02:00
Vicent Llopis	65e32f5e7f	feat: client search panel add find by zone	2022-10-26 12:40:13 +02:00
Vicent Llopis	350c516bb1	feat: cancelar petición cuando esta calculando el packaging	2022-10-26 10:36:41 +02:00
Vicent Llopis	3110172c54	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3811-ticket.sale_updatePrice	2022-10-26 08:39:58 +02:00
Alex Moreno	f65d06fc7d	fixes #4073	2022-10-26 08:27:28 +02:00
Vicent Llopis	5e0f976ad2	Merge branch 'dev' into 4155-close_tickets_fix2	2022-10-26 06:25:18 +00:00
Vicent Llopis	07a18dc736	delete sql	2022-10-26 08:05:11 +02:00
Alex Moreno	f07f0679d8	fix fixture	2022-10-25 15:03:20 +02:00
Alex Moreno	342832c475	try	2022-10-25 15:02:22 +02:00
Alex Moreno	607e9010e6	Merge branch 'dev' into 4075-ticket_boxing	2022-10-25 12:36:35 +00:00
Joan Sanchez	4334907d91	fix(database): updated sql files	2022-10-25 14:09:21 +02:00
Pau	e72d57150a	Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk	2022-10-25 10:40:57 +00:00
Alex Moreno	ac8c4b8ef0	Merge branch 'dev' into 4075-ticket_boxing	2022-10-25 10:39:50 +00:00
Pau	7b04464848	Merge branch 'dev' into 2612-create-supplier	2022-10-25 10:00:13 +00:00