Merge remote-tracking branch 'origin/master'

IntegryReports/VGALIMENTI/ReportDistintaIncassoGiornataVettore.jrxml

@@ -55,7 +55,9 @@
                    azienda
               WHERE ISNULL(distr.data_dist, doc.data_doc) =  $P{data_doc} 
                 AND doc.gestione = 'V'
-                AND doc.cod_dtip NOT IN ('BUC')
+                AND doc.cod_dtip NOT IN ('BUC')  
+                AND	gg_prima_rata = 0 
+                AND doc.cod_paga NOT IN ('39')
                 AND dtb_tipi.tipo_emissione = 'DIRETTA'
                AND ($P{user_name} IS NULL OR $P{user_name}= '' OR  su.User_name =$P{user_name} )
                 AND ($P{cod_vvet}  IS NULL  OR $P{cod_vvet}= '' OR doc.cod_vvet =$P{cod_vvet} )),
@@ -186,7 +188,7 @@ ORDER   BY CASE
 		<property name="com.jaspersoft.studio.field.name" value="sospeso"/>
 		<property name="com.jaspersoft.studio.field.label" value="sospeso"/>
 	</field>
-	<group name="Gruppo1" isReprintHeaderOnEachPage="true">
+	<group name="Gruppo1" isReprintHeaderOnEachPage="true" keepTogether="true">
 		<groupExpression><![CDATA[$F{gruppo}]]></groupExpression>
 		<groupHeader>
 			<band height="89">