From 73cb530d747c2154a367f99c1b45342c901335ae Mon Sep 17 00:00:00 2001
From: mtollari <mtollari@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Thu, 24 May 2018 08:20:27 +0000
Subject: [PATCH] Patch level         : 12.0 572 Files correlati     : bs
 Commento            : Aggiunto progress bar durante l'importazione

git-svn-id: svn://10.65.10.50/branches/R_10_00@24494 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 src/bs/bs0300.cpp | 47 +++++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/bs/bs0300.cpp b/src/bs/bs0300.cpp
index 75469abd0..91e988ddc 100644
--- a/src/bs/bs0300.cpp
+++ b/src/bs/bs0300.cpp
@@ -286,6 +286,9 @@ void TSknet_sync::load_their_origine(TISAM_recordset& out_set, const char* in_ta
 		TProgress_monitor pi(n, str);
 		for (bool ok = odbc.move_first(); ok; ok = odbc.move_next())
 		{
+			if(!pi.add_status())
+				break;
+
 			file.zero();
 			TString80 cfld, bfld, def;  // Campo field, BeeStore field e cut field
 			int ffld, tfld;
@@ -940,35 +943,35 @@ void TSknet_sync::load_clifo(const char tipocf)
 			abi = odbc.get("For_Abi").as_string();
 			cab = odbc.get("For_Cab").as_string();
 			contcor = odbc.get("For_ContoCorr").as_string();
-		}
-		int err = 1;
+		}
+		int err = 1;
 		// Calcolo il CIN
-		TString msg, bban;
-		bban << "#" << abi << cab << contcor;
-		for (char cin = 'A'; cin <= 'Z' && err == 1; cin++)
-		{
-			bban[0] = cin;
-			err = bban_check(bban, msg);
-			if (err == 0)
-			{
-				cin = bban[0];
-				break;
-			}
+		TString msg, bban;
+		bban << "#" << abi << cab << contcor;
+		for (char cin = 'A'; cin <= 'Z' && err == 1; cin++)
+		{
+			bban[0] = cin;
+			err = bban_check(bban, msg);
+			if (err == 0)
+			{
+				cin = bban[0];
+				break;
+			}
 		}
 		// Calcolo l'IBAN
 		if (err == NOERR)
 		{
 			err = 1;
 			iban.cut(0) << statoISO << "##" << bban;
-			for (int pp = 0; pp <= 99 && err == 1; pp++)
-			{
-				msg.format("%02d", pp);
-				iban.overwrite(msg, 2);
-				err = iban_check(iban, msg);
-				if (err == 0)
-				{
-					break;
-				}
+			for (int pp = 0; pp <= 99 && err == 1; pp++)
+			{
+				msg.format("%02d", pp);
+				iban.overwrite(msg, 2);
+				err = iban_check(iban, msg);
+				if (err == 0)
+				{
+					break;
+				}
 			}
 		}