diff --git a/cg/cg2102.cpp b/cg/cg2102.cpp
index 2b66368bf..59d396b9d 100755
--- a/cg/cg2102.cpp
+++ b/cg/cg2102.cpp
@@ -2428,7 +2428,7 @@ bool TPrimanota_application::numdoc_handler(TMask_field& f, KEY key)
   }
   
   // Controllo documenti duplicati 
-  if (key == K_ENTER  && !f.empty() && app().iva() == iva_acquisti)
+  if (key == K_ENTER  && !f.empty() && app().iva() != nessuna_iva)
   {
     TMask& m = f.mask();
 
@@ -2452,7 +2452,7 @@ bool TPrimanota_application::numdoc_handler(TMask_field& f, KEY key)
       TRectype& rec = rel.curr();
         
       TRectype recfrom(rec);
-      recfrom.put(MOV_TIPO, "F");
+      recfrom.put(MOV_TIPO, app().iva() == iva_acquisti ? "F" : "C");
       recfrom.put(MOV_CODCF, fornitore);
       recfrom.put(MOV_DATAREG, TDate(1, 1, annodoc));