22109 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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
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
Pako Natek	31dc85a0d7	Merge pull request 'feat: refs #6021 add new field' (!2508) from 6021-add-observations-to-json into dev ... Reviewed-on: #2508 Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-05-24 05:32:40 +00:00
Pako Natek	0a1e09be41	Merge branch 'dev' into 6021-add-observations-to-json	2024-05-24 05:31:10 +00:00
Guillermo Bonet	2fe279ed47	feat: refs #7438 Requested changes and little changes	2024-05-24 07:20:27 +02:00
Pablo Natek	ee17ea4842	feat: refs #6021 add new field	2024-05-23 21:38:02 +02:00
Jorge Penadés	cddc034adf	fix: refs #6942 revoke update isBooked	2024-05-23 17:53:08 +02:00
Sergio De la torre	cee8fdd784	refs #6832 fix: ToItem	2024-05-23 16:56:35 +02:00
Carlos Satorres	84582120d1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7292-createAddresUEEMember	2024-05-23 16:12:55 +02:00
Jorge Penadés	798b4f9df0	fix: refs #6942 toBook/toUnbook	2024-05-23 16:12:21 +02:00
Jorge Penadés	3e2abfea2c	fix: refs #6942 merge	2024-05-23 16:08:48 +02:00
Jorge Penadés	2cd3002d06	Merge pull request 'test' (!2506) from test into dev ... Reviewed-on: #2506 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-05-23 14:07:21 +00:00
Carlos Andrés	14f243f251	Merge pull request 'fix: refs #7400 ledger_next' (!2495) from 7400-warmfix-ledger into test ... Reviewed-on: #2495 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-23 14:03:22 +00:00
Carlos Satorres	33ba999725	Merge pull request 'refs #6111 routeList sql' (!2257) from 6111-routeList into dev ... Reviewed-on: #2257 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-23 12:47:56 +00:00
Carlos Satorres	f45f909995	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7292-createAddresUEEMember	2024-05-23 14:46:33 +02:00
Carlos Satorres	ee010a3bb3	refs #7296 fix pr errors, trad	2024-05-23 14:44:47 +02:00
Guillermo Bonet	35ce259e5a	feat: refs #7438 Added volume to item_valuateInventory	2024-05-23 14:26:11 +02:00
Jorge Penadés	4219b22553	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-23 14:13:17 +02:00
Carlos Andrés	35a583d6d8	Merge pull request 'test' (!2504) from test into dev ... Reviewed-on: #2504 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-05-23 11:42:23 +00:00
Carlos Andrés	1e15a6ed44	Merge pull request 'hotfix: Eliminar restricciones ticketRefund Ticket #187137' (!2498) from Hotfix-eliminar-restricciones-ticketRefund into master ... Reviewed-on: #2498 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-23 10:54:21 +00:00
Carlos Andrés	8b967ee927	Merge pull request 'fix: problems in colums ticket and sale refs #7213' (!2497) from 7213-Problems-in-colums-ticket-and-sale into test ... Reviewed-on: #2497 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-23 10:53:15 +00:00
Pablo Natek	a919c71369	Merge pull request 'feat: refs #7187 Add support for multiple PDAs per user' (!2496) from 7187-add-traducctions into test ... Reviewed-on: #2496 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-23 10:24:53 +00:00
Pablo Natek	86a6211cd8	fix: refs #7187 fix duplicate	2024-05-23 12:23:31 +02:00