17612 Commits

All Branches

Search

Author	SHA1	Message	Date
Vicent Llopis	1d7f0e2135	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-07-13 11:42:49 +02:00
Carlos Satorres	191f478523	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5949-recycledPlasticItem	2023-07-13 10:58:09 +02:00
Carlos Satorres	2627cafc22	refs #5999 defaulter country autocomplete	2023-07-13 10:54:22 +02:00
Alex Moreno	6fbadf7e4e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-07-13 10:46:35 +02:00
Vicent Llopis	c88a753865	Merge pull request '4770-routes_roadmap2' (!1647) from 4770-routes_roadmap2 into dev ... Reviewed-on: #1647 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-07-13 08:35:45 +00:00
Carlos Satorres	660612cb84	refs #5999 url	2023-07-13 10:22:41 +02:00
Vicent Llopis	c91db1b429	a	2023-07-13 10:19:57 +02:00
Vicent Llopis	392dc5060a	refs #4770 delete test	2023-07-13 10:19:12 +02:00
Vicent Llopis	01dc26f64e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4770-routes_roadmap2	2023-07-13 09:42:53 +02:00
Vicent Llopis	112d7a84e3	solved test	2023-07-13 09:32:08 +02:00
Vicent Llopis	17b2b02246	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4734-addViaexpress	2023-07-13 09:16:32 +02:00
Alex Moreno	ac4e264d53	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-07-13 08:43:50 +02:00
Vicent Llopis	988ff96016	Merge pull request 'hotfix_mailAlias' (!1664) from hotfix_mailAlias into master ... Reviewed-on: #1664 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-07-13 06:43:31 +00:00
Vicent Llopis	337ce56a60	refs #5887 test exlcuido	2023-07-13 08:37:11 +02:00
Vicent Llopis	3a61bc6052	refs #5887 move changes sql	2023-07-13 08:21:17 +02:00
Alex Moreno	978224c21c	Merge branch 'master' into hotfix_mailAlias	2023-07-13 06:14:53 +00:00
Alex Moreno	69c3a49cce	warnFix: smtp prevents the sending of emails depending on the condition	2023-07-13 08:05:10 +02:00
Alex Moreno	e994e54e4b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-07-13 07:11:09 +02:00
Carlos Satorres	7da1824e89	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5949-recycledPlasticItem	2023-07-13 06:39:05 +02:00
Carlos Satorres	b228b693cc	Merge pull request 'refs #6006 mod dias anteriores' (!1662) from hotfix-travel into master ... Reviewed-on: #1662 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-07-13 04:04:17 +00:00
Vicent Llopis	12685e045c	tedst	2023-07-12 15:48:04 +02:00
Vicent Llopis	7aaaf5492c	refs #5887 refacotr: move code to hook	2023-07-12 15:07:06 +02:00
Vicent Llopis	ef6a2ae578	refs #5887 fix: delete requires	2023-07-12 14:06:28 +02:00
Vicent Llopis	c0d329edca	a	2023-07-12 14:04:17 +02:00
Vicent Llopis	aea5133f39	refs #5877 fix: aply changes	2023-07-12 14:01:39 +02:00
Alex Moreno	78108b2ca5	Merge branch 'master' into hotfix-travel	2023-07-12 12:01:26 +00:00
Vicent Llopis	551d06ee83	refs #5887 para eliminar sigue las mismas reglas que para añadir	2023-07-12 13:55:57 +02:00
Vicent Llopis	954c2f5435	refs #5244 feat: carga valor inicial	2023-07-12 13:12:51 +02:00
Alex Moreno	219a4fbca9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-07-12 13:09:58 +02:00
Carlos Satorres	510b78c703	refs #6006 mod dias anteriores	2023-07-12 13:08:46 +02:00
Alex Moreno	9cb29b9166	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-07-12 13:05:17 +02:00
Alex Moreno	d7ac20dc6a	hotFix(supplier): fix accessToken in before save	2023-07-12 13:02:27 +02:00
Vicent Llopis	bd85cf4e90	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-07-12 12:29:17 +02:00
Vicent Llopis	83698522ca	Merge pull request '5887-mailAlias_refactor' (!1659) from 5887-mailAlias_refactor into master ... Reviewed-on: #1659 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-07-12 06:34:42 +00:00
Vicent Llopis	808a9976ab	refs #5887 fix: back etst	2023-07-11 13:53:25 +02:00
Vicent Llopis	a831a1534b	Merge branch 'dev' into 4770-routes_roadmap2	2023-07-11 11:50:15 +00:00
Vicent Llopis	6655807d80	refs #4770 refactor: change acl	2023-07-11 13:50:38 +02:00
Vicent Llopis	a215797390	tranalstion	2023-07-11 13:39:22 +02:00
Vicent Llopis	d4217ff8d3	refs #5887 correct translations	2023-07-11 13:38:48 +02:00
Vicent Llopis	5a5a1ed20b	refs #5887 feat: addback test	2023-07-11 13:22:54 +02:00
Vicent Llopis	e1f12bea02	a	2023-07-11 12:33:44 +02:00
Vicent Llopis	d4a4e04f25	refs #5887 feat: cambiados permisos para añadir/quitar alias de correo	2023-07-11 12:33:34 +02:00
Vicent Llopis	810021e23a	Merge pull request 'refs #5874 feat: refactorizado proceso facturación' (!1658) from hotfix_makeInvoice-refactor into master ... Reviewed-on: #1658 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-07-11 09:49:14 +00:00
Vicent Llopis	da13f0811c	refs 5887 cambiado drop y create por create or replace	2023-07-11 09:59:11 +02:00
Vicent Llopis	56247b5012	add acl	2023-07-11 09:33:45 +02:00
Vicent Llopis	93e70e699a	refs #5874 feat: refactorizado proceso facturación	2023-07-11 09:19:15 +02:00
Carlos Satorres	7291b793ae	refs #5949 fix traduct	2023-07-11 08:41:43 +02:00
Alex Moreno	6978339fd3	refs #5475 fix email translations	2023-07-11 08:03:36 +02:00
Carlos Satorres	ba109dccc5	refs #5949 trad	2023-07-11 07:58:18 +02:00
Alex Moreno	43bf7ce707	Merge pull request 'refs #5475 redesign 2FA email' (!1657) from 5475_redesign_2FA_email into test ... Reviewed-on: #1657 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-07-11 05:54:28 +00:00