diff --git a/src/ca/ca3200.cpp b/src/ca/ca3200.cpp
index c47d5ceb5..a88a756a3 100755
--- a/src/ca/ca3200.cpp
+++ b/src/ca/ca3200.cpp
@@ -186,30 +186,48 @@ bool TPrint_mastrini_ca_recordset::valid_record(const TRelation& rel) const
 	//..poi le righe (devono comparire solo le righe con cdc/cms/fsc che appaiono nello sheet)
 	const TRectype& rmov = rel.curr(LF_RMOVANA);
 
-  if (_codcosto.not_empty())
+  if (_codcosto.full())
   {
     const TString& cos = rmov.get(RMOVANA_CODCCOSTO);
+
     if (cos != _codcosto)
       return false;
   }
-  if (_codcms.not_empty())
+  if (_codcms.full())
   {
     const TString& cms = rmov.get(RMOVANA_CODCMS);
+
     if (cms != _codcms)
       return false;
   }
-  if (_codfas.not_empty())
+  if (_codfas.full())
   {
     const TString& fas = rmov.get(RMOVANA_CODFASE);
+
     if (fas != _codfas)
       return false;
 	}
-	if (_contsep.not_empty())
+	if (_contsep.full())
 	{
 		const TString& contsep = mov.get(MOVANA_CONTSEP);
+
 		if (contsep != _contsep)
 			return false;
 	}
+	if (_daconto.full())
+	{
+		const TString & conto = rmov.get(RMOVANA_CODCONTO);
+		
+		if (conto < _daconto)
+			return false;
+	}
+	if (_aconto.full())
+	{
+		const TString & conto = rmov.get(RMOVANA_CODCONTO);
+
+		if (conto > _aconto)
+			return false;
+	}
 	return true;
 }
 
@@ -249,6 +267,18 @@ void TPrint_mastrini_ca_recordset::set_custom_filter(TCursor& cur) const
 			end << 'z';
 			arec.put(RMOVANA_CODCCOSTO, end);
 		}
+		if (_codfas.full())
+		{
+			darec.put(RMOVANA_CODFASE, _codfas);
+			arec.put(RMOVANA_CODFASE, _codfas);
+		}
+		else
+		{
+			TString end;
+
+			end << 'z';
+			arec.put(RMOVANA_CODFASE, end);
+		}
 
 		TDate d = _dadata;
 
@@ -786,4 +816,4 @@ int ca3200(int argc, char* argv[])
   TPrint_mastrini_ca a;
   a.run(argc, argv, TR("Stampa mastrini"));
   return 0;
-}
\ No newline at end of file
+}
diff --git a/src/ca/ca3700.cpp b/src/ca/ca3700.cpp
index 033130dd4..537a98abe 100755
--- a/src/ca/ca3700.cpp
+++ b/src/ca/ca3700.cpp
@@ -2014,7 +2014,7 @@ const TVariant& TCSV_rendiconto_ca_recordset::get_var(const char* name) const
 {
 	if (strcmp(name, "#CONTSEP") == 0)
 		return get_tmp_var() = _contsep;
-	TCSV_recordset::get_var(name);
+	return TCSV_recordset::get_var(name);
 }
 
 ////////////////////////////////////////////////////////
diff --git a/src/ps/CRPA/CUSTOM/cust crpa.7z b/src/ps/CRPA/CUSTOM/cust crpa.7z
deleted file mode 100644
index ec102bed9..000000000
Binary files a/src/ps/CRPA/CUSTOM/cust crpa.7z and /dev/null differ