22084 Commits

All Branches

Search

Author	SHA1	Message	Date
Robert Ferrús	f4426f5863	Merge branch 'test' into 7296-restoreExpeditionTruck	2024-05-27 12:05:49 +00:00
Robert Ferrús	df5f4a5a42	feat: refs #7296 fixAPPWarehouse	2024-05-27 14:05:31 +02:00
Guillermo Bonet	c7a324bc27	Merge branch 'test' into dev	2024-05-27 13:57:53 +02:00
Jorge Penadés	9ecba10446	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-27 13:57:35 +02:00
Guillermo Bonet	d384c5624f	refactor: refs #7486 Deleted unused debugAll	2024-05-27 13:57:27 +02:00
Guillermo Bonet	55fd94a12a	Merge branch 'test' into dev	2024-05-27 13:51:16 +02:00
Guillermo Bonet	086c2291d1	Merge branch 'master' into test	2024-05-27 13:50:59 +02:00
Guillermo Bonet	2498849ed0	hotfix: refs #7486 Added tmp debug insert	2024-05-27 13:43:55 +02:00
Jorge Penadés	1b4b8668be	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-27 13:34:53 +02:00
Jorge Penadés	1af24e8473	fix : refs #6942 remove grafana update priv	2024-05-27 13:34:00 +02:00
Juan Ferrer	1cbcc7714e	ci: refs #7442 Version increased	2024-05-27 13:24:07 +02:00
Juan Ferrer	8fdfe8d6b0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-27 12:56:15 +02:00
Juan Ferrer	586dff7f18	Merge branch 'test' into dev	2024-05-27 12:56:02 +02:00
Juan Ferrer	ab879df00f	fix(Jenkinsfile): refs #7442 Remove unused variable	2024-05-27 12:55:36 +02:00
Jorge Penadés	1671423d23	fix: refs #6942 add deleteById acl	2024-05-27 12:53:25 +02:00
Alex Moreno	992797eb86	Merge pull request 'fix traduction & e2e' (!2512) from 7292fix-teste2e into dev ... Reviewed-on: #2512 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-27 10:36:14 +00:00
Ivan Mas	745404e761	Merge pull request 'refs #7217 create travel_throwAWBError' (!2465) from 7217-Unify_errorMessageAWB into dev ... Reviewed-on: #2465 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es> Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-05-27 10:34:29 +00:00
Jorge Penadés	c136f2783a	refactor: refs #6942 toUnbook & drop buyer acls	2024-05-27 12:34:27 +02:00
Ivan Mas	6222d2657b	Merge branch 'dev' into 7217-Unify_errorMessageAWB	2024-05-27 10:33:02 +00:00
Carlos Satorres	3626941c8c	fix traduction & e2e	2024-05-27 12:30:53 +02:00
Jorge Penadés	0fa6074278	fix: refs #6942 drop quotes	2024-05-27 12:03:07 +02:00
Jorge Penadés	721c31ccce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-27 11:57:02 +02:00
Alex Moreno	a464b0afd1	fix: en translations	2024-05-27 11:54:37 +02:00
Jorge Penadés	dc26b57f64	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-27 10:56:54 +02:00
Jorge Penadés	dc90ad6595	fix: refs #6942 acls & back	2024-05-27 10:48:32 +02:00
Juan Ferrer	b675bcd6ce	fix: refs #7442 Fix kubernetes deploy	2024-05-27 10:07:44 +02:00
Juan Ferrer	54087096ed	Merge branch 'test' into dev	2024-05-27 09:55:03 +02:00
Juan Ferrer	52e9c66271	fix: refs #7442 Fix kubernetes deploy	2024-05-27 09:39:51 +02:00
Juan Ferrer	a18df86abd	fix: refs #7442 Fix kubernetes deploy	2024-05-27 09:37:17 +02:00
Juan Ferrer	5d83409892	feat: refs #7442 Kubernetes deploy	2024-05-27 09:31:42 +02:00
Jorge Penadés	f209718383	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-27 09:03:34 +02:00
Javier Segarra	50ef375c6b	Merge pull request '#7272 - BUG Redirect To Login when ACL not exists' (!2371) from 7272_bug_redirectToLogin into dev ... Reviewed-on: #2371 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-27 06:56:19 +00:00
Javier Segarra	693356f4cb	Merge branch 'dev' into 7272_bug_redirectToLogin	2024-05-27 06:54:55 +00:00
Robert Ferrús	8e4e3ae8b8	Merge pull request 'refs #6281 feat:buyFk in itemShelving' (!2002) from 6281_buyFk into dev ... Reviewed-on: #2002 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-27 05:33:07 +00:00
Robert Ferrús	846ba9ef66	Merge branch 'dev' into 6281_buyFk	2024-05-27 05:30:33 +00:00
Pako Natek	8296e8cae1	Merge pull request '6021-floranet_beta' (!2509) from 6021-floranet_beta into dev ... Reviewed-on: #2509 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-05-27 05:26:41 +00:00
Pako Natek	4550d3719c	Merge branch 'dev' into 6021-floranet_beta	2024-05-27 05:17:27 +00:00
Robert Ferrús	b02995918e	Merge branch 'dev' into 6281_buyFk	2024-05-27 05:04:40 +00:00
Javier Segarra	ab1797ebec	Merge branch 'dev' into 7272_bug_redirectToLogin	2024-05-24 11:59:30 +00:00
Javier Casado	1f1d7f1020	Merge pull request 'refs: #6939 changeREADME' (!2369) from 6939-change-README into dev ... Reviewed-on: #2369 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-24 11:43:33 +00:00
Javier Casado	a2efe7d7af	Merge branch 'dev' into 6939-change-README	2024-05-24 11:41:24 +00:00
Pako Natek	ab3b58ec3c	modificacion recipe y element	2024-05-24 13:41:02 +02:00
Pako Natek	49a2e6fc84	tickets y email	2024-05-24 11:44:58 +02:00
Guillermo Bonet	2c87730dba	Merge pull request 'feat: refs #7438 Added volume to item_valuateInventory' (!2505) from 7438-item_ValuateInventory into dev ... Reviewed-on: #2505 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-24 09:30:54 +00:00
Ivan Mas	4d79dabb69	Merge branch 'dev' into 7217-Unify_errorMessageAWB	2024-05-24 08:23:05 +00:00
Ivan Mas	7e22e19e62	refs #7217 Reduce error message	2024-05-24 10:21:35 +02:00
Jorge Penadés	c76fd15f07	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-24 08:46:16 +02:00
Carlos Satorres	01e2391e0a	Merge pull request '#7292 - createAddresUEEMember' (!2489) from 7292-createAddresUEEMember into dev ... Reviewed-on: #2489 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-24 06:40:28 +00:00
Carlos Satorres	2fc6f6356f	Merge branch 'dev' into 7292-createAddresUEEMember	2024-05-24 06:38:27 +00:00
Carlos Satorres	9c3700092e	Merge branch '7292-createAddresUEEMember' of https://gitea.verdnatura.es/verdnatura/salix into 7292-createAddresUEEMember	2024-05-24 08:37:48 +02:00