diff --git a/src/org/openbravo/kikobar/intfactsunat/RptC_Invoice_Lines_new.jrxml b/src/org/openbravo/kikobar/intfactsunat/RptC_Invoice_Lines_new.jrxml
index ad863e9..3b94505 100755
--- a/src/org/openbravo/kikobar/intfactsunat/RptC_Invoice_Lines_new.jrxml
+++ b/src/org/openbravo/kikobar/intfactsunat/RptC_Invoice_Lines_new.jrxml
@@ -1,10 +1,13 @@
 <?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="RptC_Invoice_Lines_new" pageWidth="482" pageHeight="842" columnWidth="482" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0">
+<!-- Created with Jaspersoft Studio version 6.6.0.final using JasperReports Library version 6.0.0  -->
+<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="RptC_Invoice_Lines_new" pageWidth="482" pageHeight="842" columnWidth="482" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="4abfbfdf-78a9-45e6-827c-47cdac6ccbd0">
 	<property name="ireport.scriptlethandling" value="0"/>
 	<property name="ireport.encoding" value="UTF-8"/>
 	<property name="ireport.zoom" value="1.5"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="devel-server.xml"/>
+	<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
 	<import value="net.sf.jasperreports.engine.*"/>
 	<import value="java.util.*"/>
 	<import value="net.sf.jasperreports.engine.data.*"/>
@@ -29,7 +32,9 @@
 	<style name="Detail_Data_Field" mode="Opaque" backcolor="#CCCCCC" fontName="Bitstream Vera Sans" fontSize="10"/>
 	<style name="Group_Footer" fontName="Bitstream Vera Sans" fontSize="11" isBold="true"/>
 	<style name="Report_Footer" isDefault="true" vAlign="Middle" fontName="Bitstream Vera Sans" fontSize="11"/>
-	<parameter name="C_INVOICE_ID" class="java.lang.String"/>
+	<parameter name="C_INVOICE_ID" class="java.lang.String">
+		<defaultValueExpression><![CDATA["56357F2346EA49DE99C0561470FBF305"]]></defaultValueExpression>
+	</parameter>
 	<parameter name="NUMBERFORMAT" class="java.text.DecimalFormat" isForPrompting="false"/>
 	<parameter name="LOCALE" class="java.util.Locale" isForPrompting="false"/>
 	<parameter name="ISTAXINCLUDED" class="java.lang.String"/>
@@ -48,7 +53,7 @@
                            left join C_GLITEM on C_INVOICELINE.ACCOUNT_ID = C_GLITEM.C_GLITEM_ID,
            C_INVOICE
         WHERE C_INVOICELINE.C_INVOICE_ID = C_INVOICE.C_INVOICE_ID
-        AND C_INVOICE.C_INVOICE_ID = $P{C_INVOICE_ID}
+         AND C_INVOICELINE.C_INVOICE_ID = $P{C_INVOICE_ID}
         ORDER BY C_INVOICELINE.LINE]]>
 	</queryString>
 	<field name="C_INVOICE_ID" class="java.lang.String"/>
@@ -69,7 +74,7 @@
 		<groupHeader>
 			<band height="25" splitType="Stretch">
 				<staticText>
