From d8f1c7a2f880e430b91e0da9822e1f90ffaeaad9 Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Mon, 7 Aug 2006 10:01:25 +0000
Subject: [PATCH] Patch level         : 4.0 Files correlati     : ca2.exe
 Ricompilazione Demo : [ ] Commento            : Corretto collegamento da
 primanota a movimenti analitici preesistenti

git-svn-id: svn://10.65.10.50/trunk@14234 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ca/ca2100.cpp | 45 +++++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/ca/ca2100.cpp b/ca/ca2100.cpp
index 5f0732ffa..bbe65061a 100755
--- a/ca/ca2100.cpp
+++ b/ca/ca2100.cpp
@@ -893,31 +893,36 @@ void TMovanal_app::init_modify_mode(TMask& m)
 
 void TMovanal_app::ini2sheet(TConfig& ini, TSheet_field& sheet)
 {
-  TRectype rec(LF_RMOVANA); // Crea una riga di appoggio
   TString8 para; 
-
-  sheet.destroy();
-  _msk->reset_saldi();
-
-  for (int r = 1; ; r++)
+  para.format("%d,1", LF_RMOVANA);
+  if (ini.set_paragraph(para))  // Esiste la prima riga?
   {
-    para.cut(0) << LF_RMOVANA << ',' << r;
-    if (!ini.set_paragraph(para))
-      break;
+    TRectype rec(LF_RMOVANA); // Crea una riga di appoggio
+    sheet.destroy();          // Azzera lo sheet 
+    _msk->reset_saldi();      // Azzera i saldi 
 
-    rec.zero();
-    for (int i = 0; i < rec.items(); i++)
+    for (int r = 1; ; r++)
     {
-      const char* field = rec.fieldname(i);
-      const TString& str = ini.get(field);
-      if (str.full())
-        rec.put(field, str);
-    }
-    _msk->rec2row(rec, r-1);
+      para.format("%d,%d", LF_RMOVANA, r);
+      if (!ini.set_paragraph(para))
+        break;
 
-    TImporto imp; _msk->row2imp(r-1, imp);
-    TImporto& sld = _msk->saldo(rec);
-    sld -= imp;
+      // Riempie il record temporaneo coi dati del .ini
+      rec.zero();
+      for (int i = 0; i < rec.items(); i++)
+      {
+        const char* field = rec.fieldname(i);
+        const TString& str = ini.get(field);
+        if (str.full())
+          rec.put(field, str);
+      }
+      _msk->rec2row(rec, r-1);  // Riempie la riga dello sheet a partire da record
+
+      // Aggiorna saldo in base all'importo della riga
+      TImporto imp; _msk->row2imp(r-1, imp);
+      TImporto& sld = _msk->saldo(rec);
+      sld -= imp;
+    }
   }
 }