From f1c39abee2063a114b5f6964b0fd2991d396545b Mon Sep 17 00:00:00 2001
From: villa <villa@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Tue, 6 Feb 1996 10:54:37 +0000
Subject: [PATCH] Aggiustata scadenza prima rata con mese commerciale

git-svn-id: svn://10.65.10.50/trunk@2564 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 cg/pagament.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/cg/pagament.cpp b/cg/pagament.cpp
index 06f7be144..9714f5603 100755
--- a/cg/pagament.cpp
+++ b/cg/pagament.cpp
@@ -505,9 +505,7 @@ void TPagamento::set_cambio(const real& cambio, bool recalc_lit)
                                                
 void TPagamento::next_scad(TDate& d, int scad, bool mcomm, int rata)
 { 
-  if (rata == 0 || !mcomm) 
-    d += scad;
-  if (mcomm)
+  if (mcomm && rata > 0)
   {
     int nm   = scad / 30;
     int ny   = nm   / 12;
@@ -534,7 +532,8 @@ void TPagamento::next_scad(TDate& d, int scad, bool mcomm, int rata)
     d.set_end_month();  
     if (!last && dy < d.day()) 
     d.set_day(dy);
-  }
+  }        
+  else d += scad;
 }
 
 void TPagamento::set_default_type(int type, bool change_existing)