- ajustes homologaçaõ

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@30152 d1611594-4594-4d17-8e1d-87c2c4800839

src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTrechoVendido.jrxml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioTrechoVendido" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="41ab2d20-dc50-4e37-b78d-20e600a984d4">
 	<property name="ireport.zoom" value="1.5"/>
-	<property name="ireport.x" value="115"/>
+	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<parameter name="DATA_INICIO" class="java.sql.Timestamp"/>
 	<parameter name="DATA_FINAL" class="java.sql.Timestamp"/>
@@ -45,22 +45,28 @@ ON
     (
         c.DESTINO_ID = destino.PARADA_ID
     )
-INNER JOIN CORRIDA cor
+LEFT JOIN CORRIDA cor
 ON
     (
         c.CORRIDA_ID = cor.CORRIDA_ID
     AND c.FECCORRIDA = cor.FECCORRIDA
     )
+
+LEFT JOIN MARCA m
+ON
+    (
+        m.marca_id = c.marca_id
+    )
 LEFT JOIN EMPRESA e
 ON
     (
-        e.EMPRESA_ID = c.EMPRESAPUNTOVENTA_ID
+        e.EMPRESA_ID = m.empresa_id
     )
 WHERE
     c.FECHORVENTA BETWEEN $P{DATA_INICIO} AND $P{DATA_FINAL}
 
     AND ((c.PUNTOVENTA_ID IN ( $P!{PUNTOVENTA_ID} )) OR ($P{PUNTOVENTA_ID} = '-1'))
-
+    AND c.motivocancelacion_id is null
     AND e.NOMBEMPRESA LIKE $P{NOMBEMPRESA_SEARCH}
 GROUP BY
     origem.DESCPARADA ,
@@ -92,6 +98,15 @@ ORDER BY
 		<variableExpression><![CDATA[($V{VENDA_1}.add($V{LIVRE_1}))]]></variableExpression>
 		<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
 	</variable>
+	<variable name="VENDA_2" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{VENDA}]]></variableExpression>
+	</variable>
+	<variable name="LIVRE_2" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{LIVRE}]]></variableExpression>
+	</variable>
+	<variable name="SOMA_1" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{SOMA}]]></variableExpression>
+	</variable>
 	<group name="ORIGEM_DESTINO">
 		<groupExpression><![CDATA[$F{ORIGEM} + $F{DESTINO}]]></groupExpression>
 		<groupHeader>
@@ -295,7 +310,7 @@ ORDER BY
 				</textElement>
 				<textFieldExpression><![CDATA[$F{VENDA}.add( $F{LIVRE} )]]></textFieldExpression>
 			</textField>
-			<textField pattern="HH:mm">
+			<textField pattern="HH:mm" isBlankWhenNull="true">
 				<reportElement uuid="3875c823-7570-4b5b-aaf1-98d6d68d268c" x="346" y="1" width="33" height="19"/>
 				<textElement>
 					<font size="7"/>
@@ -311,7 +326,36 @@ ORDER BY
 		<band splitType="Stretch"/>
 	</pageFooter>
 	<summary>
-		<band splitType="Stretch"/>
+		<band height="20" splitType="Stretch">
+			<textField>
+				<reportElement uuid="398bcb75-d1a6-459d-ae52-94e90ceed079" x="379" y="0" width="36" height="20"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="7" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{VENDA_2}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="92505b57-456e-477a-b456-10f7499c7c76" x="415" y="0" width="35" height="20"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="7" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{LIVRE_2}]]></textFieldExpression>
+			</textField>
+			<textField pattern="¤ #,##0.00">
+				<reportElement uuid="ca0102b6-c0eb-40a9-a9b7-d30798839138" x="503" y="0" width="52" height="20"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font size="7" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{SOMA_1}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" evaluationTime="Group" evaluationGroup="ORIGEM_DESTINO">
+				<reportElement uuid="12f2bdb9-c2cc-48bf-b5fe-23bd584acf4d" x="450" y="2" width="53" height="18"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="7" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{LIVRE_2}.add( $V{VENDA_2} )]]></textFieldExpression>
+			</textField>
+		</band>
 	</summary>
 	<noData>
 		<band height="21">

web/WEB-INF/i3-label_pt_BR.label

@@ -7,7 +7,7 @@
 # <controler>. <id>. <propiedade> = XXX
 
 #Versao do VentaBoleto:
-versao = ADM_20130827_1RC210
+versao = ADM_20130827_1RC211
 
 # MSG Defaut:
 MSG.CONSTRAINT.PORCENTAGEM = Os valores devem estar entre 0 e 100