10435 Commits

Author	SHA1	Message	Date
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	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
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
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	863f204247	fix(deleteZone): contrary condition	2024-12-16 14:12:43 +01: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	a6bb381b74	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny	2024-12-16 11:53:12 +01:00
Guillermo Bonet	36705a028e	fix: refs #8174 Version	2024-12-16 11:33:18 +01:00
Carlos Satorres	1e471ac20f	fix: refs #7028 requesterId fix	2024-12-16 10:25:33 +01:00
Carlos Satorres	32d9a3ace1	fix: refs #7028 remove ifs	2024-12-16 09:57:48 +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
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
Jose Antonio Tubau	9c32dc5707	feat: refs #8293 include zone data	2024-12-16 08:34:53 +01:00
Carlos Satorres	b14268ef1b	fix: hotfix createAbsence	2024-12-16 08:15:14 +01:00
Guillermo Bonet	e1db7a86f6	Merge branch 'dev' into 7882-locationiq	2024-12-16 06:16:03 +00:00
Guillermo Bonet	3cdb6c438b	Merge branch 'test' into dev	2024-12-13 13:06:26 +01:00
Javi Gallego	e748e9a012	feat: refs #7235 add serialType parameter to getInvoiceDate and implement corresponding tests	2024-12-13 08:30:23 +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
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	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	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	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	6beb1a18cb	Merge branch 'dev' into 6389-changesMonitor	2024-12-12 08:48:08 +00:00
Pablo Natek	33287938ec	Merge branch 'dev' into 7301-itemLastEntries	2024-12-12 08:34:54 +00:00
Carlos Satorres	efcf4d225b	fix: refs #7028 fix pr	2024-12-12 09:30:22 +01:00
Carlos Satorres	27e6aacf15	Merge branch 'master' into hotfix-irpfDaysOnWard	2024-12-12 08:09:13 +00:00
Jose Antonio Tubau	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
Jorge Penadés	addb093b6b	feat: refs #7936 add minimum due date	2024-12-11 17:42:03 +01:00
Guillermo Bonet	186ef52518	feat: refs #7882 Osrm service	2024-12-11 14:55:26 +01:00
Robert Ferrús	3e92aca6ff	feat: refs #249272 message updateQuantity	2024-12-11 14:32:08 +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
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
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	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
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
Carlos Satorres	f6ac55d9d7	fix: fix back	2024-12-10 11:01:52 +01:00
Jorge Penadés	46448d5fc2	fix: refs #7936 change type	2024-12-10 10:27:35 +01:00
Sergio De la torre	699e56a64c	Merge pull request 'feat: refs #8188 refs#8188 orderPicking' (!3279) from 8188-orderPicking into test ... Reviewed-on: #3279 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-10 06:05:11 +00: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
Alex Moreno	eaa62909ff	chore: simplify	2024-12-09 14:30:45 +01:00
Alex Moreno	9403588d7b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-12-09 14:30:03 +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
Carlos Satorres	cb516d2022	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-7323workerHoliday	2024-12-09 13:22:10 +01:00
Sergio De la torre	22e9a9104a	feat: refs #8188 refs#8188 orderPicking	2024-12-09 13:20:55 +01:00
Jorge Penadés	f63d850ea3	refactor: refs #7366 rename ref to reference	2024-12-09 11:37:01 +01:00
Sergio De la torre	d17566107e	feat: refs #8188 refs#8188 orderPicking	2024-12-05 12:42:17 +01:00
Sergio De la torre	5db8ae53ac	feat: refs #8188 refs#8188 orderPicking	2024-12-05 12:39:20 +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
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	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
Guillermo Bonet	078b559bea	Merge branch 'master' into test	2024-12-05 06:56:48 +01:00
Guillermo Bonet	187cd226c4	feat: refs #7644 Added distinct total label count	2024-12-05 06:56:18 +01: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
Carlos Satorres	7d1e3b6751	Merge branch 'master' into hotfix-6899invoiceOut	2024-12-04 08:18:27 +00:00
Alex Moreno	91db8817ef	Merge branch 'dev' into 8004-liliumStyleRemake	2024-12-04 07:09:30 +00:00
Carlos Andrés	d7af439787	Actualizar modules/travel/back/methods/travel/extraCommunityFilter.js	2024-12-03 17:49:48 +00:00
Jorge Penadés	104bef43c1	feat: add country id filter to sales monitor	2024-12-03 14:03:08 +01:00
Carlos Satorres	424a0c8079	fix: refs #6389 packing	2024-12-03 12:25:39 +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
Carlos Satorres	2267942368	fix: fix invoiceOut filter	2024-12-03 10:25:40 +01:00
Alex Moreno	6fcfb0208d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-12-03 08:29:21 +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
Ivan Mas	1b2987494a	Merge branch 'dev' into 7146-route.createdToDated	2024-12-02 14:04:36 +00:00
Alex Moreno	bf9f7d45bf	Merge branch 'master' into 8222-refactorDeleteZone2	2024-12-02 12:53:00 +00:00
Carlos Satorres	fd05ce0915	fix: refs #8222 fix prDeleteZone	2024-12-02 13:45:04 +01:00
Guillermo Bonet	947812e9f1	Merge branch 'test' into dev	2024-12-02 13:07:08 +01:00
Ivan Mas	bf0daf90db	Merge branch 'dev' into 7146-route.createdToDated	2024-12-02 11:56:58 +00:00
Robert Ferrús	d355b320b4	test: refs #244936 remove window.open called	2024-12-02 12:25:27 +01:00
Robert Ferrús	30da83a88c	fix: refs #244936 sale redirect catalog to lilium	2024-12-02 11:52:05 +01:00
Carlos Satorres	f50c20fb28	Merge branch 'master' into hotfix-7323workerHoliday	2024-12-02 09:49:55 +00:00
Carlos Satorres	fb40e25c7c	fix: remove ctx	2024-12-02 10:47:44 +01:00