diff --git a/cg/pagament.cpp b/cg/pagament.cpp
index a6c48fd9f..6ee477a47 100755
--- a/cg/pagament.cpp
+++ b/cg/pagament.cpp
@@ -430,8 +430,10 @@ void TPagamento::adjust_importo_lire()
 }
                                                
 void TPagamento::next_scad(TDate& d, int scad, bool mcomm, int rata)
-{
-  if (mcomm && rata > 0)
+{ 
+  if (rata == 0 || !mcomm) d += scad;
+  
+  if (mcomm)
     {
       int nm   = scad / 30;
       int ny   = nm   / 12;
@@ -459,8 +461,6 @@ void TPagamento::next_scad(TDate& d, int scad, bool mcomm, int rata)
       if (!last && dy < d.day()) 
       d.set_day(dy);
     }
-    else  d += scad;
-    
 }
 
 void TPagamento::set_default_type(int type, bool change_existing)