-					<reportElement key="staticText-1" style="Detail_Header" mode="Transparent" x="0" y="2" width="72" height="22" forecolor="#7E7979" backcolor="#FFFFFF"/>
+					<reportElement key="staticText-1" style="Detail_Header" mode="Transparent" x="0" y="2" width="72" height="22" forecolor="#7E7979" backcolor="#FFFFFF" uuid="d9114b84-a5dd-46d6-9db7-3401d4b4a3bb"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -82,7 +87,7 @@
 					<text><![CDATA[Reference]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-2" style="Detail_Header" mode="Transparent" x="72" y="2" width="140" height="22" forecolor="#7E7979" backcolor="#FFFFFF"/>
+					<reportElement key="staticText-2" style="Detail_Header" mode="Transparent" x="72" y="2" width="140" height="22" forecolor="#7E7979" backcolor="#FFFFFF" uuid="66ee6dfc-29f6-4707-86bc-96d69f5d4a40"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -95,7 +100,7 @@
 					<text><![CDATA[Product name]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-3" style="Detail_Header" mode="Transparent" x="212" y="2" width="50" height="22" forecolor="#7E7979" backcolor="#FFFFFF"/>
+					<reportElement key="staticText-3" style="Detail_Header" mode="Transparent" x="212" y="2" width="50" height="22" forecolor="#7E7979" backcolor="#FFFFFF" uuid="2ea50e5e-bca7-4144-b5d8-7a7c6f769c34"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -108,7 +113,7 @@
 					<text><![CDATA[Uom]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-4" style="Detail_Header" mode="Transparent" x="262" y="2" width="58" height="22" forecolor="#7E7979" backcolor="#FFFFFF"/>
+					<reportElement key="staticText-4" style="Detail_Header" mode="Transparent" x="262" y="2" width="58" height="22" forecolor="#7E7979" backcolor="#FFFFFF" uuid="823fb985-bd9b-4b96-9a03-aa020c80bdd4"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -121,21 +126,21 @@
 					<text><![CDATA[Quantity]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-8" style="Detail_Header" mode="Transparent" x="321" y="2" width="79" height="22" forecolor="#7E7979" backcolor="#FFFFFF"/>
+					<reportElement key="staticText-8" style="Detail_Header" mode="Transparent" x="321" y="2" width="79" height="22" forecolor="#7E7979" backcolor="#FFFFFF" uuid="6bbe2bab-d962-441f-9838-19d2fc347f92"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font fontName="DejaVu Sans" isBold="true"/>
 					</textElement>
 					<text><![CDATA[Price]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-9" style="Detail_Header" mode="Transparent" x="401" y="2" width="81" height="22" forecolor="#7E7979" backcolor="#FFFFFF"/>
+					<reportElement key="staticText-9" style="Detail_Header" mode="Transparent" x="401" y="2" width="81" height="22" forecolor="#7E7979" backcolor="#FFFFFF" uuid="7b795992-4097-49cf-a1a2-7cdd7090488a"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font fontName="DejaVu Sans" size="10" isBold="true" pdfFontName="Helvetica"/>
 					</textElement>
 					<text><![CDATA[Total]]></text>
 				</staticText>
 				<line>
-					<reportElement key="line-1" x="0" y="23" width="482" height="1" forecolor="#CCCCCC"/>
+					<reportElement key="line-1" x="0" y="23" width="482" height="1" forecolor="#CCCCCC" uuid="2fb538b5-a2bd-4cbb-bdc9-c0ac6af56cb0"/>
 					<graphicElement>
 						<pen lineWidth="2.0" lineStyle="Double" lineColor="#A3A1A1"/>
 					</graphicElement>
@@ -145,7 +150,7 @@
 		<groupFooter>
 			<band height="39" splitType="Stretch">
 				<staticText>
-					<reportElement key="staticText-7" style="default" x="251" y="17" width="149" height="21" forecolor="#7E7979">
+					<reportElement key="staticText-7" style="default" x="251" y="17" width="149" height="21" forecolor="#7E7979" uuid="58337d75-7e73-4fbb-89b6-45cec3130b0c">
 						<printWhenExpression><![CDATA[$P{ISTAXINCLUDED}.equals("N")]]></printWhenExpression>
 					</reportElement>
 					<box leftPadding="2" rightPadding="2">
@@ -160,7 +165,7 @@
 					<text><![CDATA[Total (without taxes)]]></text>
 				</staticText>
 				<textField pattern="" isBlankWhenNull="false">
-					<reportElement key="textField" style="Total_Gray" x="400" y="17" width="81" height="21" backcolor="#FFFFFF"/>
+					<reportElement key="textField" style="Total_Gray" x="400" y="17" width="81" height="21" backcolor="#FFFFFF" uuid="f0d11fa4-b24c-42f8-aa61-65d52befba59"/>
 					<box leftPadding="2" rightPadding="2">
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -170,10 +175,10 @@
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font fontName="DejaVu Sans" isBold="true"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[($V{TOTAL_LINENETAMT}!=null)?$P{NUMBERFORMAT}.format($V{TOTAL_LINENETAMT}):new String(" ")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($V{TOTAL_LINENETAMT}!=null)?$P{NUMBERFORMAT}.format($V{TOTAL_LINENETAMT}):new String(" ")]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement key="staticText-7" style="default" x="351" y="17" width="49" height="21" forecolor="#7E7979">
+					<reportElement key="staticText-7" style="default" x="351" y="17" width="49" height="21" forecolor="#7E7979" uuid="d908f845-6dca-4285-bdac-5d02b452f9ce">
 						<printWhenExpression><![CDATA[$P{ISTAXINCLUDED}.equals("Y")]]></printWhenExpression>
 					</reportElement>
 					<box leftPadding="2" rightPadding="2">
@@ -188,7 +193,7 @@
 					<text><![CDATA[Total]]></text>
 				</staticText>
 				<line>
-					<reportElement key="line-12" x="251" y="17" width="231" height="1" forecolor="#CCCCCC">
+					<reportElement key="line-12" x="251" y="17" width="231" height="1" forecolor="#CCCCCC" uuid="75ec3cf7-06ce-41a1-926d-938e520749c9">
 						<printWhenExpression><![CDATA[$P{ISTAXINCLUDED}.equals("N")]]></printWhenExpression>
 					</reportElement>
 					<graphicElement>
@@ -196,7 +201,7 @@
 					</graphicElement>
 				</line>
 				<line>
-					<reportElement key="line-12" x="251" y="37" width="231" height="1" forecolor="#CCCCCC">
+					<reportElement key="line-12" x="251" y="37" width="231" height="1" forecolor="#CCCCCC" uuid="15cec2a8-5a8b-4625-89f8-b48b04cd8d98">
 						<printWhenExpression><![CDATA[$P{ISTAXINCLUDED}.equals("N")]]></printWhenExpression>
 					</reportElement>
 					<graphicElement>
@@ -204,7 +209,7 @@
 					</graphicElement>
 				</line>
 				<line>
-					<reportElement key="line-12" x="351" y="17" width="130" height="1" forecolor="#CCCCCC">
+					<reportElement key="line-12" x="351" y="17" width="130" height="1" forecolor="#CCCCCC" uuid="674d7c6f-b583-4aad-b04a-955865e81bd5">
 						<printWhenExpression><![CDATA[$P{ISTAXINCLUDED}.equals("Y")]]></printWhenExpression>
 					</reportElement>
 					<graphicElement>
@@ -212,7 +217,7 @@
 					</graphicElement>
 				</line>
 				<line>
-					<reportElement key="line-12" x="351" y="37" width="129" height="1" forecolor="#CCCCCC">
+					<reportElement key="line-12" x="351" y="37" width="129" height="1" forecolor="#CCCCCC" uuid="c4f4fd70-c438-4357-a2bb-18d19675930d">
 						<printWhenExpression><![CDATA[$P{ISTAXINCLUDED}.equals("Y")]]></printWhenExpression>
 					</reportElement>
 					<graphicElement>
@@ -237,7 +242,7 @@
 	<detail>
 		<band height="25">
 			<frame>
-				<reportElement key="frame-1" style="default" stretchType="RelativeToTallestObject" x="0" y="0" width="482" height="21"/>
+				<reportElement key="frame-1" style="default" stretchType="RelativeToTallestObject" x="0" y="0" width="482" height="21" uuid="8fd6894a-af37-4936-8c2c-54eda279128b"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -245,7 +250,7 @@
 					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 				</box>
 				<textField isBlankWhenNull="true">
-					<reportElement key="textField-1" style="default" stretchType="RelativeToTallestObject" x="0" y="0" width="72" height="21" forecolor="#000000"/>
+					<reportElement key="textField-1" style="default" stretchType="RelativeToTallestObject" x="0" y="0" width="72" height="21" forecolor="#000000" uuid="14915d05-21be-4c9c-9494-bd120203fa3b"/>
 					<box leftPadding="2" rightPadding="2">
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -255,10 +260,10 @@
 					<textElement verticalAlignment="Middle">
 						<font fontName="DejaVu Sans"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[$F{REFERENCE}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{REFERENCE}]]></textFieldExpression>
 				</textField>
 				<textField pattern="" isBlankWhenNull="false">
-					<reportElement key="textField-2" style="default" stretchType="RelativeToTallestObject" x="400" y="0" width="81" height="21" forecolor="#000000"/>
+					<reportElement key="textField-2" style="default" stretchType="RelativeToTallestObject" x="400" y="0" width="81" height="21" forecolor="#000000" uuid="9615b7ce-f5f2-4fd7-b213-215d1149e1f3"/>
 					<box leftPadding="2" rightPadding="2">
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -268,10 +273,10 @@
 					<textElement textAlignment="Right">
 						<font fontName="DejaVu Sans"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[($F{LINENETAMT}!=null)?$P{NUMBERFORMAT}.format($F{LINENETAMT}):new String(" ")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($F{LINENETAMT}!=null)?$P{NUMBERFORMAT}.format($F{LINENETAMT}):new String(" ")]]></textFieldExpression>
 				</textField>
 				<textField pattern="" isBlankWhenNull="false">
-					<reportElement key="textField-3" style="default" stretchType="RelativeToTallestObject" x="320" y="0" width="79" height="21" forecolor="#000000"/>
+					<reportElement key="textField-3" style="default" stretchType="RelativeToTallestObject" x="320" y="0" width="79" height="21" forecolor="#000000" uuid="e3d1b64a-712e-4676-880a-71e1831faaec"/>
 					<box leftPadding="2" rightPadding="2">
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -281,10 +286,10 @@
 					<textElement textAlignment="Right">
 						<font fontName="DejaVu Sans"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[($F{PRICEACTUAL}!=null)?$P{NUMBERFORMAT}.format($F{PRICEACTUAL}):new String(" ")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($F{PRICEACTUAL}!=null)?$P{NUMBERFORMAT}.format($F{PRICEACTUAL}):new String(" ")]]></textFieldExpression>
 				</textField>
 				<textField pattern="" isBlankWhenNull="false">
-					<reportElement key="textField-4" style="default" stretchType="RelativeToTallestObject" x="262" y="0" width="58" height="21" forecolor="#000000"/>
+					<reportElement key="textField-4" style="default" stretchType="RelativeToTallestObject" x="262" y="0" width="58" height="21" forecolor="#000000" uuid="6cff317d-cc02-498f-8b7c-c354c2f3aa6e"/>
 					<box leftPadding="2" rightPadding="2">
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -294,10 +299,10 @@
 					<textElement textAlignment="Right">
 						<font fontName="DejaVu Sans"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[($F{QTYINVOICED}!=null)?$P{NUMBERFORMAT}.format($F{QTYINVOICED}):new String(" ")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($F{QTYINVOICED}!=null)?$P{NUMBERFORMAT}.format($F{QTYINVOICED}):new String(" ")]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="true">
-					<reportElement key="textField-5" style="default" stretchType="RelativeToTallestObject" x="212" y="0" width="50" height="21" forecolor="#000000"/>
+					<reportElement key="textField-5" style="default" stretchType="RelativeToTallestObject" x="212" y="0" width="50" height="21" forecolor="#000000" uuid="347f68f2-4371-49ec-abb8-9c77288a4d66"/>
 					<box leftPadding="2" rightPadding="2">
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -307,10 +312,10 @@
 					<textElement>
 						<font fontName="DejaVu Sans"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[$F{UOMNAME}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{UOMNAME}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement key="textField-6" style="default" stretchType="RelativeToTallestObject" x="72" y="0" width="140" height="21" isPrintWhenDetailOverflows="true" forecolor="#000000"/>
+					<reportElement key="textField-6" style="default" stretchType="RelativeToTallestObject" x="72" y="0" width="140" height="21" isPrintWhenDetailOverflows="true" forecolor="#000000" uuid="1d556f94-fad4-4f31-92d1-967f6068f0cc"/>
 					<box leftPadding="2" rightPadding="2">
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -320,11 +325,11 @@
 					<textElement verticalAlignment="Middle">
 						<font fontName="DejaVu Sans"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[$F{NAME_PRODUCT}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{NAME_PRODUCT}]]></textFieldExpression>
 				</textField>
 			</frame>
 			<line>
-				<reportElement key="line-1" positionType="Float" x="0" y="22" width="482" height="1" forecolor="#CCCCCC"/>
+				<reportElement key="line-1" positionType="Float" x="0" y="22" width="482" height="1" forecolor="#CCCCCC" uuid="bd68921a-0976-4cc4-99d4-6f5fca4b32be"/>
 				<graphicElement>
 					<pen lineWidth="1.0" lineStyle="Solid" lineColor="#A3A1A1"/>
 				</graphicElement>
diff --git a/src/org/openbravo/kikobar/intfactsunat/RptC_Invoice_TaxLines_new.jrxml b/src/org/openbravo/kikobar/intfactsunat/RptC_Invoice_TaxLines_new.jrxml
index 0ab590e..12fdf47 100755
--- a/src/org/openbravo/kikobar/intfactsunat/RptC_Invoice_TaxLines_new.jrxml
+++ b/src/org/openbravo/kikobar/intfactsunat/RptC_Invoice_TaxLines_new.jrxml
@@ -1,10 +1,13 @@
 <?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="RptC_Invoice_TaxLines_new" pageWidth="482" pageHeight="842" columnWidth="482" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0">
+<!-- Created with Jaspersoft Studio version 6.6.0.final using JasperReports Library version 6.0.0  -->
+<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="RptC_Invoice_TaxLines_new" pageWidth="482" pageHeight="842" columnWidth="482" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="39cd7a5c-56bf-4961-8698-148655c2b5e4">
 	<property name="ireport.scriptlethandling" value="0"/>
 	<property name="ireport.encoding" value="UTF-8"/>
 	<property name="ireport.zoom" value="1.5"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="devel-server.xml"/>
+	<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
 	<import value="net.sf.jasperreports.engine.*"/>
 	<import value="java.util.*"/>
 	<import value="net.sf.jasperreports.engine.data.*"/>
@@ -29,7 +32,9 @@
 	<style name="Detail_Data_Field" mode="Opaque" backcolor="#CCCCCC" fontName="Bitstream Vera Sans" fontSize="10"/>
 	<style name="Group_Footer" fontName="Bitstream Vera Sans" fontSize="11" isBold="true"/>
 	<style name="Report_Footer" isDefault="true" vAlign="Middle" fontName="Bitstream Vera Sans" fontSize="11"/>
-	<parameter name="C_INVOICE_ID" class="java.lang.String"/>
+	<parameter name="C_INVOICE_ID" class="java.lang.String">
+		<defaultValueExpression><![CDATA["56357F2346EA49DE99C0561470FBF305"]]></defaultValueExpression>
+	</parameter>
 	<parameter name="NUMBERFORMAT" class="java.text.DecimalFormat" isForPrompting="false"/>
 	<parameter name="LOCALE" class="java.util.Locale" isForPrompting="false"/>
 	<parameter name="ISTAXINCLUDED" class="java.lang.String"/>
@@ -58,7 +63,7 @@
 			<band height="40">
 				<printWhenExpression><![CDATA[$P{ISTAXINCLUDED}.equals("N")]]></printWhenExpression>
 				<textField evaluationTime="Band" pattern="" isBlankWhenNull="true">
-					<reportElement key="textField" mode="Opaque" x="399" y="18" width="82" height="21" backcolor="#FFFFFF"/>
+					<reportElement key="textField" mode="Opaque" x="399" y="18" width="82" height="21" backcolor="#FFFFFF" uuid="fd23e606-2e0c-4038-8f2d-92f447f2308b"/>
 					<box>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<bottomPen lineWidth="0.0" lineColor="#000000"/>
@@ -66,20 +71,20 @@
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font fontName="DejaVu Sans" size="10" isBold="true"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[($P{TOTAL_LINENET}.add($V{TOTAL_TAXAMT})!=null)?$P{NUMBERFORMAT}.format($P{TOTAL_LINENET}.add($V{TOTAL_TAXAMT})):new String(" ")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{TOTAL_LINENET}.add($V{TOTAL_TAXAMT})!=null)?$P{NUMBERFORMAT}.format($P{TOTAL_LINENET}.add($V{TOTAL_TAXAMT})):new String(" ")]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement key="staticText-14" style="Report_Footer" x="355" y="18" width="44" height="21" forecolor="#7E7979"/>
+					<reportElement key="staticText-14" style="Report_Footer" x="355" y="18" width="44" height="21" forecolor="#7E7979" uuid="3cf423dd-b8e4-446e-8524-e24e0e0fde14"/>
 					<textElement textAlignment="Right">
 						<font fontName="DejaVu Sans" size="12" isBold="true"/>
 					</textElement>
 					<text><![CDATA[Total]]></text>
 				</staticText>
 				<line>
-					<reportElement key="line-39" style="Report_Footer" x="355" y="18" width="127" height="1" forecolor="#CCCCCC"/>
+					<reportElement key="line-39" style="Report_Footer" x="355" y="18" width="127" height="1" forecolor="#CCCCCC" uuid="8a047f0c-e5eb-4683-9b4e-8eca1a83dd68"/>
 				</line>
 				<line>
-					<reportElement key="line-40" style="Report_Footer" x="355" y="38" width="127" height="1" forecolor="#CCCCCC"/>
+					<reportElement key="line-40" style="Report_Footer" x="355" y="38" width="127" height="1" forecolor="#CCCCCC" uuid="f69d518c-3a81-4505-b750-026dd54c53f7"/>
 				</line>
 			</band>
 		</groupFooter>
@@ -99,7 +104,7 @@
 	<detail>
 		<band height="25" splitType="Stretch">
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField" style="default" x="0" y="2" width="400" height="21" forecolor="#000000"/>
+				<reportElement key="textField" style="default" x="0" y="2" width="400" height="21" forecolor="#000000" uuid="55ccdcc7-0ca7-46f2-9589-1e22551f5f33"/>
 				<box>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<bottomPen lineWidth="0.0" lineColor="#000000"/>
@@ -108,10 +113,10 @@
 				<textElement>
 					<font fontName="DejaVu Sans"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[" " + $F{NAME}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[" " + $F{NAME}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement key="textField" style="default" x="400" y="2" width="82" height="21" forecolor="#000000"/>
+				<reportElement key="textField" style="default" x="400" y="2" width="82" height="21" forecolor="#000000" uuid="90ddfa19-f863-4262-9976-c6cf107357fc"/>
 				<box>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<bottomPen lineWidth="0.0" lineColor="#000000"/>
@@ -120,22 +125,22 @@
 				<textElement textAlignment="Right">
 					<font fontName="DejaVu Sans"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($F{TAXAMT}!=null)?$P{NUMBERFORMAT}.format($F{TAXAMT}):new String(" ")]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($F{TAXAMT}!=null)?$P{NUMBERFORMAT}.format($F{TAXAMT}):new String(" ")]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="310" y="2" width="82" height="21">
+				<reportElement x="310" y="2" width="82" height="21" uuid="8525c891-f941-46b2-b17a-e0961d272116">
 					<printWhenExpression><![CDATA[$P{ISTAXINCLUDED}.equals("Y")]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right">
 					<font fontName="DejaVu Sans" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($F{TAXBASEAMT}!=null)?$P{NUMBERFORMAT}.format($F{TAXBASEAMT}):new String(" ")]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($F{TAXBASEAMT}!=null)?$P{NUMBERFORMAT}.format($F{TAXBASEAMT}):new String(" ")]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement key="line-1" x="0" y="21" width="481" height="1" forecolor="#CCCCCC"/>
