diff --git a/src/fp/fp0400.cpp b/src/fp/fp0400.cpp
index 7488074cd..aeb42bc02 100644
--- a/src/fp/fp0400.cpp
+++ b/src/fp/fp0400.cpp
@@ -80,7 +80,7 @@ protected:
 	int		check_err() const;
 	void	contabilizza();
 	TDate load_data() const;
-	bool is_doc_split(const vector<iva>& riva) const;
+	bool	is_doc_split(const vector<iva>& riva) const;
 	const TString& get_tot_imp_riva(const vector<iva>& riva) const;
 	// Handlers
 	static bool causfa_handler(TMask_field& f, KEY k);
@@ -210,7 +210,7 @@ void TPassive_mask::fill()
 		"LEFT JOIN PAA2600F PAA26 ON P1_KEYPRGINVIO = PP_KEYPRGINVIO and P1_KEYHEADERFATT = PP_KEYHEADERFATT and P1_KEYBODYFATT = PP_KEYBODYFATT\n" <<
 		"LEFT JOIN PAA3200F PAA32 ON P1_KEYPRGINVIO = PU_KEYPRGINVIO and P1_KEYHEADERFATT = PU_KEYHEADERFATT and P1_KEYBODYFATT = PU_KEYBODYFATT\n" <<
 		"LEFT JOIN FPPRO00F FPPRO ON P1_KEYPRGINVIO = PZ_KEYPRGINVIO and P1_KEYHEADERFATT = PZ_KEYHEADERFATT and P1_KEYBODYFATT = PZ_KEYBODYFATT\n" <<
-		"WHERE PZ_DATAORARIC >= \'" << dal.date2ansi() << "\' AND PZ_DATAORARIC < \'" << al.date2ansi()+1 << "\'" << prots_query << "\n" <<
+		"WHERE PZ_DATAORARIC >= \'" << dal.date2ansi() << "\' AND PZ_DATAORARIC < \'" << (al+(long)1).date2ansi() << "\'" << prots_query << "\n" <<
 		"GROUP BY YEAR(P7_DATA), P7_TIPODOC, P7_NUMERO, P7_DATA, PZ_DATAORARIC, PQ_IMPTOTDOC, PZ_NUMREGCONT, PZ_DATAREGCONT, P2_ANADENOMIN, P2_ANANOME, P2_ANACOGNOME, P2_FISCIVACOD, P2_CODFISCALE, P2_FISCIVAPAESE,\n" <<
 		"P1_CODDEST, PU_PEC, P1_KEYPRGINVIO, P1_KEYHEADERFATT, P1_KEYBODYFATT, PZ_TIPOPROT, PZ_NUMPROT, PZ_ANNOPROT, PZ_TIPOCF, PZ_CLIFOR\n" <<
 		"ORDER BY " << (ordin == "D"? "P7_DATA" : "PZ_DATAORARIC") << " " << (verso_ord == "C"? "ASC" : "DESC");
@@ -896,7 +896,7 @@ bool TPassive_mask::is_doc_split(const vector<iva>& riva) const
 		if (riga.esigibilita == 'S')
 			return true;
 	}
-	return true;
+	return false;
 }
 
 const TString & TPassive_mask::get_tot_imp_riva(const vector<iva>& riva) const