834 Commits

Author	SHA1	Message	Date
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
Javier Segarra	04086e37ee	refs #6930 feat: add accessScopes: ['read:multimedia'] forEarch method	2024-02-26 06:57:17 +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
Pablo Natek	5e97f820a2	feat(spec): refs #6005 add spec	2024-02-21 12:59:42 +01: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
Pablo Natek	ab7eb88913	merge(dev): refs #6005 merge dev	2024-02-20 09:34:08 +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
Pablo Natek	c10cb7c051	feat(spec): refs #6403 mrwIntegration	2024-02-16 14:15:13 +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
Pablo Natek	b6be76c38f	feat(test): refs #6403 add spec	2024-02-16 08:28:40 +01:00
Javier Segarra	f608eb1859	Merge pull request '#6386 - Download method add file with extension' (!1993) from 6386_imageWithNoFormat into dev ... Reviewed-on: #1993 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-02-14 08:13:55 +00:00
Javier Segarra	e5b7395e5c	refs #5858 fix: test Notification getList	2024-02-12 10:27:28 +01:00
Pablo Natek	fe79823ce8	refs #6403	2024-02-12 09:24:37 +01:00
Sergio De la torre	c2360ca154	refs #6559 feat:quit call get_sectors	2024-02-09 06:59:39 +01:00
Jorge Penadés	c2fffd1eda	fix: refs #6276 drop test	2024-02-08 14:52:23 +01:00
Jorge Penadés	33cca9bfe8	fix: refs #6276 assignColletion	2024-02-08 14:20:05 +01:00
Pablo Natek	d2d28889b6	merge(master): refs #6403 merge master fix conflicts	2024-02-07 16:55:09 +01:00
Pablo Natek	6c9215bb51	feat(mrw): refs #6403 big commit	2024-02-07 16:52:43 +01:00
Javier Segarra	9448b40533	refs #6386 feat: add extension when return file	2024-02-02 14:53:48 +01:00
Jorge Penadés	8f5a5d9cba	fix: refs #6703 tests & backs	2024-01-31 13:11:15 +01:00
Jorge Penadés	2a6abffef9	fix: refs #6276 fix errors & refactor	2024-01-30 16:07:33 +01:00
Jorge Penadés	e17fc91415	fix: refs #6276 fix acl, addSaleByCode & tests	2024-01-30 14:58:11 +01:00
Sergio De la torre	0f3ffcfa61	fix: refs #6184 Upload sign	2024-01-30 08:11:33 +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	63fb3db8a1	fix: refs #6276 test item_card & general fixes	2024-01-25 12:14:14 +01:00
Jorge Penadés	01340408c6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-25 08:14:02 +01:00
Jorge Penadés	02e38eb711	fix: refs #6276 fix tests	2024-01-25 08:13:47 +01:00
Jorge Penadés	e527780622	fix: refs #6276 drop suitcase sectorCollection_getSales	2024-01-24 11:24:49 +01:00
Jorge Penadés	e849f0b6e2	fix: refs #6276 sectorCollection_getSales	2024-01-24 11:20:08 +01:00
Pablo Natek	065dd0581d	feat(spec): refs #6403 add test	2024-01-24 09:06:05 +01:00
Javier Segarra	40d5e8662b	refs #6694 perf: remove unused imports	2024-01-24 08:38:34 +01:00
Javier Segarra	5b2b6a15ad	refs #6694 perf: improve filter	2024-01-24 08:36:08 +01:00
Jorge Penadés	ae89d59bde	feat: refs #6276 WIP test sectorCollection_getSales	2024-01-23 15:58:09 +01:00
Javier Segarra	5d53d69754	refs #6694 perf: update postCode/filter method	2024-01-23 12:52:35 +01:00
Jorge Penadés	08dd37e9e4	feat: refs #6276 test sectorCollection_getSales	2024-01-23 12:13:23 +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	b7ce6cac9c	fix: refs #6276 machineWorker_update & tests	2024-01-19 12:38:58 +01:00
Jorge Penadés	5c0425b942	feat: refs #6276 test machineWorker_update	2024-01-19 09:52:49 +01:00
Jorge Penadés	19edd7868e	feat: refs #6276 test getVersion	2024-01-18 14:18:21 +01: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
Jorge Penadés	c8bfb35cf6	feat: refs #6276 test itemShelvingMake_multi	2024-01-18 13:28:22 +01:00
Jorge Penadés	6f35c62cd5	feat: refs #6276 test collection_addItem	2024-01-18 11:51:21 +01:00
Pablo Natek	854447f7c1	feat: refs #6403 mrw cancelShipment	2024-01-18 07:36:21 +01:00
Javier Segarra	145e72022a	refs #6694 perf: handle minor errors	2024-01-17 14:58:55 +01:00
Javier Segarra	38c93e8c76	refs #6694 test: add test	2024-01-17 14:49:35 +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	92a3e841ed	refs #6694 perf: change let to const	2024-01-17 14:16:09 +01:00
Javier Segarra	71f387f626	refs #6694 feat: move filter remote method to own file	2024-01-17 14:15:21 +01:00
Jorge Penadés	6be2f07c22	fix: refs #6276 assignCollection	2024-01-17 13:57:57 +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
Jorge Penadés	6a78123fca	fix: refs #6276 machineWorke_update	2024-01-17 09:01:48 +01:00
Jorge Penadés	53a10dda58	feat: refs #6276 machineWorke_update	2024-01-17 08:17:55 +01:00
Jorge Penadés	2fbea6f9dd	feat: refs #6276 wip machineWorke_update	2024-01-16 15:43:34 +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
Jorge Penadés	54192c54ad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-15 13:56:32 +01:00
Carlos Satorres	3cdf8b2011	Merge branch 'dev' into 6489-authSupport	2024-01-15 12:42:05 +00:00
Jorge Penadés	7a9f2bd79c	refactor: refs #6276 align rows	2024-01-09 11:23:54 +01:00
Jorge Penadés	9afc3840c7	fix: refs #6276 machineWorker_add	2024-01-09 11:22:11 +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	e354de4ff5	fix: updateInTime refs #6276	2024-01-04 10:09:41 +01:00
Jorge Penadés	7d0c11e937	Merge branch '6276-createNewWarehouse' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-04 08:51:46 +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
Sergio De la torre	0b5ffcc81c	refs #6276:modify back silex→salix	2024-01-03 12:50:53 +01:00
Javier Segarra	4510f0a037	Merge branch 'dev' into 5666-loggable_to_mixin	2024-01-02 09:26:18 +00: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	cd701ccd9e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2024-01-02 08:42:06 +01:00
Alex Moreno	0101dcda3a	refs #5925 fix: add options	2024-01-02 08:12:45 +01:00
Alex Moreno	318761185b	refs #6434 fix: remove console.log	2024-01-02 08:07:16 +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