16644 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Vicent Llopis	33e1d9e3f2	Merge pull request '5774-ticket.lines_evitarCantidadNegativa' (!1597) from 5774-ticket.lines_evitarCantidadNegativa into dev ... Reviewed-on: #1597 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-06-28 12:51:44 +00:00
Vicent Llopis	c5660a21a1	Merge branch 'dev' into 5774-ticket.lines_evitarCantidadNegativa	2023-06-28 12:41:26 +00:00
Vicent Llopis	a6fba97b7d	Merge pull request '5808-client.credit-management' (!1640) from 5808-client.credit-management into dev ... Reviewed-on: #1640 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-06-28 12:35:08 +00:00
Vicent Llopis	e3e0c7e97a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5774-ticket.lines_evitarCantidadNegativa	2023-06-28 14:31:54 +02:00
Alex Moreno	8723cf2958	refs #5753 fix legacy bugs	2023-06-28 14:10:21 +02:00
Pablo Natek	54e75dc850	Merge branch '5347-clientCreate-→-client_create' of https://gitea.verdnatura.es/verdnatura/salix into 5347-clientCreate-→-client_create	2023-06-28 14:07:38 +02:00
Pablo Natek	6e52b3b968	refs #5347	2023-06-28 14:07:37 +02:00
Vicent Llopis	3128601027	Merge branch 'dev' into 5808-client.credit-management	2023-06-28 11:47:39 +00:00
Vicent Llopis	65e5c95c07	Merge pull request '5688-worker.calendar_workCenter' (!1580) from 5688-worker.calendar_workCenter into dev ... Reviewed-on: #1580 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-06-28 11:38:49 +00:00
Vicent Llopis	6894da7e22	refs #5688 fix: front test	2023-06-28 13:27:18 +02:00
Alex Moreno	da50ea1dd0	Merge branch 'dev' into 5688-worker.calendar_workCenter	2023-06-28 11:10:51 +00:00
Carlos Satorres	f02019d64d	refs #5334 fix words	2023-06-28 11:52:53 +02:00
Alex Moreno	89c25c07b6	refs #5475 fix e2e and back test	2023-06-28 09:59:55 +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	9b0cf7f378	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-28 07:20:12 +02:00
Alex Moreno	31d637c8a7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-28 07:19:04 +02:00
Alex Moreno	162faf0d01	Merge branch '5475-email_2fa' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-28 07:18:10 +02:00
Carlos Satorres	06437c9e80	refs #5334 remove other	2023-06-28 07:02:59 +02:00
Alex Moreno	4b8b7a9d82	refs #5475 fix accessScope	2023-06-27 15:30:54 +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	07712f58e7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-06-27 13:36:51 +02:00
Carlos Satorres	f0b238b62a	refs #5836 fix e2e	2023-06-27 12:31:58 +02: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
Vicent Llopis	87c233d221	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5808-client.credit-management	2023-06-27 10:33:15 +02:00
Carlos Satorres	5216f12001	refs #5836 check fix	2023-06-27 10:27:39 +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
Alex Moreno	e43e52b561	refs #5753 db export and fix fixtures	2023-06-26 15:21:45 +02:00
Carlos Satorres	24ea18aeb0	refs #5836 isworker back	2023-06-26 13:55:39 +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
Carlos Satorres	7d2076ff90	Merge pull request '232402_test_to_dev' (!1637) from 232402_test_to_dev into dev ... Reviewed-on: #1637 Reviewed-by: Carlos Satorres Adam <carlossa@verdnatura.es>	2023-06-26 10:10:53 +00:00
Alex Moreno	224a44847d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-26 11:56:07 +02: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
Guillermo Bonet	cc5021a75f	refs #5684 Removed xxxLog.create and dependences	2023-06-26 09:40:55 +02:00
Alex Moreno	798481b24a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-26 07:53:44 +02:00
Juan Ferrer	630ce40ef7	Merge branch 'test' into 5900-removeDuplicatedLogs	2023-06-25 20:00:02 +02:00