16656 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	9f2ef5c2c0	change ref master	2023-07-10 07:22:23 +02:00
Vicent Llopis	0afddb546b	Merge pull request 'refs #5978 hotfix_workCenter' (!1650) from hotfix_workCenter into test ... Reviewed-on: #1650 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-07-07 08:01:48 +00:00
Vicent Llopis	6fa6c21cb1	remove fixtures	2023-07-07 09:31:26 +02:00
Vicent Llopis	7030be3efa	fix	2023-07-07 09:30:04 +02:00
Alex Moreno	a665b6c060	refs #5970 fix sql	2023-07-06 11:51:04 +02:00
Alex Moreno	ea71e980cc	refs #5970 add changelog	2023-07-06 11:45:08 +02:00
Alex Moreno	48951cc5a1	Merge pull request '5475 - Autenticación de doble factor por email' (!1429) from 5475-email_2fa into dev ... Reviewed-on: #1429 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-07-06 08:59:20 +00:00
Alex Moreno	63a8f40443	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-07-06 10:42:53 +02:00
Carlos Satorres	a7ad947168	Merge pull request '5334-editDepartment' (!1521) from 5334-editDepartment into dev ... Reviewed-on: #1521 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-07-06 07:08:49 +00:00
Carlos Satorres	9c9b53917a	refs #5334 fix error	2023-07-06 08:20:33 +02:00
Carlos Satorres	83467c3b6c	refs #5334 quit es	2023-07-06 06:08:12 +02:00
Carlos Satorres	3d9f0e1497	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-07-06 05:48:45 +02:00
Alex Moreno	59ad603de6	refs #5816 set version	2023-07-05 12:22:08 +02:00
Pablo Natek	089f1e48ac	Merge pull request '5347-clientCreateRefactor' (!1644) from 5347-clientCreateRefactor into dev ... Reviewed-on: #1644 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-07-05 05:22:38 +00:00
Carlos Satorres	5000e05e05	refs #5334 merge + e2e solve	2023-07-04 09:57:16 +02:00
Carlos Satorres	f1502139ac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-07-04 09:56:38 +02:00
Pablo Natek	2ccf8d5197	refs #5347	2023-07-03 14:49:21 +02:00
Pablo Natek	6b557d5d8a	refs #5347	2023-07-03 14:14:25 +02:00
Pablo Natek	4d0ed75090	Merge branch '5347-clientCreateRefactor' of https://gitea.verdnatura.es/verdnatura/salix into 5347-clientCreateRefactor	2023-07-03 14:08:53 +02:00
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
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
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
Carlos Satorres	dc36c6fd9d	refs #5334 basicData solve e2e	2023-06-30 13:52:46 +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
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
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