22647 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Sergio De la torre	e133dec514	refs #6861 feat: trigger	2024-05-27 11:55:42 +02:00
Alex Moreno	a464b0afd1	fix: en translations	2024-05-27 11:54:37 +02:00
Carlos Satorres	208409acb2	refs #7406 add relation	2024-05-27 11:50:15 +02:00
Robert Ferrús	3bde965f2c	Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop	2024-05-27 09:46:55 +00:00
Robert Ferrús	0b648d09af	feat: refs #7296 roadmapStopFk	2024-05-27 11:45:22 +02:00
Sergio De la torre	2d876fa1a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-05-27 11:33:22 +02:00
Sergio De la torre	74b71079f2	refs #6861 feat: obsrevation	2024-05-27 11:33:04 +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
Robert Ferrús	941438efd0	Merge branch '7296-expeditionTruckToRoadmapStop' of https://gitea.verdnatura.es/verdnatura/salix into 7296-expeditionTruckToRoadmapStop	2024-05-27 09:41:30 +02:00
Robert Ferrús	aaea0c95f7	feat: refs #7296 roadmapStopFk	2024-05-27 09:41:28 +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
Robert Ferrús	cf5d520692	Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop	2024-05-27 07:09:34 +00:00
Robert Ferrús	eb503238d7	feat refs #7296 routesMonitor.expeditionTruckFk to routesMonitor.roadmapStopFk	2024-05-27 09:07:23 +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
Sergio De la torre	2cd7133a8c	refs #6861 feat: skipTest	2024-05-27 08:15:57 +02:00
Sergio De la torre	64f71e0f9d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-05-27 07:46:21 +02:00
Sergio De la torre	d770cd8d48	refs #6861 feat: getLock	2024-05-27 07:33:33 +02: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
Carlos Satorres	723327918b	refs #7406 worker formation	2024-05-24 15:55:23 +02:00
Javi Gallego	0e5a15dd4e	con addressFk	2024-05-24 15:14:20 +02: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
Carlos Satorres	a435d88e55	refs #7292 fix tback	2024-05-24 08:37:46 +02:00
Carlos Satorres	5eaadf6044	Merge pull request 'fix: refs #6095 filter by refFk null' (!2468) from 6095-refFk-null-on-search into dev ... Reviewed-on: #2468 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-24 06:28:28 +00:00
Carlos Satorres	a5079a5ae0	Merge branch 'dev' into 6095-refFk-null-on-search	2024-05-24 06:26:46 +00:00
Carlos Satorres	ed85abf9ef	Merge branch 'dev' into 7292-createAddresUEEMember	2024-05-24 06:22:55 +00:00
Carlos Satorres	4c3428da55	refs #7292 add traduction	2024-05-24 08:21:28 +02:00
Pako Natek	257de96743	Merge remote-tracking branch 'origin/dev' into 6021-floranet_beta	2024-05-24 07:44:12 +02:00