+				<reportElement key="line-1" x="0" y="21" width="481" height="1" forecolor="#CCCCCC" uuid="5bb162df-7f1c-4d40-b162-a2de010937df"/>
 			</line>
 			<line>
-				<reportElement key="line-2" style="Report_Footer" x="0" y="0" width="481" height="1" forecolor="#CCCCCC"/>
+				<reportElement key="line-2" style="Report_Footer" x="0" y="0" width="481" height="1" forecolor="#CCCCCC" uuid="50b755b0-5555-4db7-916f-1f0465851640"/>
 			</line>
 		</band>
 	</detail>
diff --git a/src/org/openbravo/kikobar/intfactsunat/RptC_Invoice_new.jrxml b/src/org/openbravo/kikobar/intfactsunat/RptC_Invoice_new.jrxml
index 7bd21ce..56f963d 100755
--- a/src/org/openbravo/kikobar/intfactsunat/RptC_Invoice_new.jrxml
+++ b/src/org/openbravo/kikobar/intfactsunat/RptC_Invoice_new.jrxml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.0.0.final using JasperReports Library version 6.0.0  -->
-<!-- 2019-02-03T01:13:22 -->
+<!-- Created with Jaspersoft Studio version 6.6.0.final using JasperReports Library version 6.0.0  -->
 <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="RptC_Invoice_new" pageWidth="595" pageHeight="842" columnWidth="483" leftMargin="56" rightMargin="56" topMargin="56" bottomMargin="56" uuid="797247bc-122a-44aa-9a9b-1c9a52ea55bf">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="52"/>
 	<property name="ireport.y" value="207"/>
 	<property name="ireport.scriptlethandling" value="0"/>
 	<property name="ireport.encoding" value="UTF-8"/>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="devel-server.xml"/>
