8355-testToMaster #3336

Merged

alexm merged 241 commits from 8355-testToMaster into master 2025-01-07 06:44:57 +00:00

Conversation 0 Commits 241 Files Changed 87 +1602 -497

241 Commits

Author	SHA1	Message	Date
Alex Moreno	dc52c08c15	build: refs #8355 add changelog	2025-01-06 19:30:06 +01:00
Pablo Natek	79ee81117b	Merge pull request 'feat: refs #7301 update SQL fixtures and enhance lastEntriesFilter logic' (!3335) from 7301-warmFix-on-itemLasEntries into test ... Reviewed-on: #3335 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-03 08:55:41 +00:00
Pablo Natek	67c484cd87	feat: refs #7301 update SQL fixtures and enhance lastEntriesFilter logic	2025-01-03 09:39:49 +01:00
Alex Moreno	bf80cbbf4a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-01-02 07:50:28 +01:00
Jorge Penadés	4887fa0cae	Merge pull request 'feat: refs #7936 add locale' (!3319) from 7936-fixInvoiceIn into test ... Reviewed-on: #3319 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-12-19 14:10:51 +00:00
Jorge Penadés	6abbf3ec1d	fix: refs #7936 update Spanish locale for SII terms	2024-12-19 13:01:34 +01:00
Jorge Penadés	1f7dae2514	fix: refs #7936 locale	2024-12-19 10:34:46 +01:00
Jorge Penadés	c0893f8684	feat: refs #7936 add locale	2024-12-18 13:06:01 +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
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	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
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
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
Robert Ferrús	e7e6c88ec5	Merge branch 'dev' into 8190-entry_getCommission	2024-12-16 10:18:53 +00:00
Carlos Satorres	1e471ac20f	fix: refs #7028 requesterId fix	2024-12-16 10:25:33 +01:00
Carlos Satorres	d620f722b5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny	2024-12-16 09:58:50 +01:00
Carlos Satorres	32d9a3ace1	fix: refs #7028 remove ifs	2024-12-16 09:57:48 +01:00
Guillermo Bonet	71fb3996cd	refactor: refs #7882 Added ACL's	2024-12-16 09:40:55 +01:00
Jorge Penadés	d9eab36160	fix: refs #7936 conflicts	2024-12-16 09:35:41 +01:00
Jorge Penadés	4612bf2e9b	Merge branch 'dev' of https: refs #7936//gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-16 09:35:23 +01:00
Guillermo Bonet	d9a6e8a1c9	refactor: refs #7882 Added ACL's	2024-12-16 09:34:45 +01:00
Guillermo Bonet	d42ff07547	feat: refs #8174 Changed datatype incompatibility access	2024-12-16 09:20:27 +01:00
Carlos Satorres	e70ace613e	Merge branch '7028-itemRequestConfDeny' of https://gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny	2024-12-16 09:14:10 +01:00
Carlos Satorres	10c28b03da	Merge branch 'dev' of https: refs #7028//gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny	2024-12-16 09:14:07 +01:00
Guillermo Bonet	57c3cc8546	feat: refs #8174 Created table sim	2024-12-16 09:01:10 +01:00
JOSE ANTONIO TUBAU RODRIGUEZ	9c32dc5707	feat: refs #8293 include zone data	2024-12-16 08:34:53 +01:00
Guillermo Bonet	eadffe1ed9	Merge pull request 'feat: refs #7882 Added osrmservice' (!3281) from 7882-locationiq into dev ... Reviewed-on: #3281 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-16 06:58:53 +00:00
Guillermo Bonet	e1db7a86f6	Merge branch 'dev' into 7882-locationiq	2024-12-16 06:16:03 +00:00
Guillermo Bonet	233f45a07a	feat: refs #7882 Reequested changes	2024-12-16 07:15:47 +01:00
Carlos Satorres	09e7ee4e43	Merge branch 'dev' into 7028-itemRequestConfDeny	2024-12-16 06:03:41 +00:00
Carlos Andrés	ec2b6dd0c2	Actualizar db/versions/11327-maroonOak/00-firstScript.sql	2024-12-13 14:55:03 +00:00
Carlos Andrés	11827207ba	Merge pull request 'feat: refs#8174 simSupplier' (!3158) from 8174-crearTablaSim into dev ... Reviewed-on: #3158 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-12-13 13:43:46 +00:00
Guillermo Bonet	3cdb6c438b	Merge branch 'test' into dev	2024-12-13 13:06:26 +01:00
Guillermo Bonet	598ef2db84	Merge branch 'master' into test	2024-12-13 13:06:14 +01:00
Guillermo Bonet	00b5333ab7	feat: refs #7882 Added tests	2024-12-13 08:07:13 +01:00
Guillermo Bonet	bfad016ec4	Merge branch 'dev' into 7882-osrm	2024-12-13 07:01:42 +01:00
Carlos Andrés	2467a0f953	Merge pull request 'master' (!3299) from master into test ... Reviewed-on: #3299 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-12-12 17:23:11 +00:00
Guillermo Bonet	05ba85219b	feat: refs #7882 Osrm service	2024-12-12 14:35:58 +01:00
Pablo Natek	8e61160aeb	Merge pull request 'feat: refs #7301 add inventory-config and acl' (!3230) from 7301-itemLastEntries into dev ... Reviewed-on: #3230 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-12 13:12:33 +00:00
Guillermo Bonet	95d7c7f227	Merge branch 'dev' into 7882-osrm	2024-12-12 14:06:44 +01:00
Jorge Penadés	c83f34859a	feat: refs #7936 return country code & is vies fields	2024-12-12 11:20:23 +01:00
Carlos Satorres	f66b3f1cbd	Merge branch 'dev' into 7028-itemRequestConfDeny	2024-12-12 10:11:40 +00:00
JOSE ANTONIO TUBAU RODRIGUEZ	47a7fac0fe	Merge pull request '#8266 changed expedition item name' (!3297) from 8266-changeExpeditionItemName into dev ... Reviewed-on: #3297 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-12-12 10:11:30 +00:00
Carlos Satorres	dcd8b1ee15	Merge branch '7028-itemRequestConfDeny' of https://gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny	2024-12-12 11:11:24 +01:00
Carlos Satorres	cd214b3526	fix: refs #7028 fix userError	2024-12-12 11:11:22 +01:00
JOSE ANTONIO TUBAU RODRIGUEZ	03ba892581	Merge branch 'dev' into 8266-changeExpeditionItemName	2024-12-12 10:10:03 +00:00
Carlos Satorres	d35e785bee	Merge branch 'dev' into 7028-itemRequestConfDeny	2024-12-12 10:04:03 +00:00
Carlos Satorres	a14989ddcf	Merge pull request 'fix: refs #6389 saleMonitor filter' (!3130) from 6389-changesMonitor into dev ... Reviewed-on: #3130 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-12 09:26:29 +00:00
Carlos Satorres	e9d304f2ba	Merge branch '7028-itemRequestConfDeny' of https://gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny	2024-12-12 10:04:35 +01:00
Carlos Satorres	1970b9c0db	fix: refs #7028 fix tback findById	2024-12-12 10:04:31 +01:00
Jorge Penadés	8b37d99287	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-12 09:58:42 +01:00
Carlos Satorres	43697eaba7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny	2024-12-12 09:51:08 +01:00
Carlos Satorres	9c53fe9f60	Merge branch 'dev' into 7028-itemRequestConfDeny	2024-12-12 08:49:04 +00:00
Carlos Satorres	6beb1a18cb	Merge branch 'dev' into 6389-changesMonitor	2024-12-12 08:48:08 +00:00
Carlos Satorres	423201f97b	Merge pull request 'fix: refs #8251 add eng template' (!3296) from 8251-engTemplates into dev ... Reviewed-on: #3296 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Jon Elias <jon@verdnatura.es>	2024-12-12 08:46:41 +00:00
Carlos Satorres	b3eb8334ca	Merge branch 'dev' into 7028-itemRequestConfDeny	2024-12-12 08:45:18 +00:00
Carlos Satorres	6c35634bfb	Merge branch 'dev' into 8251-engTemplates	2024-12-12 08:38:17 +00:00
Jon Elias	7fe3369c35	Merge pull request '#8219: Modified data to be equal as the updated back' (!3274) from Invoice-Out-TransferInvoice into dev ... Reviewed-on: #3274 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-12-12 08:37:50 +00:00
Carlos Satorres	6282e3105d	Merge branch 'dev' into 8251-engTemplates	2024-12-12 08:37:14 +00:00
Pablo Natek	33287938ec	Merge branch 'dev' into 7301-itemLastEntries	2024-12-12 08:34:54 +00:00
Carlos Satorres	a9f1c8b393	Merge pull request '7031-zonePrice' (!3276) from 7031-zonePrice into dev ... Reviewed-on: #3276 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-12 08:33:47 +00:00
Carlos Satorres	2885facc01	Merge branch 'dev' into 7031-zonePrice	2024-12-12 08:32:07 +00:00
Carlos Satorres	efcf4d225b	fix: refs #7028 fix pr	2024-12-12 09:30:22 +01:00
Carlos Satorres	201b9b049b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny	2024-12-12 09:26:05 +01:00
Pablo Natek	b5d4d31abb	fix: refs #7301 update ACL insertion to use INSERT IGNORE and refine property value	2024-12-12 09:25:51 +01:00
JOSE ANTONIO TUBAU RODRIGUEZ	c8f26bbbab	refactor: refs #8266 changed expedition item name	2024-12-12 08:42:10 +01:00
Guillermo Bonet	65e195d77d	feat: refs #7882 Requested changes	2024-12-12 08:23:02 +01:00
Carlos Satorres	aba2bf6082	fix: refs #8251 add eng template	2024-12-12 08:12:16 +01:00
Jon Elias	956673cf56	Merge branch 'dev' into Invoice-Out-TransferInvoice	2024-12-12 07:02:28 +00:00
Jorge Penadés	addb093b6b	feat: refs #7936 add minimum due date	2024-12-11 17:42:03 +01:00
Jorge Penadés	c0b1fe3994	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-11 17:25:40 +01:00
Guillermo Bonet	186ef52518	feat: refs #7882 Osrm service	2024-12-11 14:55:26 +01:00
Carlos Satorres	093fdb6cb3	fix: refs #6389 back	2024-12-11 11:50:16 +01:00
Guillermo Bonet	bc072208d7	Merge branch 'dev' into 7882-osrm	2024-12-11 11:44:23 +01:00
Guillermo Bonet	252a029c98	feat: refs #7882 Osrm service	2024-12-11 11:41:42 +01:00
Juanjo Breso	0d26c52d5d	Merge branch 'dev' into 8174-crearTablaSim	2024-12-11 10:23:44 +00:00
Robert Ferrús	7886adb8f5	Merge branch 'dev' into 8190-entry_getCommission	2024-12-11 10:20:31 +00:00
Juanjo Breso	193e628118	Merge branch '8174-crearTablaSim' of https://gitea.verdnatura.es/verdnatura/salix into 8174-crearTablaSim	2024-12-11 11:20:19 +01:00
Juanjo Breso	28ab6b2266	feat: refs #8174 fix	2024-12-11 11:20:15 +01:00
Jorge Penadés	76253300b6	Merge pull request '#8002 adjust to Lilium' (!3199) from 8002-refactorToLilium into dev ... Reviewed-on: #3199 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-11 09:49:31 +00:00
Jorge Penadés	5bf18990ca	Merge branch 'dev' into 8002-refactorToLilium	2024-12-11 09:39:52 +00:00
Carlos Satorres	34da78e1ba	fix: refs #6389 back	2024-12-11 09:58:51 +01:00
Jorge Penadés	2a2b4b139b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-11 09:13:50 +01:00
Guillermo Bonet	c8ec94bed9	feat: refs #7882 Osrm service	2024-12-11 09:03:14 +01:00
Alex Moreno	bc3afa81e9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-12-11 07:18:59 +01:00
Carlos Satorres	1af288862a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6389-changesMonitor	2024-12-11 06:49:32 +01:00
Carlos Satorres	83fd11eba8	Merge branch 'dev' into 7031-zonePrice	2024-12-10 18:40:06 +00:00
Juanjo Breso	ce58a9ab2c	Merge branch 'dev' into 8174-crearTablaSim	2024-12-10 12:49:44 +00:00
Juanjo Breso	8797635101	feat: refs #8174 fix	2024-12-10 13:46:03 +01:00
Juanjo Breso	10558853a2	feat: refs #8174 create table simsupplier	2024-12-10 13:41:45 +01:00
Alex Moreno	4e72b17e18	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-12-10 13:41:09 +01:00
Carlos Satorres	2dfc58564e	Merge branch '7031-zonePrice' of https://gitea.verdnatura.es/verdnatura/salix into 7031-zonePrice	2024-12-10 12:44:55 +01:00
Carlos Satorres	535b04e1df	Merge branch 'dev' of https: refs #7031//gitea.verdnatura.es/verdnatura/salix into 7031-zonePrice	2024-12-10 12:44:52 +01:00
Carlos Satorres	391f1d8c97	fix: refs #7028 fix confirm deny	2024-12-10 12:04:03 +01:00
Alex Moreno	11ae0e3759	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-12-10 11:28:41 +01:00
Juan Ferrer	06230d6b2a	Merge pull request 'refs #8257 test into dev' (!3287) from test into dev ... Reviewed-on: #3287	2024-12-10 10:22:54 +00:00
Jorge Penadés	46448d5fc2	fix: refs #7936 change type	2024-12-10 10:27:35 +01:00
Jorge Penadés	fcb842d948	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-09 16:44:08 +01:00
Guillermo Bonet	cba5d88c5e	feat: refs #7882 Osrm service	2024-12-09 14:45:31 +01:00
Alex Moreno	94bc1241e5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-12-09 14:31:37 +01:00
Jorge Penadés	f69dfbd5aa	refactor: refs #7936 remove schema	2024-12-09 14:03:45 +01:00
Jorge Penadés	7c2c56ed9a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-09 13:50:01 +01:00
Jon Elias	87577d0982	Merge pull request '#7283 Items module: added translations and show error in item-type' (!3278) from Fix-ItemsModuleBack into dev ... Reviewed-on: #3278 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-09 12:30:53 +00:00
Jorge Penadés	4a7712779b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8002-refactorToLilium	2024-12-09 12:40:08 +01:00
Guillermo Bonet	85baf151d9	feat: refs #7882 Fixed problems osrm service	2024-12-09 10:21:23 +01:00
Guillermo Bonet	e279cc4b47	feat: refs #7882 Added osrm service	2024-12-09 10:01:59 +01:00
Carlos Satorres	d6abcdbca8	Merge branch 'dev' into 7031-zonePrice	2024-12-09 08:11:58 +00:00
Guillermo Bonet	0bb9282953	feat: refs #7882 Added locationiq service	2024-12-09 09:11:55 +01:00
Carlos Satorres	0dc1b9c80b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6389-changesMonitor	2024-12-09 06:56:48 +01:00
Guillermo Bonet	8960b54664	feat: refs #7882 Added locationiq service	2024-12-08 14:30:05 +01:00
Guillermo Bonet	185956b2c3	Merge pull request 'refactor: refs #7882 Deleted quadminds files' (!3280) from 7882-byeQuadminds into dev ... Reviewed-on: #3280 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-08 09:34:47 +00:00
Guillermo Bonet	04a96e87d6	refactor: refs #7882 Deleted quadminds files	2024-12-08 07:28:29 +01:00
Jon Elias	97f08542be	feat: added translations and show error in item-type	2024-12-05 10:28:57 +01:00
Jorge Penadés	db8ab307ab	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-05 10:10:40 +01:00
Guillermo Bonet	85fe8e5575	Merge branch 'test' into dev	2024-12-05 09:22:48 +01:00
Carlos Satorres	34f9f9b29f	Merge branch 'dev' of https: refs #6389//gitea.verdnatura.es/verdnatura/salix into 6389-changesMonitor	2024-12-05 09:19:42 +01:00
Carlos Satorres	1c51516aeb	Merge branch 'dev' into 7031-zonePrice	2024-12-05 07:32:08 +00:00
Carlos Satorres	483966501a	fix: refs #7031 fix vnPrice	2024-12-05 08:31:09 +01:00
Guillermo Bonet	127842a705	Merge branch 'test' into dev	2024-12-05 06:57:08 +01:00
Ivan Mas	86a36732f0	Merge pull request 'refactor: refs #8272 delete bi.rotacion' (!3275) from 8272-deleteBi.rotacion into dev ... Reviewed-on: #3275 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-12-04 13:35:59 +00:00
Jorge Penadés	ea5bf85b55	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-04 13:31:54 +01:00
Ivan Mas	41a3f9ae94	refactor: refs #8272 delete bi.rotacion	2024-12-04 13:19:14 +01:00
Carlos Satorres	fad6f33b7c	fix: refs #7031 remove check	2024-12-04 12:33:17 +01:00
Jon Elias	123c0db126	feat: modified data to be equal as the updated back	2024-12-04 11:58:17 +01:00
Alex Moreno	fcaf854c87	Merge pull request '8004-liliumStyleRemake' (!3257) from 8004-liliumStyleRemake into dev ... Reviewed-on: #3257 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-04 07:18:48 +00:00
Alex Moreno	91db8817ef	Merge branch 'dev' into 8004-liliumStyleRemake	2024-12-04 07:09:30 +00:00
Alex Moreno	71da7772d9	build: new version	2024-12-03 14:33:42 +01:00
Alex Moreno	a8c7dea77f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-12-03 14:32:50 +01:00
Carlos Satorres	424a0c8079	fix: refs #6389 packing	2024-12-03 12:25:39 +01:00
Guillermo Bonet	6ae2853c4d	Merge branch 'test' into dev	2024-12-03 12:09:16 +01:00
Carlos Satorres	c25b77c4bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6389-changesMonitor	2024-12-03 11:54:55 +01:00
Alex Moreno	a85d797edc	chore: pullinfo	2024-12-03 08:40:26 +01:00
Jorge Penadés	5b04debfb1	refactor: refs #7936 add transaction & tests	2024-12-02 17:48:40 +01:00
Jorge Penadés	9d26a9df7d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-02 17:11:21 +01:00
Robert Ferrús	b49595fb13	Merge branch 'dev' into 8190-entry_getCommission	2024-12-02 06:14:55 +00:00
Jorge Penadés	00085f2b99	feat: refs #7936 add tests for invoiceIn filter	2024-11-29 17:05:13 +01:00
Jorge Penadés	59b5dd5a36	feat: refs #7936 add tests for invoiceIn	2024-11-29 16:25:47 +01:00
Jorge Penadés	ac87905351	feat: refs #7936 add back test for updateInvoiceIn	2024-11-29 15:49:14 +01:00
Jorge Penadés	c9cf96676b	fix: refs #7936 check if insert in hook & change test description	2024-11-29 14:32:12 +01:00
Jorge Penadés	163c6ddd20	feat: refs #7936 add currency handling in invoiceIn trigger	2024-11-29 13:44:42 +01:00
Jorge Penadés	9ece52c5ce	feat: refs #7936 add currency check to updateInvoiceIn	2024-11-29 12:42:15 +01:00
Jorge Penadés	03bf115831	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-11-29 12:29:19 +01:00
Jorge Penadés	332e1c62d9	feat: refs #7936 add validation to InvoiceIn & InvoiceInTax	2024-11-29 12:22:01 +01:00
Jorge Penadés	1f6e401e39	feat: refs #7936 add save validation	2024-11-29 11:53:07 +01:00
Jorge Penadés	c270ec3723	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-11-29 09:41:08 +01:00
Robert Ferrús	7afd14a301	Merge branch 'dev' into 8190-entry_getCommission	2024-11-29 05:42:08 +00:00
Jorge Penadés	7d5ae9dfbd	feat: refs #7936 add reference rates for currency in fixtures	2024-11-28 14:52:41 +01:00
Jorge Penadés	f92543a628	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-11-28 11:04:56 +01:00
Pablo Natek	1d59d4eeef	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8004-liliumStyleRemake	2024-11-28 09:34:36 +01:00
Pablo Natek	d5693291f0	refactor: refs #8004 simplify SQL query by removing redundant aliases	2024-11-28 09:24:02 +01:00
Jorge Penadés	ba51052d88	feat: refs #7936 add SiiTypeInvoiceIn model and update invoice correction logic	2024-11-27 17:52:45 +01:00
Jorge Penadés	4bb3305704	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-11-27 13:12:31 +01:00
Carlos Satorres	a4c91e2548	Merge branch '6389-changesMonitor' of https://gitea.verdnatura.es/verdnatura/salix into 6389-changesMonitor	2024-11-27 11:29:01 +01:00
Carlos Satorres	7202cc93a3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6389-changesMonitor	2024-11-27 11:27:28 +01:00
Jorge Penadés	5db1262e08	feat: refs #7936 add company filter	2024-11-27 10:24:13 +01:00
Jorge Penadés	4234e614fb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-11-27 09:41:19 +01:00
Robert Ferrús	e3971848e8	Merge branch 'dev' into 8190-entry_getCommission	2024-11-27 08:40:59 +00:00
Robert Ferrús	70042c02aa	Merge branch 'dev' into 8190-entry_getCommission	2024-11-27 06:28:51 +00:00
Robert Ferrús	d9aa11b3e9	feat: refs #8190 entry_getCommission change request	2024-11-27 07:27:47 +01:00
Jorge Penadés	6ab25c2ff5	fix: refs #7936 add IF NOT EXISTS to isRaid column in travel table	2024-11-26 17:06:45 +01:00
Jorge Penadés	a68e287b23	refactor: refs #7936 remove old trigger and add isRaid column to travel table	2024-11-26 17:01:50 +01:00
Jorge Penadés	9a645c3288	fix: refs #7936 add IF NOT EXISTS to isRaid column in travel table	2024-11-26 16:56:39 +01:00
Jorge Penadés	ad35a354a9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-facturas-recibidas	2024-11-26 16:35:46 +01:00
Robert Ferrús	72b2bd688e	Merge branch 'dev' into 8190-entry_getCommission	2024-11-26 12:53:54 +00:00
Robert Ferrús	5a92fe1691	feat: refs #8190 entry_getCommission	2024-11-26 11:57:24 +01:00
Robert Ferrús	96902afc83	Merge branch 'dev' of https: refs #8190//gitea.verdnatura.es/verdnatura/salix into 8190-entry_getCommission	2024-11-26 11:19:03 +01:00
Pablo Natek	2ba931bedb	Merge branch 'dev' of https: refs #7301//gitea.verdnatura.es/verdnatura/salix into 7301-itemLastEntries	2024-11-22 06:32:19 +01:00
Pablo Natek	e92ce939b8	refactor: refs #7301 update entry and item filter tests to validate results against specific criteria	2024-11-22 06:27:00 +01:00
Pablo Natek	c17069a909	Merge branch 'dev' of https: refs #7301//gitea.verdnatura.es/verdnatura/salix into 7301-itemLastEntries	2024-11-21 10:29:52 +01:00
Carlos Satorres	c3844a8312	Merge branch 'dev' into 6389-changesMonitor	2024-11-21 09:18:57 +00:00
Pablo Natek	c63dfba7da	feat: refs #7301 add inventory-config and acl	2024-11-21 10:18:09 +01:00
Carlos Satorres	38958ca5fb	Merge branch 'dev' into 6389-changesMonitor	2024-11-21 09:10:27 +00:00
Carlos Satorres	6e6a5ea654	Merge branch 'dev' into 6389-changesMonitor	2024-11-19 10:42:28 +00:00
Carlos Satorres	19fa05e774	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6389-changesMonitor	2024-11-19 08:51:58 +01:00
Jorge Penadés	1ed8c01712	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8002-refactorToLilium	2024-11-14 12:29:51 +01:00
Robert Ferrús	69314171ea	feat: refs #8190 entry_getCommission	2024-11-14 12:11:14 +01:00
Jorge Penadés	ca641e555f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8002-refactorToLilium	2024-11-14 11:42:30 +01:00
Jorge Penadés	dbf5953d69	refactor: refs #8002 use loop wip	2024-11-14 10:47:39 +01:00
Jorge Penadés	285fe67ca5	chore: refs #8002 drop useless code	2024-11-14 10:38:44 +01:00
Jorge Penadés	021fd901b7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8002-refactorToLilium	2024-11-14 10:13:37 +01:00
Jorge Penadés	873b91f113	chore: refs #8002 drop comments	2024-11-13 17:45:15 +01:00
Jorge Penadés	b75b369716	feat: refs #8002 adjust to lilium	2024-11-13 17:35:27 +01:00
Jorge Penadés	1c49c073ee	feat: refs #8002 drop support btn	2024-11-13 15:45:06 +01:00
Jorge Penadés	2f3efa15ba	feat: refs #6583 rollback	2024-11-11 16:13:25 +01:00
Jorge Penadés	88e92648e9	Merge branch '6583-addOnlyDestination' of https://gitea.verdnatura.es/verdnatura/salix into 6583-addOnlyDestination	2024-11-11 16:11:05 +01:00
Jorge Penadés	3db6ab0778	feat: refs #6583 rollback	2024-11-11 16:10:49 +01:00
Jorge Penadés	41512a0516	refactor: refs #6583 entry report table style	2024-11-11 16:09:26 +01:00
Jorge Penadés	e9df8e06c8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6583-addOnlyDestination	2024-11-11 16:08:43 +01:00
Jorge Penadés	72dcb84523	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6583-addOnlyDestination	2024-11-11 13:18:26 +01:00
Jorge Penadés	611cd12392	feat: refs #6583 retrieve cloned sale	2024-11-07 16:16:40 +01:00
Jorge Penadés	598813cbd1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6583-addOnlyDestination	2024-11-07 15:25:30 +01:00
Jorge Penadés	679dd6929b	feat: refs #6583 add new opt in where builder	2024-11-06 13:42:36 +01:00
Juanjo Breso	f1370d6960	feat: refs#8174 simSupplier	2024-10-29 12:13:25 +01:00
Carlos Satorres	55483f8e6b	fix: refs #6389 packing	2024-10-28 09:01:10 +01:00
Carlos Satorres	3318faffc6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6389-changesMonitor	2024-10-28 08:08:15 +01:00
Carlos Satorres	b897d28e31	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6389-changesMonitor	2024-10-25 09:12:06 +02:00
Carlos Satorres	bdec144b17	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6389-changesMonitor	2024-10-24 08:08:22 +02:00
Carlos Satorres	99bec3e7fe	fix: refs #6389 salesFilter	2024-10-23 14:58:20 +02:00
Carlos Satorres	dfdd8f28d4	fix: refs #6389 filter	2024-10-23 12:23:31 +02:00
Carlos Satorres	4fc3ee0ea6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6389-changesMonitor	2024-10-22 14:52:05 +02:00
Carlos Satorres	bca22e8ad3	fix: refs #6389 saleMonitor filter	2024-10-20 15:17:17 +02:00
Carlos Andrés	2a1fa8ca68	feat: refs #4466 invoiceIn refund	2024-10-01 18:55:29 +02:00
Carlos Andrés	ca3ac64072	feat: refs #4460 invoiceIn refund	2024-10-01 16:37:12 +02:00