diff --git a/src/ca/ca3200.cpp b/src/ca/ca3200.cpp
index a19eea8cd..f052e6983 100755
--- a/src/ca/ca3200.cpp
+++ b/src/ca/ca3200.cpp
@@ -658,8 +658,6 @@ void TPrint_mastrini_ca::execute_print(TReport_book & book, TAutomask & mask, TR
 			TAssoc_array codici_buoni;
 			TString query;
 			query << "USE RMOVANA KEY 2\n";
-			query << "FROM CODCONTO=#DACONTO\n";
-			query << "TO CODCONTO=#ACONTO";
 			TISAM_recordset rmovana(query);
 			TString80 daconto, aconto;
 			for (int i = 0; _mask->id2pos(F_CDC1_INI+i) > 0; i++)
@@ -667,8 +665,13 @@ void TPrint_mastrini_ca::execute_print(TReport_book & book, TAutomask & mask, TR
 				daconto << _mask->get(F_CDC1_INI+i);
 				aconto << _mask->get(F_CDC1_FIN+i);
 			}
-			rmovana.set_var("#DACONTO", daconto);
-			rmovana.set_var("#ACONTO", aconto);
+//			rmovana.set_var("#DACONTO", daconto);
+//			rmovana.set_var("#ACONTO", aconto);
+			if (!daconto.blank())
+				query << "FROM " << CDC_CODCONTO << "=\"" << (const char*) daconto << "\"\n";
+
+			if (!daconto.blank())
+				query << "TO " << CDC_CODCONTO << "=\"" << (const char*)aconto << "\"\n";
 			const long items = rmovana.items();
 			if (items > 0)
 			{
@@ -694,10 +697,14 @@ void TPrint_mastrini_ca::execute_print(TReport_book & book, TAutomask & mask, TR
 			TProgress_monitor pi(set.items(), msg, true);
 			for (bool sok = set.move_first(); pi.add_status() && sok; sok = set.move_next())	//fighissimo metodo per scandire un file in 1 riga!
 			{
-				if (skip_closed && set.get(COMMESSE_CHIUSA).as_bool())
+				if (skip_closed && set.get_bool(COMMESSE_CHIUSA))
 					continue;
 
-				row = set.get_string(0u);	//prende il valore del primo campo del file (CDC o CMS code)
+//				row = set.get_string(0u);
+				if (logic1 == LF_CDC)
+					row = set.get_string(CDC_CODCOSTO);
+				else
+					row = set.get_string(COMMESSE_CODCMS);  //prende il valore del primo campo del file (CDC o CMS code)
 				if (!codici_buoni.is_key(row))
 					continue;
 			
diff --git a/src/ca/ca3200a.rep b/src/ca/ca3200a.rep
index 828b56f0f..9c34495cd 100755
--- a/src/ca/ca3200a.rep
+++ b/src/ca/ca3200a.rep
@@ -121,7 +121,7 @@ THEN</prescript>
   <prescript description="H3 PRESCRIPT">MESSAGE RESET,F3.103</prescript>
  </section>
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Body" level="" hidden="" page_break="" can_break="" pattern="1" />
- <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Body" level="1" hidden="" height="1" page_break="" can_break="" pattern="1">
+ <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Body" level="1" hidden="" page_break="" can_break="" pattern="1">
   <condition>NUMREG != 0</condition>
   <font face="Arial" size="8" />
   <field x="1" deactivated="" type="Data" hidden="" link="" dynamic_height="" shade_offset="" width="10" codval="" id="" pattern="1" hide_zero="" text="">
@@ -214,7 +214,7 @@ THEN
    <source>#FASE</source>
    <prescript description="B1.203 PRESCRIPT">CA_FORMAT_FASE</prescript>
   </field>
-  <field x="230" deactivated="" type="Stringa" hidden="1" link="" dynamic_height="" shade_offset="" width="13" codval="" id="204" pattern="1" hide_zero="" text="">
+  <field x="230" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="13" codval="" id="204" pattern="1" hide_zero="" text="">
    <font face="Arial" bold="1" size="9" />
    <modules>NP</modules>
    <source>#CONTSEP</source>