diff --git a/ve/ve0300a.src b/ve/ve0300a.src
index 7b342116b..f4ea402f2 100755
--- a/ve/ve0300a.src
+++ b/ve/ve0300a.src
@@ -1503,7 +1503,7 @@ SIZE=2
 USE=%NOT
 INPUT=CODTAB F_CODNOTE
 DISPLAY="Codice" CODTAB~"Descrizione@50" S0
-OUTPUT=F_CODNOTE CODTAB~F_NOTECLI S0
+OUTPUT=F_CODNOTE CODTAB
 WARNING=Note clienti assenti
 
 [NOTECLI]
@@ -1518,7 +1518,7 @@ SIZE=7750
 USE=%NOT KEY 2
 INPUT=S0 F_NOTECLI
 DISPLAY="Descrizione@50" S0~"Codice" CODTAB
-OUTPUT=F_CODNOTE CODTAB~F_NOTECLI S0
+OUTPUT=F_CODNOTE CODTAB
 
 [NCOPIE]
 GROUP=1600
diff --git a/ve/velib06.cpp b/ve/velib06.cpp
index fd0d61b11..6e3754eff 100755
--- a/ve/velib06.cpp
+++ b/ve/velib06.cpp
@@ -235,6 +235,20 @@ TDocumento_mask::TDocumento_mask(const char* td)
 	hide(204);
 	disable(204);
 
+	TBrowse * nb = efield(F_CODNOTE).browse();
+	
+	if  (nb != NULL) // da eliminare
+	{
+		nb->remove_output_field();
+		nb->add_output_field(TOSTRING(F_CODNOTE), "CODTAB");
+	}
+	TBrowse * nbd = efield(F_CODNOTE).browse();
+	
+	if  (nbd != NULL) // da eliminare
+	{
+		nbd->remove_output_field();
+		nbd->add_output_field(TOSTRING(F_CODNOTE), "CODTAB");
+	}
 	if  (cfg.get_bool("GESLISCV") && id2pos(F_CODLIST) > 0)
 	{
 		TBrowse * b = efield(F_CODLIST).browse();
diff --git a/ve/velib06a.cpp b/ve/velib06a.cpp
index 13310106d..536869552 100755
--- a/ve/velib06a.cpp
+++ b/ve/velib06a.cpp
@@ -263,17 +263,20 @@ bool note_hndl( TMask_field& f, KEY key )
 		{
 			if (m.is_running() || m.field(F_NOTECLI).empty()) // Preserva descrizione presente in caricamento
 			{
-				// gestione del campo con descrizione estesa
-				TString stringone;
-				for (int i = 0; i < 6; i++)
+				if  (!note.get_bool("B1"))
 				{
-					const char fieldname[3] = { 'S', i+'0', '\0' };
-					stringone << note.get(fieldname);
+					// gestione del campo con descrizione estesa
+					TString stringone;
+					for (int i = 0; i < 6; i++)
+					{
+						const char fieldname[3] = { 'S', i+'0', '\0' };
+						stringone << note.get(fieldname);
+					}
+					stringone.replace(char(0xB6), '\n');
+					m.set(F_NOTECLI, stringone);
 				}
-				stringone.replace(char(0xB6), '\n');
-				m.set(F_NOTECLI, stringone);
 			}
-
+			
 			if (m.doc().modificabile() && m.field(DLG_SAVEREC).enabled())
 			{
 				const bool reg_disabled = note.get_bool("B0");