diff --git a/ve/velib06.cpp b/ve/velib06.cpp
index 132b849f7..058e7dd62 100755
--- a/ve/velib06.cpp
+++ b/ve/velib06.cpp
@@ -2397,7 +2397,7 @@ bool TElabora_mask::on_field_event(TOperable_field& o, TField_event e, long joll
 			const bool add_to_doc = o.get().not_empty();
   		    TElaborazione * e = curr_elab();
 			const bool external = e != NULL && e->tipo() == _esterna;
-            const bool is_search = o.get().empty() || field(F_CODCF_ELAB).empty() || external;
+      const bool is_search = o.get().empty() || field(F_CODCF_ELAB).empty() || external || add_to_doc;
 			
 			o.mask().field(F_NDOC_ELAB).check_type(is_search ? CHECK_SEARCH : CHECK_NORMAL);
 			_tree.multiple_selection(add_to_doc);
@@ -2682,7 +2682,7 @@ bool TElabora_mask::elabora()
 
 		in.add(app_doc);
 		out.add(d);
-		if (e->elabora(in, out, TDate(TODAY), TRUE))
+		if (e->elabora(in, out, TDate(TODAY), true))
 		{										
 			if (out[0] != d)
 				out.rewrite();
@@ -2700,7 +2700,7 @@ bool TElabora_mask::elabora()
 	{
 		_tree.build_doc_list(in);
 		if (in.items() == 0)
-			return false;
+			return false ;
 		char provv = get(F_PROVV_ELAB)[0];
 		int anno = get_int(F_ANNO_ELAB);
 		TString16 codnum(get(F_CODNUM_ELAB));
@@ -2733,7 +2733,7 @@ bool TElabora_mask::elabora()
 			app_doc.put(DOC_STATO, stato);
 		}
 		out.add(app_doc);
-		if (e->elabora(in, out, TDate(TODAY), TRUE))
+		if (e->elabora(in, out, TDate(TODAY), true))
 		{
 			if (out[0] != app_doc)
 			{