1303 Commits

Author	SHA1	Message	Date
Alexandre Riera	fb4432b088	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour	2022-12-16 13:06:06 +01:00
Alex Moreno	2a8a928ac5	feat: create invoiceIn	2022-12-16 10:36:18 +01:00
Alexandre Riera	855f00b1c9	Merge branch '4700-split-tour' into 3963-ticket-advance	2022-12-16 09:51:40 +01:00
Vicent Llopis	85148ab929	refactor: movidos changes sql	2022-12-16 08:59:06 +01:00
Vicent Llopis	3642b295b7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification	2022-12-16 08:50:51 +01:00
Alex Moreno	b8a0d179f1	Merge branch 'dev' into 4928-supplier-payMethod-notify	2022-12-16 07:08:39 +00:00
Vicent Llopis	1b30ee9d2d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification	2022-12-15 14:32:51 +01:00
Alexandre Riera	45317c0850	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-12-15 14:26:10 +01:00
Alexandre Riera	522000cd04	refs #4928 fix fixtures	2022-12-15 09:52:34 +01:00
Alexandre Riera	5a975d0b05	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4928-supplier-payMethod-notify	2022-12-15 09:22:36 +01:00
Alex Moreno	279456b377	Merge branch 'dev' into 4919-module_code	2022-12-15 07:58:18 +00:00
Alexandre Riera	33196acac6	refs #4928 fixture notification, fix test supplier	2022-12-15 08:31:47 +01:00
Vicent Llopis	859c084430	refactor: movidos changes sql	2022-12-15 07:17:13 +01:00
Vicent Llopis	6793b8e9a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-12-15 07:13:09 +01:00
Joan Sanchez	a86636bee4	Use proper module codes	2022-12-14 13:49:49 +01:00
Alexandre Riera	2baa4a1954	refs #4962 ticket tour future refactor	2022-12-14 12:26:18 +01:00
Alexandre Riera	f00fdcff7c	refactor sql	2022-12-14 08:06:02 +01:00
Alexandre Riera	dce48a8a93	refs #4700 corrections	2022-12-13 14:00:46 +01:00
Alex Moreno	1e0b0028f2	fix: only edit structure	2022-12-13 13:37:25 +01:00
Alexandre Riera	72c27f7176	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-12-13 12:37:56 +01:00
Alexandre Riera	95967a29db	refs #4928 email template added and proc modified	2022-12-13 11:50:17 +01:00
Vicent Llopis	91f955ccf5	refactor: move sql changes	2022-12-13 09:56:05 +01:00
Vicent Llopis	e4dbeb0b33	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification	2022-12-13 09:54:56 +01:00
Joan Sanchez	dc777ea69f	Added version after merging to test	2022-12-12 14:23:40 +01:00
Joan Sanchez	e000103ca4	Deleted version	2022-12-12 14:22:32 +01:00
Vicent Llopis	3d47ee1cd9	feat: inseet in notificationSubscription	2022-12-12 13:53:21 +01:00
Alex Moreno	7822a6cac8	change folder	2022-12-12 13:48:20 +01:00
Alex Moreno	09edb99a1b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2022-12-12 13:48:06 +01:00
Alex Moreno	158a71a326	restrictions	2022-12-12 13:37:14 +01:00
Alex Moreno	995fb6a5c3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db	2022-12-02 13:13:53 +01:00
Joan Sanchez	ac447d4981	Updated SQL version nomenclature	2022-12-02 12:48:12 +01:00
Pau	5235ed5499	Merge branch 'dev' into 4732-previa-label	2022-12-02 08:05:04 +00:00
Vicent Llopis	ba8fe7dfa8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-12-01 07:11:00 +01:00
Alex Moreno	8df7b91127	fix: entry ref	2022-11-30 15:24:33 +01:00
Vicent Llopis	89e9722027	refactor: cambiados varchar por text, para q no falle en local	2022-11-30 08:14:38 +01:00
Pau	a676351e5b	Merge branch 'dev' into 3681-move-sign_save-to-salix	2022-11-30 07:24:26 +01:00
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
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
Pau	aee7cd113e	add template strings to sql	2022-11-28 09:33:14 +01: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	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
Pau	074763f633	rename files	2022-11-25 11:47:23 +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
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
Pau	3e08650b6f	acls for the notifications	2022-11-25 07:06:04 +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
Pau	f74b257d75	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-24 09:27:49 +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
Alex Moreno	cbdffc98a4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2022-11-23 14:16:42 +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	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
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	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
Alex Moreno	7e98a255b8	refs #4849 SQL	2022-11-21 08:11:01 +01:00
Alexandre Riera	fd58eaf838	drop procedure	2022-11-18 09:36:38 +01:00
Alex Moreno	ef6af87d89	feat: add supplier.isVies funcionality	2022-11-18 09:21:21 +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
Alex Moreno	cba3c38ba6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2022-11-15 12:55:07 +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	8f4ac8fcc9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2022-11-15 10:12:29 +01: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
Alex Moreno	db3a6df23d	feat(worker): new worker	2022-11-14 15:19:16 +01: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
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
Pau	1327f0ae9d	Added requested changes, refs #4507 @1:20h	2022-11-10 08:18:05 +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
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	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
Alexandre Riera	896a7eb6f0	refs #4700 arreglar filtro y traducciones	2022-11-07 15:55:17 +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
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
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
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	a7b1ee85fe	fix changes folder	2022-11-02 07:27:57 +01:00
Alex Moreno	b37c257885	feat(canEdit): use checkAccess	2022-10-31 14:13:06 +01:00
Pau	0739608de3	Merge branch 'dev' into 4457-hasInvoiceElectronic	2022-10-31 07:57:50 +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
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
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	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
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
Joan Sanchez	1196125350	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-10-25 11:58:47 +02:00
Alex Moreno	e1e13468a9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-25 11:58:43 +02:00
Alex Moreno	3fd10dfc64	Merge branch 'dev' into 4075-ticket_boxing	2022-10-25 09:58:17 +00:00
Pau	76d248131c	Merge branch 'dev' into 2612-create-supplier	2022-10-25 09:45:25 +00:00
Pau	9089ba7346	requested changes	2022-10-25 10:42:16 +02:00
Pau	23598c993b	Change ACL from employee to hr	2022-10-25 09:25:15 +02:00
Vicent Llopis	7f1dd801a5	refactor: change ACLs	2022-10-25 07:56:17 +02:00
Alex Moreno	7cb8175b73	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf	2022-10-25 07:36:21 +02:00
Vicent Llopis	d18b22bb05	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving	2022-10-25 07:05:26 +02:00
Joan Sanchez	e80754f280	Added new SQL version	2022-10-24 18:37:38 +02:00
Alex Moreno	9e0eab5a77	feat(invoiceIn): email	2022-10-24 15:15:23 +02:00
Vicent Llopis	c77999871e	refs #3951	2022-10-24 14:34:17 +02:00
Alex Moreno	a66c5e6798	acl	2022-10-24 11:30:17 +02:00
Vicent Llopis	888f612dbb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving	2022-10-21 11:41:53 +02:00
Vicent Llopis	18c119c62a	change acl	2022-10-21 09:20:27 +02:00
Vicent Llopis	6f31bea21f	feat: update testBack	2022-10-21 08:00:48 +02:00
Vicent Llopis	6891190c72	refactor: create endpoint to unify code	2022-10-20 15:05:46 +02:00
Vicent Llopis	39f4445172	refator: endpoint name	2022-10-20 07:23:57 +02:00
Vicent Llopis	6f7ec12cb2	feat: response as 'reply' and not as 'internNote'	2022-10-19 10:35:41 +02:00
Pau	470b4485d5	Fixed test and DB structure	2022-10-18 12:58:44 +02:00
Pau	a204c6e2b0	Fixed the suppliers not appearing	2022-10-18 12:29:04 +02:00
Alex Moreno	a5ceee07e9	use loopback	2022-10-18 11:50:16 +02:00
Pau	81088bc495	Fixed ACL	2022-10-18 10:46:14 +02:00
Pau	f481cc3c97	Capitalizar	2022-10-18 10:38:40 +02:00
Pau	c9e9e3545d	Added ACL	2022-10-18 10:33:48 +02:00
Alex Moreno	0bc018ec02	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-10-17 14:06:31 +02:00
Pau	9290cd6fb6	Finished back tests	2022-10-17 14:02:18 +02:00
Pau	70c9c3d788	initial back test created, modified DB statetments	2022-10-17 12:07:34 +02:00
Pau	dc6c8f924d	feat: Create new Supplier	2022-10-17 07:25:25 +02:00
Alex Moreno	c637f2c879	feat(send): use vn-print libary and adapt test	2022-10-14 13:22:53 +02:00
Joan Sanchez	e81c39d8dc	Send delivery note to refund tickets	2022-10-13 09:30:31 +02:00
Alex Moreno	24cb8e00bb	creates notification sql in changes	2022-10-11 13:20:25 +02:00
Alex Moreno	c78e222ee0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue	2022-10-11 10:09:57 +02:00
Vicent Llopis	9c52508a88	feat: add total labels	2022-10-11 08:40:22 +02:00
Vicent Llopis	7b7e01f49e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving	2022-10-11 07:09:20 +02:00
Alex Moreno	376d46b67e	feat(canEdit): integrate isWeekly and adapt back tests and e2e	2022-10-10 13:06:49 +02:00
Vicent Llopis	8130cf9e6a	feat: separate globalInvoicing in 2 parts	2022-10-10 12:40:10 +02:00
Pau	51d3063849	Drop expedition itemFk	2022-10-10 10:53:15 +02:00
Alex Moreno	e7bafb1386	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-07 07:47:46 +02:00
Alex Moreno	c29625f079	fix: funcionalityAcl	2022-10-06 15:04:27 +02:00
Joan Sanchez	4fadc7e2a4	Added subversion	2022-10-06 13:56:10 +02:00
Joan Sanchez	8ccb47d741	Merge pull request '4073-feat(user): add section privileges and remove changeRole in descriptor' (#1073) from 4073-user_privileges into dev ... Reviewed-on: #1073 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-10-06 11:54:16 +00:00
Pau	dde5eed9e2	DB fixtures	2022-10-06 13:34:06 +02:00
Vicent Llopis	ddbe1057ad	feat: add new section	2022-10-06 09:47:53 +02:00
Alex Moreno	9d482f7dfd	test(ticket): fix tests and add funcionalityAcl	2022-10-05 15:13:36 +02:00
Joan Sanchez	377a0f7228	Attachments refactor	2022-10-04 13:41:37 +02:00
Alex Moreno	7a690dd880	feat(user): add section privileges and remove changeRole in descriptor ... test(user):back and e2e	2022-10-03 15:11:29 +02:00
Joan Sanchez	c177c0366d	Item PDF	2022-10-03 13:35:49 +02:00
Joan Sanchez	3b0f1efbf4	ACL's	2022-09-30 13:54:20 +02:00
Alex Moreno	e931414bb7	unnecessary code	2022-09-30 08:59:49 +02:00
Joan Sanchez	1ac35c0b68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2	2022-09-29 14:52:31 +02:00
Joan Sanchez	3601881026	Client consumption queue	2022-09-29 14:43:27 +02:00
Joan Sanchez	7a7ad6ac5f	InvoiceOut_sendQueued	2022-09-29 13:09:44 +02:00
Joan Sanchez	660842ca31	Osticket & waste refactor	2022-09-27 14:20:57 +02:00
Alex Moreno	2c691eb796	feat(vnApp): getUrl and create salix.url. test(boxing): getVideoList	2022-09-26 14:49:11 +02:00
Joan Sanchez	7f78286d6b	Reports refactor	2022-09-26 13:33:27 +02:00
Alex Moreno	f698a22fcf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-09-26 09:25:43 +02:00
Joan Sanchez	85698410db	Templates refactor	2022-09-26 08:07:45 +02:00
Pau	26a16bf846	ACL para sector,añadido sector al model-config	2022-09-23 13:53:33 +02:00
Joan Sanchez	664fd444cc	Sample refactor	2022-09-22 15:44:35 +02:00
Joan Sanchez	8105c12a18	Campaign metrics	2022-09-22 08:48:29 +02:00
Vicent Llopis	a330e9d64a	refactor: change acl	2022-09-16 12:02:04 +02:00