+	<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
+	<property name="com.jaspersoft.studio.data.sql.SQLQueryDesigner.sash.w1" value="205"/>
+	<property name="com.jaspersoft.studio.data.sql.SQLQueryDesigner.sash.w2" value="790"/>
 	<import value="net.sf.jasperreports.engine.*"/>
 	<import value="java.util.*"/>
 	<import value="net.sf.jasperreports.engine.data.*"/>
@@ -32,7 +35,7 @@
 	<style name="Group_Footer" fontName="Bitstream Vera Sans" fontSize="11" isBold="true"/>
 	<style name="Report_Footer" isDefault="true" vAlign="Middle" fontName="Bitstream Vera Sans" fontSize="11"/>
 	<parameter name="DOCUMENT_ID" class="java.lang.String">
-		<defaultValueExpression><![CDATA["'1000032'"]]></defaultValueExpression>
+		<defaultValueExpression><![CDATA["56357F2346EA49DE99C0561470FBF305"]]></defaultValueExpression>
 	</parameter>
 	<parameter name="DOCUMENT_NAME" class="java.lang.String" isForPrompting="false">
 		<defaultValueExpression><![CDATA["'INVOICE'"]]></defaultValueExpression>
@@ -46,10 +49,10 @@
 		<defaultValueExpression><![CDATA["en_US"]]></defaultValueExpression>
 	</parameter>
 	<parameter name="USER_CLIENT" class="java.lang.String" isForPrompting="false">
