625 Commits

Author	SHA1	Message	Date
Guillermo Bonet	39b4e5db28	Merge branch 'dev' into 6948-bank	2024-03-07 06:17:26 +00:00
Javier Segarra	6c06f70121	Merge branch 'dev' into 6930_scopedToken_Multimedia	2024-03-06 18:18:34 +00:00
Sergio De la torre	cf181521d6	refs #6078 feat:add workeractivity	2024-03-05 11:53:57 +01:00
Guillermo Bonet	e0732835d0	refactor: refs #6948 Bank to Accouting	2024-03-05 10:25:23 +01:00
Javier Segarra	23b3fb81f9	refs 6930 feat: implements logout remoteMethod	2024-02-28 10:43:19 +01:00
Sergio De la torre	fd077ae60f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-02-28 07:45:39 +01:00
Javier Segarra	f2ad069186	refs 6930 feat: get multimediaToken from new method	2024-02-27 14:26:54 +01:00
Jorge Penadés	c875abf5e3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-27 09:42:14 +01:00
Sergio De la torre	96abdd4630	refs #6078 feat:add workeractivity	2024-02-26 12:52:34 +01:00
Javier Segarra	a078de9521	refs #6930 feat: return multimediaToken when login	2024-02-26 06:51:19 +01:00
Juan Ferrer	3f0d301870	Merge pull request 'refs #6915 master into test' (!2092) from master into test ... Reviewed-on: #2092	2024-02-23 18:02:07 +00:00
Pablo Natek	18da27179d	merge(dev): refs #6005 traduction conflict	2024-02-23 09:40:58 +01:00
Alex Moreno	01f1bd0088	Revert "Merge branch 'dev' into test" ... This reverts commit c4a64b93cc, reversing changes made to 2ab1cebb31.	2024-02-21 14:44:34 +01:00
Pablo Natek	1c40e01fcb	refactor: refs #6005 move the logic to the report	2024-02-20 13:49:42 +01:00
Pablo Natek	ab7eb88913	merge(dev): refs #6005 merge dev	2024-02-20 09:34:08 +01:00
Jorge Penadés	d5a3413307	fix: refs #6776 method names & chanmges	2024-02-19 14:46:42 +01:00
Jorge Penadés	8d1dea8a00	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-19 11:19:59 +01:00
Sergio De la torre	f4ea220578	Merge branch 'dev' into 6559_getSectors	2024-02-16 12:54:45 +00:00
Jorge Penadés	63c615655b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-16 08:34:05 +01:00
Pablo Natek	94fe0220e5	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6403-mrwIntegration	2024-02-16 08:30:06 +01:00
Sergio De la torre	0ad8306dd9	refs#5890 feat: delete trigger and modify getTickets	2024-02-16 07:00:08 +01:00
Alex Moreno	625922275c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-15 10:14:19 +01:00
Alex Moreno	fddbf6451b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-02-15 07:52:08 +01:00
Sergio De la torre	36683597ec	refs #6559 feat:quit call get_sectors	2024-02-09 07:02:00 +01:00
Jorge Penadés	2940c68516	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-08 08:36:05 +01:00
Pablo Natek	d2d28889b6	merge(master): refs #6403 merge master fix conflicts	2024-02-07 16:55:09 +01:00
Alex Moreno	87864593b2	Merge branch 'dev' into 6184-saveCmr	2024-02-07 06:17:35 +00:00
Sergio De la torre	844bab3cc8	#refs 5890 feat:add assignCollection	2024-02-06 16:17:53 +01:00
Javier Segarra	b4bb9a4849	refs #5834 feat: new validation	2024-01-31 10:46:16 +01:00
Javier Segarra	7ebdf59d97	Merge branch 'dev' into 5834-billingDataAutoFillBic	2024-01-30 14:06:27 +00:00
Jorge Penadés	e17fc91415	fix: refs #6276 fix acl, addSaleByCode & tests	2024-01-30 14:58:11 +01:00
Juan Ferrer	194262a93e	fix: refs #6085 ACL canEditAlias checked, migrated to remote hooks	2024-01-29 13:48:02 +01:00
Jorge Penadés	72e5050d93	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-29 08:37:55 +01:00
Guillermo Bonet	49a08a96da	Merge branch 'dev' into 6184-saveCmr	2024-01-26 11:56:43 +00:00
Pablo Natek	3848503853	fix(test): refs #6743 exportDb	2024-01-25 14:58:48 +01:00
Jorge Penadés	65e5c6dac5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-22 12:45:25 +01:00
Guillermo Bonet	6701f70a33	Merge branch 'dev' into 6184-saveCmr	2024-01-22 09:07:31 +00:00
Jorge Penadés	d41d57143f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-18 13:53:26 +01:00
Pablo Natek	854447f7c1	feat: refs #6403 mrw cancelShipment	2024-01-18 07:36:21 +01:00
Guillermo Bonet	1a52e58eaa	feat: #6184 Created generateCmrPdf	2024-01-17 14:18:31 +01:00
Javier Segarra	d2db0661e2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6694_postcode_location_filter	2024-01-17 14:16:50 +01:00
Javier Segarra	71f387f626	refs #6694 feat: move filter remote method to own file	2024-01-17 14:15:21 +01:00
Guillermo Bonet	45fd96cee6	feat: #6184 Modified uploadFile	2024-01-17 13:07:26 +01:00
Guillermo Bonet	2f67056dbf	Merge branch 'test' into dev	2024-01-17 09:44:32 +01:00
Javier Segarra	30b505aa8f	refs #6694 feat: add filter for postcodes	2024-01-17 08:34:15 +01:00
Jorge Penadés	53a10dda58	feat: refs #6276 machineWorke_update	2024-01-17 08:17:55 +01:00
Pablo Natek	7e3660aece	feat(cancelShipment): refs #6403 mrwintegration	2024-01-16 15:04:06 +01:00
Guillermo Bonet	5bbeda4014	feat: refs #4734 Added viaexpress interdia	2024-01-16 13:05:16 +01:00
Pablo Natek	73c0ca5382	feat(mrwXml): refs #6403 render and transmEnvio integrated	2024-01-15 15:00:36 +01:00
Javier Segarra	3ace078705	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5834-billingDataAutoFillBic	2024-01-12 12:53:49 +01:00
Jorge Penadés	c61f5a67b6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-11 09:28:24 +01:00
Guillermo Bonet	08aaf660e2	Merge branch 'dev' into 6410-dmsTypePath	2024-01-09 13:33:01 +00:00
Guillermo Bonet	81ffc122fc	Merge branch 'test' into dev	2024-01-09 14:09:47 +01:00
Guillermo Bonet	9a82fbea05	Merge branch 'master' into test	2024-01-09 14:07:32 +01:00
Guillermo Bonet	d5ca47ea2a	refactor: refs #6410 Deleted dmsType.path	2024-01-09 09:51:12 +01:00
Alex Moreno	4e823593b5	refs #6067 fix(Mailer): await send email	2024-01-08 14:35:01 +01:00
Jorge Penadés	7a64b57a2a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-04 15:07:33 +01:00
Jorge Penadés	6d0e1cc47c	refactor: fix conficts refs #6276	2024-01-04 08:51:18 +01:00
Javier Segarra	4d7f0329ee	Merge branch 'dev' into 5666-loggable_to_mixin	2024-01-03 12:46:26 +00:00
Jorge Penadés	b086da1936	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2024-01-03 08:57:46 +01:00
Carlos Satorres	12165ab382	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail	2024-01-03 08:31:07 +01:00
Jorge Penadés	767894b128	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-02 09:41:47 +01:00
Jorge Penadés	2e1715a968	refactor renewToken & replace ACL: refs #6274	2023-12-22 15:19:45 +01:00
Javier Segarra	4d2cf87f49	Merge branch 'dev' into 5666-loggable_to_mixin	2023-12-22 09:37:53 +00:00
Javier Segarra	8d08adca21	Merge branch 'dev' into 5666-loggable_to_mixin	2023-12-22 09:36:02 +00:00
Javier Segarra	ec1befcfb0	Merge branch 'dev' into 6434-signIn_issue	2023-12-22 09:25:57 +00:00
Javier Segarra	6b37f23349	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin	2023-12-21 13:06:52 +01:00
Alex Moreno	9951e911ae	refs #5925 feat(docuware_upload): use userConfig.tabletFk	2023-12-21 10:39:46 +01:00
Alex Moreno	d30dcd7d70	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5925-docuwareTablet	2023-12-21 09:22:49 +01:00
Javier Segarra	57b3d96628	refs #6434 fix: bad throw error	2023-12-20 09:27:25 +00:00
Javier Segarra	c3b91e1719	Merge branch 'dev' into 6434-signIn_issue	2023-12-20 09:25:15 +00:00
Pablo Natek	3e2cac5544	Merge branch 'dev' into 6005-backupLabeler	2023-12-19 14:05:45 +01:00
Pablo Natek	f68529960e	fix(notification): refs #6005 notification changes	2023-12-19 10:51:18 +01:00
Jorge Penadés	779cbd2c0a	refs #6276 collection_getTickets	2023-12-18 11:43:15 +01:00
Jorge Penadés	36a9b0eee4	refs #6276 collectionAddItem	2023-12-13 16:00:07 +01:00
Javier Segarra	d364a50ec4	refs #6264 feat: remove validateToken endpoint	2023-12-13 13:39:43 +01:00
Javier Segarra	5a36fabf05	refs #6434 feat: insert record just when fail	2023-12-13 12:07:57 +01:00
Javier Segarra	5f93b8c440	refs #6434 fix: bad merge	2023-12-13 12:01:18 +01:00
Javier Segarra	5b3645a641	refs #6434 fix: bad merge	2023-12-13 11:59:00 +01:00
Javier Segarra	d69b59b63e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signIn_issue	2023-12-13 11:54:28 +01:00
Carlos Satorres	2393625a48	refs #5925 Tablet	2023-12-13 08:22:58 +01:00
Carlos Satorres	412cac7e94	refs #5925 models table docuware	2023-12-12 14:42:36 +01:00
Carlos Satorres	6ac5d28c40	refs #6085 fix back	2023-12-11 09:59:09 +01:00
Carlos Satorres	866ad7a9f9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail	2023-12-11 08:20:19 +01:00
Javier Segarra	a7c48b6ddc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin	2023-12-05 13:02:34 +01: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
Jorge Penadés	30b63f577f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-12-01 09:49:49 +01:00
Alex Moreno	ee7dd66ce9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-30 12:49:42 +01:00
Javier Segarra	58855a7cdd	refs #6434 perf: remove bad characters method description	2023-11-30 08:14:56 +01:00
Javier Segarra	9176cdb4cb	refs #6434 perf: new field in SignInLog table	2023-11-29 19:34:00 +00:00
Javier Segarra	ed6c0924d7	refs #6434 perf: remove console.error	2023-11-29 19:33:04 +00:00
Javier Segarra	48b82b02ca	refs #6434 change param type for signInValidate	2023-11-29 19:32:10 +00:00
Jorge Penadés	27d223cbab	refs #6276 machineWorker_add	2023-11-29 16:25:15 +01:00
Jorge Penadés	877c679273	refs #6276 getVersion	2023-11-29 13:22:44 +01:00
Jorge Penadés	133fe1065a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-11-29 09:44:09 +01:00
Javier Segarra	63533459b0	refs #6434 feat: improve signIn method	2023-11-28 13:22:17 +01:00
Javier Segarra	bb9723b65d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin	2023-11-28 08:18:11 +01:00
Javier Segarra	f5f2896cbf	refs 5666 feat: replace Role model by VnRole model	2023-11-28 08:12:16 +01:00
Pablo Natek	b713a32fe1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler	2023-11-28 08:12:06 +01:00
Pablo Natek	c929119797	fix(spec): refs #6005 backupLabeler spec	2023-11-28 08:11:42 +01:00
Jorge Penadés	8ac3887d80	refs #5811 rename methods	2023-11-24 10:53:38 +01:00
Jorge Penadés	c56588a472	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress	2023-11-24 10:18:47 +01:00
Jorge Penadés	f862ed7d8a	refs #6274 refactor updateInTime	2023-11-23 13:19:59 +01:00
Jorge Penadés	900dffbbba	refs #5811 delete viaexpress expeditions included	2023-11-23 10:26:28 +01:00
Javi Gallego	f44424dbcf	test: refs #6028 test	2023-11-23 09:44:47 +01:00
Pablo Natek	1b4ce1a0b5	feat(noSpam): refs #6005 check if exists a previous notification	2023-11-23 08:22:24 +01:00
Jorge Penadés	fac6aab26c	refs #6276 machineWorker_update	2023-11-22 14:25:19 +01:00
Jorge Penadés	251578146e	refs #6276 several methods created	2023-11-21 12:32:36 +01:00
Alex Moreno	e25ca914a0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-20 10:13:02 +01:00
Alex Moreno	aea3f7b2b9	refs #6434 fix: use trim	2023-11-16 15:10:47 +01:00
Alex Moreno	83ae0379b5	refs #6434 fix: console.log	2023-11-16 12:28:35 +01:00
Javier Segarra	386b556216	refs #6434 feat: new test user signIn with email	2023-11-16 10:29:57 +01:00
Alex Moreno	9c6b594426	hotFix: comment error logIn	2023-11-16 10:04:34 +01:00
Alex Moreno	f677382f96	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-16 09:29:53 +01:00
Alex Moreno	54e8e6a27d	refs #6417 fix(vnUser): toLowerCase	2023-11-16 09:10:45 +01:00
Alex Moreno	5bdf6a7338	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-11-16 07:56:23 +01:00
Javier Segarra	e25b7d0a12	refs #6434 feat: show error for wrong login	2023-11-15 09:39:51 +01:00
Javier Segarra	add3a81032	refs #6434 feat: remove recursively fn	2023-11-15 09:29:26 +01:00
Javier Segarra	5c777c705f	refs #6434 feat: add new error message	2023-11-14 13:00:20 +01:00
Alex Moreno	1a66987cd0	refs #5979 fix(vn-user): resetPassword url	2023-11-13 12:26:31 +01:00
Javier Segarra	aab88dc7de	refs #5666 perf: use use loggable as mixin	2023-11-13 09:54:12 +01:00
Javier Segarra	3c5af184bb	refs #5666 feat: use mixin for this models	2023-11-10 15:12:49 +01:00
Javier Segarra	5dbfe31a60	refs #5666 feat: define VnRole	2023-11-10 15:12:03 +01:00
Alex Moreno	0de5bc5109	refs #4797 refactor: getList & notificationSubscription method	2023-11-08 14:56:47 +01:00
Alex Moreno	d06810b1b9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-11-03 14:58:55 +01:00
Jorge Penadés	2cdebcd69f	check bank entity refs 5834	2023-11-03 09:15:41 +01:00
Alex Moreno	03e2f57306	refs #6067 fix: emailVerify url	2023-11-02 10:57:50 +01:00
Alex Moreno	ae27aa5b1e	fix: test to dev	2023-10-23 10:08:26 +02:00
Alex Moreno	dc00b85bec	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-10-23 08:31:37 +02:00
Alex Moreno	1ea6b87266	Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail	2023-10-19 10:48:51 +00:00
Alex Moreno	3294937b54	Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail	2023-10-19 08:50:29 +00:00
Jorge Penadés	5b1e5743b5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword	2023-10-19 09:35:37 +02:00
Pablo Natek	f8889df903	remove(console.log): se quitan console.log que se utilizaron para dbuggear refs #5979	2023-10-19 08:40:25 +02:00
Pablo Natek	488181e1b6	feat(getUrl): se añade el metodo getUrl refs #5979	2023-10-19 08:37:28 +02:00
Alex Moreno	b1c931a510	remove console.log	2023-10-18 08:52:17 +02:00
Alex Moreno	b3c7511e59	refs #6067 feat(url): getByUser	2023-10-18 08:52:06 +02:00
Alex Moreno	6871ce4b15	Merge branch '6067-vnUser_privileges_and_verifyEmail' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail	2023-10-18 07:29:03 +02:00
Alex Moreno	a916007314	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail	2023-10-18 07:20:34 +02:00
Pablo Natek	9870a0e60a	feat(origin): create method url_/geturl redf #5979	2023-10-17 13:56:49 +02:00
Pablo Natek	033c02750b	refactor(origin): .origin por getUrl()	2023-10-16 18:24:58 +02:00
Jorge Penadés	bd535374d8	ref #6138 setPasword created	2023-10-16 15:58:25 +02:00
Javi Gallego	726bc26a75	fixes #6260 vn-user quito campos redundantes	2023-10-05 09:40:05 +02:00
Alex Moreno	8c39f65dc3	refs #6067 feat: url model to everyone	2023-10-03 09:36:11 +02:00
Alex Moreno	4545a63214	refs #6067 feat(vnUser): verifyEmail redirect to lilium	2023-10-02 14:51:19 +02:00
Carlos Andrés	2820b0253f	Merge branch 'test' into 6254-collection_getTickets	2023-09-29 10:31:14 +00:00
Alex Moreno	1307d4727c	refs #6254 feat(collection): add getTickets	2023-09-27 15:08:36 +02:00
Alex Moreno	6cf1095b10	refs #6067 feat: vnUser use verify() and more security when update user and mailForward	2023-09-25 08:33:16 +02:00
Alex Moreno	db7f72e262	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail	2023-09-22 13:19:35 +02:00