1191 Commits

Author	SHA1	Message	Date
Guillermo Bonet	8a96327d97	Merge branch 'dev' into 6232-refactorConfigTables	2024-03-20 06:17:06 +00:00
Guillermo Bonet	5b546079b0	Merge branch '6232-refactorConfigTables' of https://gitea.verdnatura.es/verdnatura/salix into 6232-refactorConfigTables	2024-03-15 12:38:34 +01:00
Guillermo Bonet	0867211573	refs #6403 Fix model mrwConfig	2024-03-15 12:38:33 +01:00
Javier Segarra	bfdbbc0fdf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-15 12:22:57 +01:00
Javier Segarra	6989299593	Merge branch 'dev' into 6930_scopedToken_Multimedia	2024-03-15 08:26:45 +00:00
Javier Segarra	c84e86270c	refs #6930 perf: remove logoutMultimedia method	2024-03-12 13:30:32 +01:00
Javier Segarra	486b51bcfa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6930_scopedToken_Multimedia	2024-03-12 12:46:46 +01:00
Sergio De la torre	375b690063	Merge branch 'dev' into 6078_workerActivty	2024-03-12 09:12:45 +00:00
Javier Segarra	18773f34de	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-09 11:27:57 +01:00
Sergio De la torre	dd732297c4	Merge branch 'dev' into 6078_workerActivty	2024-03-07 07:31:04 +01:00
Sergio De la torre	69ad44c0bd	Merge branch 'dev' into 6078_workerActivty	2024-03-07 07:18:16 +01:00
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
Jorge Penadés	fc08adc064	fix: refs #6276 options	2024-03-05 10:09:32 +01:00
Jorge Penadés	854a9b62af	fix: refs #6276 refactor updateInTime & changes	2024-03-04 09:21:41 +01:00
Jorge Penadés	97f76c64ff	refactor: refs #6276 drop sendRocket method	2024-03-01 13:35:07 +01:00
Javier Segarra	becd2e6f48	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-02-29 07:49:24 +01:00
Javier Segarra	5ee9c2b01e	refs #6930 fix: revert fdescribe	2024-02-29 07:40:20 +01:00
Javier Segarra	23b3fb81f9	refs 6930 feat: implements logout remoteMethod	2024-02-28 10:43:19 +01:00
Jorge Penadés	f95a4f3530	refactor: refs #6276 drop setState function	2024-02-28 09:06:48 +01:00
Javier Segarra	f2ad069186	refs 6930 feat: get multimediaToken from new method	2024-02-27 14:26:54 +01:00
Jorge Penadés	b86110c898	fix: refs #6276 changes	2024-02-27 10:29:49 +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	04086e37ee	refs #6930 feat: add accessScopes: ['read:multimedia'] forEarch method	2024-02-26 06:57:17 +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	c8e0195510	fix throw error	2024-02-23 14:44:59 +01:00
Pablo Natek	44668b2445	remove(focus). refs #6403 remove f	2024-02-23 14:41:35 +01:00
Pablo Natek	94b49efb1f	feat(fix): refs #6403 add transaction to createShipment	2024-02-23 14:38:44 +01:00
Pablo Natek	277bcafd89	fix(commit): refs #6403 hotFix add commit	2024-02-23 14:11:11 +01:00
Jorge Penadés	7fdfd4fcb4	fix: refs #6276 desestructuring	2024-02-23 13:02:56 +01:00
Jorge Penadés	70c400c5f9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-23 12:51:22 +01:00
Pablo Natek	18da27179d	merge(dev): refs #6005 traduction conflict	2024-02-23 09:40:58 +01:00
Alex Moreno	c7dd81e53d	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-02-23 07:12:24 +01:00
Guillermo Bonet	7d3cf162b8	fix: refs #6184 uploadFile	2024-02-22 11:22:39 +01:00
Javier Segarra	d0c82f694e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-02-22 07:08:41 +01:00
Alex Moreno	92f2282632	Revert "Merge pull request 'Revert "Merge branch 'dev' into test"' (!2064) from test_revert into test" ... This reverts commit cbe23d8df5, reversing changes made to c4a64b93cc.	2024-02-21 14:52:28 +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
Alex Moreno	c4a64b93cc	Merge branch 'dev' into test	2024-02-21 13:32:54 +00:00
Alex Moreno	8182809d8a	Merge branch 'master' into 6403-mrwIntegration	2024-02-21 08:50:54 +00:00
Javier Segarra	811a49275d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-02-20 13:53:18 +01:00
Alex Moreno	668903fa5f	hotFix(getUrl): fix prop name environment	2024-02-20 09:08:32 +01:00
Alex Moreno	4952e0be20	hotFix(getUrl): fix prop name environment	2024-02-20 09:04:50 +01:00
Jorge Penadés	d5a3413307	fix: refs #6776 method names & chanmges	2024-02-19 14:46:42 +01:00
Pablo Natek	46043eef9a	refactor(description): refs #6403 modify description	2024-02-19 12:54:24 +01:00
Pablo Natek	b3ce6e8d45	fix(spec): refs #6403 add mrwSpec	2024-02-19 11:33:56 +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