17068 Commits

All Branches

Search

Author	SHA1	Message	Date
Pablo Natek	9fe7024d17	refs #5347	2023-07-03 14:08:50 +02:00
Carlos Satorres	983d028d06	refs #5334 popover y basic data	2023-07-03 13:58:40 +02:00
Alex Moreno	ff6d9e427b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-07-03 13:54:15 +02:00
Alex Moreno	c7b9d0827e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware	2023-07-03 13:42:54 +02:00
Pablo Natek	8ef6f0dd17	Merge branch 'dev' into 5347-clientCreateRefactor	2023-07-03 11:35:50 +00:00
Alex Moreno	461e1d4d5d	refs #5475 feat: userUses, fix forbiddenError and merge in dev	2023-07-03 13:33:48 +02:00
Carlos Satorres	5612c56aed	Merge pull request '5836-clientDefaulterisWorker' (!1639) from 5836-clientDefaulterisWorker into dev ... Reviewed-on: #1639 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-07-03 10:53:03 +00:00
Alex Moreno	2d1420e3f8	Merge branch 'dev' into 5836-clientDefaulterisWorker	2023-07-03 09:51:48 +00:00
Carlos Satorres	3b346d673b	Merge pull request 'refs #5753 db export and fix fixtures' (!1643) from 5753_232401_db_dump into dev ... Reviewed-on: #1643 Reviewed-by: Carlos Satorres Adam <carlossa@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-07-03 09:49:11 +00:00
Carlos Satorres	4d03ef8f09	Merge branch 'dev' into 5836-clientDefaulterisWorker	2023-07-03 09:47:43 +00:00
Carlos Satorres	c3ef642017	refs #5836 fix fk	2023-07-03 11:45:05 +02:00
Carlos Satorres	d03df4c5cc	refs #5690 ticketproblems	2023-07-03 11:38:38 +02:00
Alex Moreno	7fe8698b6f	refs #5753 fix ticketToInvoice	2023-07-03 10:04:03 +02:00
Carlos Satorres	5e68363312	refs #5334 onsearch postlink	2023-07-03 09:38:36 +02:00
Alex Moreno	d1fb2859be	Merge branch 'dev' into 5753_232401_db_dump	2023-07-03 06:59:42 +00:00
Carlos Satorres	dc10c20fe3	refs #5334 email validate	2023-07-03 07:29:58 +02:00
Alex Moreno	467c4e997c	refs #5941 feat: when error can send email to support	2023-06-30 14:24:50 +02:00
Carlos Satorres	dc36c6fd9d	refs #5334 basicData solve e2e	2023-06-30 13:52:46 +02:00
Vicent Llopis	7b4e8570aa	refs #5244 refactor: se sustituyen los activeWithRole con where="{role: {inq: ['logistic', 'buyer']}}" por getItemTypeWorker	2023-06-30 12:03:26 +02:00
Alex Moreno	f636c3b1ab	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-30 11:57:56 +02:00
Carlos Satorres	e6ed834bf0	refs #5836 remove case	2023-06-30 10:07:29 +02:00
Carlos Satorres	3d93043b98	Merge branch '5334-editDepartment' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-06-30 09:40:15 +02:00
Carlos Satorres	83b096c206	refs #5334 fix errors	2023-06-30 09:40:12 +02:00
Carlos Satorres	6b4501146d	refs #5334 fix errors	2023-06-30 09:39:48 +02:00
Alex Moreno	6fcbf69f60	refs #5753 isNotEditableCredit to zeroCreditEditor	2023-06-30 08:26:51 +02:00
Alex Moreno	ff320895a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5753_232401_db_dump	2023-06-30 08:23:00 +02:00
Alex Moreno	5f42ee5f60	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-30 07:55:47 +02:00
Vicent Llopis	f3e771747a	refs #5244 fix: getItemTypeWorker permite filtrar por id	2023-06-29 15:56:07 +02:00
Alex Moreno	e651ddc4a0	refs #5816 unfocus e2e	2023-06-29 15:53:09 +02:00
Alex Moreno	02aafbc7f4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-06-29 15:50:52 +02:00
Alex Moreno	fc39b8f692	refs #5816 comment e2e	2023-06-29 15:50:33 +02:00
Alex Moreno	7eb8460ba0	refs #5816 remove unforeseen dev	2023-06-29 15:38:49 +02:00
Guillermo Bonet	82e762ac09	Merge pull request 'refs #5816 Remove duplicated logs' (!1634) from 5900-removeDuplicatedLogs into test ... Reviewed-on: #1634 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-06-29 13:35:49 +00:00
Alex Moreno	0441bc29b7	refs #5475 correct SQL folder	2023-06-29 15:24:41 +02:00
Vicent Llopis	3cedef6f16	refs #5244 fix: add id	2023-06-29 15:22:53 +02:00
Alex Moreno	b062cec747	refs #5475 fix setPassword options/cb	2023-06-29 15:01:24 +02:00
Alex Moreno	c6bee8f2f9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-29 14:50:06 +02:00
Javi Gallego	bc4058512a	Merge branch 'test' into 5900-removeDuplicatedLogs	2023-06-29 12:43:16 +00:00
Carlos Satorres	af91630852	refs #5836 e2e fix	2023-06-29 13:22:51 +02:00
Alex Moreno	273c06a210	refs #5833 deploy: test to master 232601	2023-06-29 12:54:56 +02:00
Vicent Llopis	011db142d3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-06-29 12:49:55 +02:00
Vicent Llopis	1093d29fb6	Merge pull request 'test_hotfix_renewToken' (!1645) from test_hotfix_renewToken into test ... Reviewed-on: #1645 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-06-29 10:47:46 +00:00
Vicent Llopis	79823605f6	refs #5554 fix: no te tira al hacer F5	2023-06-29 12:15:32 +02:00
Vicent Llopis	3bd890c343	refs #5554 fix: solo llama al back cuando se tiene q renovar	2023-06-29 12:11:16 +02:00
Pablo Natek	be1c145d9a	refs #5347	2023-06-29 10:41:41 +02:00
Carlos Satorres	dc73dc2cb4	Merge branch 'dev' into 5640-mayusFiscalDate	2023-06-29 08:39:34 +00:00
Carlos Andrés	1d993c74e5	refs #5590 fix total invoiceOut	2023-06-29 10:39:07 +02:00
Carlos Satorres	bb4951bbc8	Merge branch 'dev' into 5334-editDepartment	2023-06-29 07:47:41 +00:00
Carlos Satorres	9dc52b6011	refs #5334 fix labels trad	2023-06-29 09:44:21 +02:00
Pablo Natek	89b63f47fc	Merge branch '5347-clientCreate-→-client_create' of https://gitea.verdnatura.es/verdnatura/salix into 5347-clientCreate-→-client_create	2023-06-29 08:14:10 +02:00