16656 Commits

All Branches

Search

Author	SHA1	Message	Date
Vicent Llopis	b13618529a	refs #5849 delete: traducción erronea	2023-07-20 07:21:38 +02:00
Vicent Llopis	d3165fcdc7	refs #5849 fix: tback	2023-07-18 14:25:53 +02:00
Vicent Llopis	4c7f42acb5	a	2023-07-18 14:17:07 +02:00
Vicent Llopis	7bd378e9dd	refs #	2023-07-18 14:15:56 +02:00
Guillermo Bonet	b285c3e37a	Merge pull request 'refs #5819 Added param to call zone_getLeaves' (!1667) from 5819-zone_getLeaves into dev ... Reviewed-on: #1667 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-07-18 06:40:50 +00:00
Guillermo Bonet	3c013110d3	refs #5819 Changed structure sql	2023-07-18 07:32:45 +02:00
Guillermo Bonet	765a84e2eb	refs #5819 Added param to call zone_getLeaves	2023-07-14 07:27:04 +02:00
Carlos Satorres	0d308ec8ad	Merge pull request 'refs #5949 itemRecycle' (!1656) from 5949-recycledPlasticItem into dev ... Reviewed-on: #1656 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-07-13 11:59:30 +00: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
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
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
Carlos Satorres	7da1824e89	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5949-recycledPlasticItem	2023-07-13 06:39:05 +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
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	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
Alex Moreno	1bcd3039cd	refs #5475 redesign 2FA email	2023-07-11 07:41:05 +02:00
Carlos Satorres	d1c8f0ff11	refs #5949 itemRecycle	2023-07-11 07:37:51 +02:00
Alex Moreno	60f70ac2b4	Merge pull request 'refs #4614 fear(ticket): add 'set weight' funcionality' (!1487) from 4614-ticket_weight into dev ... Reviewed-on: #1487 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-07-10 07:22:09 +00:00
Carlos Satorres	ce8927a714	Merge pull request 'change ref master' (!1653) from hotfix-extraCommunityEntryRef into master ... Reviewed-on: #1653 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-07-10 07:17:16 +00:00
Alex Moreno	5e6d941f36	Merge branch 'dev' into 4614-ticket_weight	2023-07-10 06:53:11 +00:00
Alex Moreno	d941e2e18f	Merge branch 'master' into hotfix-extraCommunityEntryRef	2023-07-10 05:26:05 +00:00
Carlos Satorres	9f2ef5c2c0	change ref master	2023-07-10 07:22:23 +02:00
Alex Moreno	8922d27f20	refs #4614 fix e2e	2023-07-07 12:25:02 +02:00
Alex Moreno	d9a5868ce4	refs #5930 fix(claim_updateClaim) options	2023-07-07 10:55:45 +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	8fe9b387ce	refs #4614 test: front and correct folder	2023-07-06 15:16:52 +02:00
Alex Moreno	be0120728d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight	2023-07-06 15:15:36 +02:00
Alex Moreno	d9d4441d59	refs #5970 deploy: 233001 init	2023-07-06 13:38:59 +02:00
Alex Moreno	a665b6c060	refs #5970 fix sql	2023-07-06 11:51:04 +02:00