18520 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	035b31d878	refs #5666 test: fix e2e tests	2023-12-05 12:00:31 +01:00
Jorge Penadés	25006a938b	refs #6274 refactor clockIn	2023-12-05 11:53:27 +01:00
Carlos Satorres	f55e85a189	refs #6010 remove pending	2023-12-05 10:35:48 +01:00
Jorge Penadés	419ab41816	refs #6276 Acl addTimeEntry	2023-12-05 09:55:22 +01:00
Carlos Satorres	af07a531ed	refs #6318 quantity	2023-12-05 08:49:55 +01:00
Sergio De la torre	3692021b12	Merge branch 'dev' into 6275-silex-to-salix	2023-12-05 07:26:22 +00:00
Sergio De la torre	318f7e3c0d	REFS #6275 feat:Silex_to_Salix	2023-12-05 08:20:55 +01:00
Javier Segarra	7a63e527a5	refs #5666 perf: remove comments	2023-12-05 07:50:52 +01:00
Javier Segarra	6f32a588bb	refs #5666 feat: add role relation to RoleMapping	2023-12-05 07:49:10 +01:00
Javier Segarra	1d92bbf4a2	refs #5666 feat: replace base value and add mixins	2023-12-05 07:48:56 +01:00
Javier Segarra	b4f4714c0a	refs #5666 feat: remove loggable.json	2023-12-05 07:47:38 +01:00
Javier Segarra	57add7abf0	refs #5666 perf: replace Role by VnRole	2023-12-05 07:16:12 +01:00
Javier Segarra	2fe631f078	refs #5666 feat: change models permissions	2023-12-05 07:15:22 +01:00
Jorge Penadés	8cb97e2477	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-12-04 15:09:44 +01:00
Javier Segarra	a8b0a7a5b3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken	2023-12-04 14:46:21 +01:00
Javier Segarra	5656ed7a2b	refs #6264 perf: use functions extracted previously	2023-12-04 14:46:05 +01:00
Javier Segarra	b9671c0b67	refs #6264 perf: remove files related to token	2023-12-04 14:44:50 +01:00
Carlos Satorres	62b2e23620	Merge branch 'dev' into 6085-ACLsMail	2023-12-04 09:01:45 +00:00
Carlos Satorres	051c93a42c	remove fdescribe	2023-12-04 09:41:24 +01:00
Carlos Satorres	c0ce7e542f	refs #6085 solve testback	2023-12-04 09:40:57 +01:00
Carlos Satorres	6d486fbec9	refs #6085 trad, remove front, back test	2023-12-01 13:58:45 +01:00
Pablo Natek	303b6f5240	fix(expencefk): refs #6398 expenceFk to expenseFk	2023-12-01 13:48:56 +01:00
Pablo Natek	bec1ff71ef	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTracking-change-workerFk-to-userFk	2023-12-01 13:43:27 +01:00
Robert Ferrús	2a93dcf5b8	Merge branch 'dev' into 5854-itemShelvingTraduciones	2023-12-01 10:20:08 +00:00
Jorge Penadés	0b1bbbaaa6	Merge pull request 'refs #5835 rate added' (!1865) from 5835-summaryRate into dev ... Reviewed-on: #1865 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-12-01 07:22:26 +00:00
Pablo Natek	758b468c68	Merge pull request 'test' (!1873) from test into master ... Reviewed-on: #1873 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-12-01 06:11:22 +00:00
Jorge Penadés	611b45bae0	Merge branch 'dev' into 5835-summaryRate	2023-11-30 15:16:18 +00:00
Alex Moreno	b2e7ea3089	refs #5914 feat: make invoice support rectificative	2023-11-30 15:16:41 +01:00
Alex Moreno	e634a5e213	refs #5914 feat: create getTaxBases and use in negatives and positives procedures	2023-11-30 15:15:40 +01:00
David Domenech	eb0766bafd	Merge branch 'dev' into 6398-ticketTracking-change-workerFk-to-userFk	2023-11-30 14:08:47 +00:00
Alex Moreno	6699f5d5a6	Merge pull request 'fix(getFiltered): refs #3271 fix to event filter' (!1872) from 3271-zoneGetFilterdFix into test ... Reviewed-on: #1872 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-11-30 13:49:55 +00:00
Pablo Natek	72283005b8	remove(console.log): refs #3271 remove console.log	2023-11-30 14:43:14 +01:00
David Domenech	8ab981907d	refactor(ticketTracking.userFk): refs #6398 workerFk to userFk	2023-11-30 14:25:00 +01:00
Pablo Natek	c457b5c4d2	Merge branch 'test' into 3271-zoneGetFilterdFix	2023-11-30 12:39:26 +00:00
Alex Moreno	ee7dd66ce9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-30 12:49:42 +01:00
Alex Moreno	35e74a7635	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-11-30 12:48:27 +01:00
Alex Moreno	ab69dcd4fe	refs #6524 fix: fixtures and feat: new changelog format	2023-11-30 12:32:41 +01:00
Javier Segarra	b241efc961	Merge pull request 'refs #6434 feat: improve signIn method' (!1867) from 6434-signInLog_improve_test into test ... Reviewed-on: #1867 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-11-30 11:20:57 +00:00
Alex Moreno	016e4ae37c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-11-30 12:20:50 +01:00
Javier Segarra	01e7135224	refs #5666 feat: replace Role by VnRole in front	2023-11-30 12:20:05 +01:00
Javier Segarra	16001099b6	refs #5666 feat: update ACLs for role and vnRole	2023-11-30 12:15:48 +01:00
Pablo Natek	3f22f48df7	fix(getFiltered): refs #3271 fix to event filter	2023-11-30 12:13:12 +01:00
Javier Segarra	2a2998a8bc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin	2023-11-30 12:01:44 +01:00
Carlos Satorres	e7d3ef0763	Merge pull request 'refs #6065 remove workcenter' (!1871) from hotfix-hoursFetch into master ... Reviewed-on: #1871 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-11-30 09:20:26 +00:00
Jorge Penadés	6121eeaa3a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-summaryRate	2023-11-30 09:44:05 +01:00
Carlos Satorres	9cdb7c3cca	refs #6065 remove workcenter	2023-11-30 09:18:00 +01:00
Javi Gallego	69e555e7b4	Merge pull request '5652-fixtures-fix' (!1870) from 5652-fixtures-fix into dev ... Reviewed-on: #1870 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-11-30 08:13:05 +00:00
Jorge Penadés	5442e3b4e0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-11-30 08:44:41 +01:00
Javier Segarra	7611acb8f2	refs #6434 perf rename version folder for sql file	2023-11-30 08:34:10 +01:00
Javier Segarra	80f8037f58	refs #6434 perf remove version folder for sql file	2023-11-30 08:23:14 +01:00