16431 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Alex Moreno	78108b2ca5	Merge branch 'master' into hotfix-travel	2023-07-12 12:01:26 +00:00
Carlos Satorres	510b78c703	refs #6006 mod dias anteriores	2023-07-12 13:08:46 +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	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	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	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	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
Javi Gallego	bc4058512a	Merge branch 'test' into 5900-removeDuplicatedLogs	2023-06-29 12:43:16 +00:00
Alex Moreno	273c06a210	refs #5833 deploy: test to master 232601	2023-06-29 12:54:56 +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
Carlos Andrés	1d993c74e5	refs #5590 fix total invoiceOut	2023-06-29 10:39:07 +02:00
Alex Moreno	840a88bdc1	refs #5833 remove console.logs	2023-06-29 07:14:45 +02:00
Juan Ferrer	d200a1a695	refs #5900 CSS fixes	2023-06-28 16:08:12 +02:00
Juan Ferrer	12481b5f3d	refs #5900 CSS fix	2023-06-28 16:07:24 +02:00
Juan Ferrer	c5d2e87cb1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-06-28 09:09:38 +02:00
Juan Ferrer	a67cd5ba64	refs #5900 User avatar with sticky position	2023-06-28 09:09:36 +02:00
Alex Moreno	f8a972c2f2	refs #5094 fix translation	2023-06-27 14:48:22 +02:00
Alex Moreno	fe53abb24f	Merge pull request 'fix warn' (!1641) from warnFix_travel_summary_entry into test ... Reviewed-on: #1641 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-06-27 11:49:29 +00:00
Carlos Satorres	7e542f93a1	Merge branch 'test' into warnFix_travel_summary_entry	2023-06-27 10:11:59 +00:00
Carlos Satorres	8e5a6dbab3	fix warn	2023-06-27 11:44:23 +02:00
Alex Moreno	1cf5ff9a62	refs #5554 new Date()	2023-06-27 08:24:31 +02:00
Alex Moreno	46ffd8d95a	refs #5554 console.log	2023-06-27 08:07:54 +02:00
Carlos Satorres	15e39b5fec	Merge pull request 'change applyFilters' (!1636) from hotfix-filterScopeDays into test ... Reviewed-on: #1636 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-06-26 11:12:33 +00:00
Carlos Satorres	878e9c4fe9	Merge branch 'hotfix-filterScopeDays' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-filterScopeDays	2023-06-26 12:32:11 +02:00
Carlos Satorres	de62dd9ffd	refs # e2e fix	2023-06-26 12:32:08 +02:00
Alex Moreno	15c45bb544	Merge branch 'test' into hotfix-filterScopeDays	2023-06-26 10:30:57 +00:00
Alex Moreno	ecf742959c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-06-26 11:55:28 +02:00
Alex Moreno	ef8e1c4169	refs #5531 refs #5753 fix travelConfig sql	2023-06-26 10:57:12 +02:00
Juan Ferrer	e980717d14	refs #5900, #5772 Changelog updated	2023-06-26 10:56:53 +02:00
Carlos Satorres	88e845b511	change applyFilters	2023-06-26 10:49:09 +02:00
Juan Ferrer	c42b38c5cc	refs #5900 Code clean, refactor & accurated	2023-06-26 10:23:34 +02:00
Guillermo Bonet	e54e0784bf	Merge branch '5816-noCreateLog' into 5900-removeDuplicatedLogs	2023-06-26 10:06:41 +02:00