25635 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	8253086a8c	Merge branch 'dev' of https: refs #6452//gitea.verdnatura.es/verdnatura/salix into 6452-useIdAsSip	2024-12-12 16:34:56 +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
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
JOSE ANTONIO TUBAU RODRIGUEZ	03ba892581	Merge branch 'dev' into 8266-changeExpeditionItemName	2024-12-12 10:10: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	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	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
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
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	093fdb6cb3	fix: refs #6389 back	2024-12-11 11:50:16 +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
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
Carlos Satorres	83fd11eba8	Merge branch 'dev' into 7031-zonePrice	2024-12-10 18:40:06 +00:00
Alex Moreno	4e72b17e18	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-12-10 13:41:09 +01:00
Alex Moreno	5f46c388b8	Merge pull request 'build: refs #8282 dump db' (!3286) from 8282-dump into master ... Reviewed-on: #3286 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-12-10 12:40:32 +00:00
Alex Moreno	0d6792ea48	Merge branch 'master' into 8282-dump	2024-12-10 12:38:20 +00: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
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	a1e53ac55b	Merge pull request '#8257 test into master' (!3288) from test into master ... Reviewed-on: #3288	2024-12-10 10:24:08 +00: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
Juan Ferrer	9e01313fac	ci(Jenkinsfile): refs #8285 Move version step to begining	2024-12-10 11:18:21 +01:00
Juan Ferrer	15d3f7ee60	fix: refs #8285 Fix pipeline version	2024-12-10 11:13:38 +01:00
Juan Ferrer	dfbe1ef556	fix: refs #8285 Fix pipeline version	2024-12-10 11:05:57 +01:00
Alex Moreno	b258de4252	test: refs #8282 fix workerActivity add fixtures	2024-12-10 10:38:53 +01:00
Alex Moreno	2f47d7d76e	build: refs #8282 dump db	2024-12-10 10:30:43 +01:00
Alex Moreno	d3fe509827	Merge pull request '8282-testToMaster' (!3284) from 8282-testToMaster into master ... Reviewed-on: #3284 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-12-10 06:18:50 +00: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
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
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	d1bf0195f0	Merge pull request 'fix: hotfix 7323 createAbsence' (!3265) from hotfix-7323workerHoliday into master ... Reviewed-on: #3265 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-12-09 12:28:52 +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	5cfcb85443	Merge pull request 'refactor: refs #7366 rename ref to reference' (!3283) from 7366-fixFilter into master ... Reviewed-on: #3283 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-09 11:51:00 +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