25809 Commits

All Branches

Search

Author	SHA1	Message	Date
Ivan Mas	ab5cf0f497	Merge branch 'dev' into 7880-hedera.order_confirmWithUserTranslations	2024-12-18 11:17:14 +00:00
Alex Moreno	42c3cdae5d	build: init version	2024-12-18 11:33:48 +01:00
Alex Moreno	0f40d6d0ec	Merge pull request '8315-devToTest' (!3313) from 8315-devToTest into test ... Reviewed-on: #3313 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-12-18 10:30:38 +00:00
Alex Moreno	cfee497adb	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 8315-devToTest	2024-12-18 11:26:22 +01:00
Alex Moreno	64d9c7e52f	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-12-18 11:25:38 +01:00
Alex Moreno	116ec5b107	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8315-devToTest	2024-12-18 11:22:28 +01:00
Jorge Penadés	dd5d9bcb08	Merge pull request '#7936 fineTunningInvoiceIn' (!3251) from 7936-fineTunningInvoiceIn into dev ... Reviewed-on: #3251 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-12-18 09:22:02 +00:00
Jorge Penadés	7a3339b623	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-18 10:18:43 +01:00
Jorge Penadés	3deaa8a95b	Merge pull request '#6583 add new opt in where builder' (!3162) from 6583-addOnlyDestination into dev ... Reviewed-on: #3162 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-18 08:48:41 +00:00
Jorge Penadés	8f1fb0a120	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6583-addOnlyDestination	2024-12-18 09:46:19 +01:00
JOSE ANTONIO TUBAU RODRIGUEZ	43d5243766	Merge pull request 'feat: refs #8293 include zone data' (!3309) from 8293-addZoneToClaimList into dev ... Reviewed-on: #3309 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-18 07:45:05 +00:00
Alex Moreno	1a8b05c46b	fix: refs #8315 fixture claimDevelopment	2024-12-18 07:08:23 +01:00
Ivan Mas	af86bb24c4	Merge branch 'dev' into 7880-hedera.order_confirmWithUserTranslations	2024-12-17 15:06:00 +00:00
Jorge Penadés	52a0e718c7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6583-addOnlyDestination	2024-12-17 13:44:11 +01:00
Jorge Penadés	31952725aa	refactor: refs #6583 use warehouseId var	2024-12-17 13:33:29 +01:00
Carlos Satorres	539edeb26a	Merge pull request 'fix: hotfix mix' (!3314) from hotfix-mixTravelSupplierFixedPrice into master ... Reviewed-on: #3314 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-17 12:08:24 +00:00
Carlos Satorres	148b82ea93	Merge pull request 'fix: monitorPayMethodFilter' (!3315) from warmfix-monitorPayMethodFilter into dev ... Reviewed-on: #3315 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-17 12:07:57 +00:00
Jorge Penadés	9ac8e60f0c	fix: refs #6583 drop focus	2024-12-17 12:58:57 +01:00
Jorge Penadés	b935878dd6	feat: refs #6583 add tests	2024-12-17 12:58:25 +01:00
Jorge Penadés	f965f7aa52	fix: refs #6583 update onlyWithDestination logic to handle null values correctly	2024-12-17 12:46:48 +01:00
Carlos Satorres	acfafa1c72	fix: monitorPayMethodFilter	2024-12-17 12:44:55 +01:00
Jorge Penadés	b4c8e16019	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6583-addOnlyDestination	2024-12-17 12:31:27 +01:00
Carlos Satorres	acccb4abc3	fix: hotfix mix	2024-12-17 12:19:46 +01:00
Jorge Penadés	6476eb28e6	Merge branch 'dev' of https: refs #7936//gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-17 10:51:52 +01:00
Alex Moreno	2cd1991a96	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-12-17 10:28:26 +01:00
Alex Moreno	21f4e2aad7	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-12-17 10:26:27 +01:00
Guillermo Bonet	db2a102a88	Merge pull request 'refactor: refs #8262 Deprecated inventoryFailure' (!3311) from 8262-byeInventoryFailure into dev ... Reviewed-on: #3311 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-12-17 06:17:19 +00:00
Guillermo Bonet	4f4eb389c9	Merge pull request 'feat: refs #8218 Added time and code in mistakeType' (!3310) from 8218-workerMistake into dev ... Reviewed-on: #3310 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-12-17 06:15:29 +00:00
Carlos Satorres	26b0ea647d	refactor: change translation	2024-12-17 07:01:44 +01:00
Alex Moreno	863f204247	fix(deleteZone): contrary condition	2024-12-16 14:12:43 +01:00
Juanjo Breso	8166414678	Merge pull request 'fix: refs #8174 pasar a char el PIN' (!3312) from 8174-hotfix into dev ... Reviewed-on: #3312 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-12-16 12:59:30 +00:00
Juanjo Breso	6a3cbed3dd	fix: refs #8174 fix	2024-12-16 13:47:36 +01:00
Juanjo Breso	5a7ac8dcb3	fix: refs #8174 fix	2024-12-16 13:44:58 +01:00
Juanjo Breso	48064d6393	fix: refs #8174 fix	2024-12-16 13:35:50 +01:00
Juanjo Breso	de69a8db1d	fix: refs#8174 fix	2024-12-16 13:01:00 +01:00
Juanjo Breso	11db90c67c	fix: refs#8174 fix	2024-12-16 12:48:43 +01:00
Juanjo Breso	deb1b68c49	fix: refs#8174 fix	2024-12-16 12:47:47 +01:00
Juanjo Breso	7232bfb7a6	fix: 8174 pasar PIN a CHAR	2024-12-16 12:42:08 +01:00
Juanjo Breso	d03a2ced04	fix: refs8174 pasar a char el PIN	2024-12-16 12:30:35 +01:00
Guillermo Bonet	fda2c5725a	refactor: refs #8262 Deprecated inventoryFailure	2024-12-16 12:23:02 +01:00
Carlos Satorres	f9434871d8	Merge pull request 'fix: refs #7028 fix confirm deny' (!3290) from 7028-itemRequestConfDeny into dev ... Reviewed-on: #3290 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-16 10:59:55 +00:00
Carlos Satorres	5f43c0440c	fix: refs #7028 requesterId fix salesPerson	2024-12-16 11:58:21 +01:00
Carlos Satorres	576641d09d	fix: refs #7028 requesterId fix	2024-12-16 11:55:01 +01:00
Carlos Satorres	1090a78e10	Merge branch '7028-itemRequestConfDeny' of https://gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny	2024-12-16 11:54:13 +01:00
Carlos Satorres	a6bb381b74	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny	2024-12-16 11:53:12 +01:00
Robert Ferrús	4ba8c91c1e	Merge pull request 'feat: refs #8190 entry_getCommission' (!3207) from 8190-entry_getCommission into dev ... Reviewed-on: #3207 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-16 10:45:13 +00:00
Guillermo Bonet	5346dd845e	feat: refs #8218 Added time and code in mistakeType	2024-12-16 11:40:57 +01:00
Carlos Satorres	692b1070e8	Merge branch 'dev' into 7028-itemRequestConfDeny	2024-12-16 10:35:47 +00:00
Robert Ferrús	d14621c2d2	Merge branch 'dev' into 8190-entry_getCommission	2024-12-16 10:34:22 +00:00
Guillermo Bonet	36705a028e	fix: refs #8174 Version	2024-12-16 11:33:18 +01:00