diff --git a/ve/velib06.cpp b/ve/velib06.cpp
index 46043facc..b981b30c3 100755
--- a/ve/velib06.cpp
+++ b/ve/velib06.cpp
@@ -1694,10 +1694,11 @@ bool TDocumento_mask::ss_notify( TSheet_field& ss, int r, KEY key )
 				const bool on = rdoc.get(RDOC_DACODNUM).full();
 				riga_mask.enable(DLG_USER, on);
 			}
-			const bool artmag = rdoc.is_merce() && rdoc.get(RDOC_CODARTMAG).full();
+			const bool merce = rdoc.is_merce();
+			const bool artmag = rdoc.get(RDOC_CODARTMAG).full();
 
-			riga_mask.show(FR_UMQTA, artmag);
-			riga_mask.show(FR_UMQTA2, !artmag);
+				riga_mask.show(FR_UMQTA, artmag || !merce);
+				riga_mask.show(FR_UMQTA2, !artmag || !merce);
 
 			if (rdoc.get(RDOC_CODART).empty() && rdoc.get(RDOC_DESCR).empty())
 			{
diff --git a/ve/velib06a.cpp b/ve/velib06a.cpp
index ff56fbb57..a66bfbd68 100755
--- a/ve/velib06a.cpp
+++ b/ve/velib06a.cpp
@@ -1850,11 +1850,12 @@ bool codartmag_handler( TMask_field& f, KEY key )
 
 	if (to_check)
 	{
-		const bool artmag = mask.doc()[s.selected() + 1].is_merce() && f.get().full();
+			const int r = s.selected();
+			const bool merce = mask.doc()[r + 1].is_merce();
+			const bool artmag = f.get().full();
 
-		m.show(FR_UMQTA, artmag);
-		m.show(FR_UMQTA2, !artmag);
-		mask.update_giacenza();
+			mask.show(FR_UMQTA, artmag || !merce);
+			mask.show(FR_UMQTA2, !artmag || !merce);		mask.update_giacenza();
 	}
 	return true;
 
@@ -2567,7 +2568,7 @@ bool ca_mag_handler(TMask_field& f, bool cdc = true)
 
 	last_fld = f.dlg();
 	first_fld = last_fld - info.levels() + 1;
-	for (i = first_fld; i <= last_fld; i++)
+ 	for (i = first_fld; i <= last_fld; i++)
 		cod << row_mask.get(i);
 	if (cod.blank())
 	{