783 Commits

Author	SHA1	Message	Date
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
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
Jorge Penadés	f95a4f3530	refactor: refs #6276 drop setState function	2024-02-28 09:06:48 +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
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
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