25833 Commits

All Branches

Search

Author	SHA1	Message	Date
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	bdd869b568	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4774-translationsVn	2024-12-12 10:11:38 +01: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
Carlos Satorres	24f0c92829	Merge pull request 'fix: fix back' (!3291) from hotfix-irpfDaysOnWard into master ... Reviewed-on: #3291 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-12 08:10:55 +00:00
Carlos Satorres	27e6aacf15	Merge branch 'master' into hotfix-irpfDaysOnWard	2024-12-12 08:09:13 +00:00
Robert Ferrús	9d5cb715e0	Merge pull request 'feat: refs #249272 message updateQuantity' (!3295) from 249272-hotFixUpdateQuantityMessage into master ... Reviewed-on: #3295 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-12 08:09:06 +00:00
Carlos Satorres	f0c621b991	Merge branch 'master' into hotfix-irpfDaysOnWard	2024-12-12 07:53:48 +00: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
Carlos Satorres	6abf47f1bd	fix: refs #4774 fix acl	2024-12-12 07:29:49 +01: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
Robert Ferrús	3e92aca6ff	feat: refs #249272 message updateQuantity	2024-12-11 14:32:08 +01:00
Carlos Andrés	3ff020a7a7	Merge pull request 'fix: refs #8149 taxableBase invoiceIn' (!3294) from Hotfix-invoiceIn_add into master ... Reviewed-on: #3294 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-12-11 12:34:18 +00:00
Carlos Andrés	fbd6178c06	fix: refs #8149 taxableBase invoiceIn	2024-12-11 13:16:39 +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
Alex Moreno	831d260354	Merge pull request 'fix: refs #8188 refs#8188 add IfNotExists' (!3293) from 8188-pickingOrder into master ... Reviewed-on: #3293 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-11 06:18:45 +00:00
Sergio De la torre	31692ddd3b	fix: refs #8188 refs#8188 add IfNotExists	2024-12-11 07:15:40 +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