-		<defaultValueExpression><![CDATA["('1000000)"]]></defaultValueExpression>
+		<defaultValueExpression><![CDATA["'7B75C13C21B945AB9DA2B32DD993FE70'"]]></defaultValueExpression>
 	</parameter>
 	<parameter name="USER_ORG" class="java.lang.String" isForPrompting="false">
-		<defaultValueExpression><![CDATA["('0')"]]></defaultValueExpression>
+		<defaultValueExpression><![CDATA["'B2D9921403FB4D239382A2C8B38ECE16'"]]></defaultValueExpression>
 	</parameter>
 	<parameter name="REPORT_TITLE" class="java.lang.String" isForPrompting="false">
 		<defaultValueExpression><![CDATA["REPORT TITLE"]]></defaultValueExpression>
@@ -90,7 +93,7 @@ FROM C_INVOICE LEFT JOIN C_BPARTNER ON C_INVOICE.C_BPARTNER_ID = C_BPARTNER.C_BP
 AD_ORGINFO, AD_CLIENT, AD_ORG, M_PRICELIST
 WHERE C_INVOICE.ad_client_id = AD_CLIENT.ad_client_id
 AND C_INVOICE.M_PRICELIST_ID = M_PRICELIST.M_PRICELIST_ID
-AND C_INVOICE.C_INVOICE_ID IN ($P{DOCUMENT_ID})
+AND C_INVOICE.C_INVOICE_ID in ($P{DOCUMENT_ID})
 AND AD_ORG.ad_org_id = AD_ORGINFO.ad_org_id
 AND AD_ORG.ad_org_id = (SELECT o.AD_ORG_ID
                         FROM AD_ORG o JOIN AD_OrgType t USING (AD_ORGTYPE_ID)