From 975cf2d8e6ae681b9022d638975c186a30238e56 Mon Sep 17 00:00:00 2001
From: mtollari <mtollari@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Wed, 14 Sep 2016 14:55:05 +0000
Subject: [PATCH] Patch level         : 12.0 282 Files correlati     : ef1.exe
 Commento            : - Corretta il tipo sequenza nei RID XML, ora viene
 impostato dall'effetto - Corretto valore 0.0 in const real ZERO

git-svn-id: svn://10.65.10.50/branches/R_10_00@23284 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 src/ef/ef0100.cpp |  4 ++--
 src/ef/ef0600.cpp | 30 +++++++++++++++---------------
 src/ef/ef0800.cpp |  4 ++--
 src/ef/ef1100.cpp |  3 ++-
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/ef/ef0100.cpp b/src/ef/ef0100.cpp
index 252446628..990e70c94 100755
--- a/src/ef/ef0100.cpp
+++ b/src/ef/ef0100.cpp
@@ -172,7 +172,7 @@ void TVariazione_effetti::common_f(const TMask& m)
   {
     TToken_string& row = shrighe.row(i);
     real imp_eff(row.get(shrighe.cid2index(F_IMPEFF)));
-    if (imp_eff == 0.0) continue; // salta le righe con importo nullo
+    if (imp_eff == ZERO) continue; // salta le righe con importo nullo
     row.restart();
     TRectype& rec = _effetto->row_r(ii, true);
     rec.zero();           
@@ -345,7 +345,7 @@ bool TVariazione_effetti::handle_sheet(TMask_field &f, KEY k)
       TToken_string& row = sf.row(i);
       real imp_eff(row.get(sf.cid2index(F_IMPEFF)));
       // controlla che le righe abbiano un importo
-      if (imp_eff != 0.0) found = true;
+      if (imp_eff != ZERO) found = true;
     }
     // se non ha trovato righe nello sheet oppure se quelle che ci sono non
     // hanno importo
diff --git a/src/ef/ef0600.cpp b/src/ef/ef0600.cpp
index 394d3b2ef..dc77fed18 100755
--- a/src/ef/ef0600.cpp
+++ b/src/ef/ef0600.cpp
@@ -106,7 +106,7 @@ void TPrint_effetti_app::st_tot_scad()
   _pr.put(_scad_prec.string(),53);  
   _pr.put(_tot_data.string(PICTURE_IMPORTO),63);
   printer().print(_pr);
-  _tot_data = 0.0;  
+  _tot_data = ZERO;  
   _pr.reset();
 }
 
@@ -120,7 +120,7 @@ void TPrint_effetti_app::st_tot_mese()
     _pr.put(_tot_mese.string(PICTURE_IMPORTO),63);
   }  
   printer().print(_pr);
-  _tot_mese = 0.0;  
+  _tot_mese = ZERO;  
   _pr.reset();                         
 }               
 
@@ -139,7 +139,7 @@ void TPrint_effetti_app::st_tot_distinta()
   s << _dist_prec << " " << _tipo_prec ;
   _pr.put(s,52);   
   printer().print(_pr);
-  _tot_distinta = 0.0;  
+  _tot_distinta = ZERO;  
   _pr.reset();                         
 }     
                                 
@@ -153,7 +153,7 @@ void TPrint_effetti_app::st_tot_cliente()
   TString80 cli;
   _pr.put((look_clifo(_tipocf_prec, _cliente_prec, cli)),52);   
   printer().print(_pr);
-  _tot_cliente = 0.0;  
+  _tot_cliente = ZERO;  
   _pr.reset();     
 }               
                                
@@ -170,7 +170,7 @@ void TPrint_effetti_app::st_tot_banca()
   	s = TR("Banca assente");
  	_pr.put(s,52);   
  	printer().print(_pr);
- 	_tot_banca = 0.0; 
+ 	_tot_banca = ZERO; 
  	_pr.reset();                         
 }
 
@@ -206,7 +206,7 @@ void TPrint_effetti_app::st_tot_tipodist()
  	}
  	_pr.put(s,52); 
  	printer().print(_pr);        
- 	_tot_tip_dist = 0.0;  
+ 	_tot_tip_dist = ZERO;  
  	_pr.reset();     
  	
 } 	
@@ -387,27 +387,27 @@ print_action TPrint_effetti_app::postprocess_print(int file, int counter)
   TString s;
   if (_tipoord == 'D')
   {
-	  if (_tot_data != 0.0) 
+	  if (_tot_data != ZERO) 
 	     st_tot_scad();
-	  if(_tot_mese != 0.0)
+	  if(_tot_mese != ZERO)
 	     st_tot_mese();
 	}     
-	else if (_tot_cliente != 0.0)
+	else if (_tot_cliente != ZERO)
   	st_tot_cliente();
 	
-  if (_tot_banca != 0.0)
+  if (_tot_banca != ZERO)
   	st_tot_banca();
 
-  if (_tot_distinta != 0.0 &&_dist_prec != 0)
+  if (_tot_distinta != ZERO &&_dist_prec != 0)
   	st_tot_distinta();
 
-  if (_tot_tip_dist != 0.0)
+  if (_tot_tip_dist != ZERO)
   	st_tot_tipodist();
 
-  if (_tot_cliente != 0.0)
+  if (_tot_cliente != ZERO)
    	st_tot_cliente();
 
-  if (_tot_stampa != 0.0) 
+  if (_tot_stampa != ZERO) 
   {
      _pr.reset();   
      _pr.put("_____________________________________________________",46);
@@ -423,7 +423,7 @@ print_action TPrint_effetti_app::postprocess_print(int file, int counter)
      _pr.put("_____________________________________________________",46);
      printer().print(_pr);
      _pr.reset();     
-     _tot_stampa = 0.0;  
+     _tot_stampa = ZERO;  
   }    
   return NEXT_PAGE;                   
 }  
diff --git a/src/ef/ef0800.cpp b/src/ef/ef0800.cpp
index 719e9aec2..02f62d9f3 100755
--- a/src/ef/ef0800.cpp
+++ b/src/ef/ef0800.cpp
@@ -1302,8 +1302,8 @@ void TContabilizzazione_effetti_app::contabilize_bill(const char tipo, const lon
   TImporto abbuoni_att, abbuoni_pas;
 
   bool reset_bank = FALSE;
-  _total_mov = 0.0;
-  _total_mov_val = 0.0;
+  _total_mov = ZERO;
+  _total_mov_val = ZERO;
   distinta.read(tipo,numero,_lock); // Sblocca da solo quella precedente
 
   const int items = distinta.items();  // Perche' sul file effetti il numero riga distinta e' un long ??
diff --git a/src/ef/ef1100.cpp b/src/ef/ef1100.cpp
index 0843b1413..041ec1f95 100644
--- a/src/ef/ef1100.cpp
+++ b/src/ef/ef1100.cpp
@@ -1179,7 +1179,8 @@ bool TSEPA_app::genera_dist_RID(char td, long nd, TLog_report& log)
 
 
     head.set("SERT11", "CORE");       // Codice strumento (CORE, COR1, B2B)
-    head.set("SERT12", "FRST");       // Tipo sequenza incasso
+	const TString8 ts = tipo_sequenza(e0);
+    head.set("SERT12", ts);       // Tipo sequenza incasso
     head.set("SERT13", "SUPP"); 
 
     const TDate ReqdExctnDt = data_scadenza(e0);