diff --git a/src/org/openbravo/kikobar/intfactsunat/RptC_Invoice_Lines_new.jrxml b/src/org/openbravo/kikobar/intfactsunat/RptC_Invoice_Lines_new.jrxml
deleted file mode 100755
index a67b093..0000000
--- a/src/org/openbravo/kikobar/intfactsunat/RptC_Invoice_Lines_new.jrxml
+++ /dev/null
@@ -1,362 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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.*"/>
-	<style name="default" vAlign="Middle" fontName="Bitstream Vera Sans" fontSize="8"/>
-	<style name="Report_Title" fontName="Bitstream Vera Sans" fontSize="18"/>
-	<style name="Report_Subtitle" forecolor="#555555" fontName="Bitstream Vera Sans" fontSize="14"/>
-	<style name="Report_Data_Label" fontName="Bitstream Vera Sans" fontSize="11" isBold="true"/>
-	<style name="Report_Data_Field" fontName="Bitstream Vera Sans" fontSize="11" isBold="false"/>
-	<style name="Total_Field" mode="Opaque" forecolor="#000000" backcolor="#CCCCCC" vAlign="Middle" fontName="Bitstream Vera Sans" fontSize="11" isBold="true"/>
-	<style name="GroupHeader_DarkGray" mode="Opaque" forecolor="#FFFFFF" backcolor="#555555" vAlign="Middle" fontName="Bitstream Vera Sans" fontSize="12" isBold="true"/>
-	<style name="Group_Data_Label" fontName="Bitstream Vera Sans" fontSize="11" isBold="true"/>
-	<style name="Group_Data_Field" fontName="Bitstream Vera Sans" fontSize="11"/>
-	<style name="Detail_Header" mode="Opaque" forecolor="#FFFFFF" backcolor="#5D5D5D" vAlign="Middle" fontName="Bitstream Vera Sans" fontSize="10" isBold="true"/>
-	<style name="Detail_Line" fontName="Bitstream Vera Sans" fontSize="8">
-		<conditionalStyle>
-			<conditionExpression><![CDATA[new Boolean($V{REPORT_COUNT}.intValue()%2==0)]]></conditionExpression>
-			<style mode="Opaque" backcolor="#CCCCCC"/>
-		</conditionalStyle>
-	</style>
-	<style name="Total_Gray" mode="Opaque" forecolor="#000000" backcolor="#CCCCCC"/>
-	<style name="Detail_Data_Label" mode="Opaque" backcolor="#CCCCCC" fontName="Bitstream Vera Sans" fontSize="10" isBold="true"/>
-	<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">
-		<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"/>
-	<queryString>
-		<![CDATA[SELECT C_INVOICE.C_INVOICE_ID, COALESCE(M_PRODUCT.NAME, COALESCE(C_GLITEM.NAME, C_INVOICELINE.DESCRIPTION)) AS NAME_PRODUCT, C_INVOICELINE.QTYINVOICED,
-     C_UOM.NAME AS UOMNAME, C_INVOICELINE.DESCRIPTION,
-        CASE WHEN $P{ISTAXINCLUDED}='Y' THEN C_INVOICELINE.LINE_GROSS_AMOUNT ELSE C_INVOICELINE.LINENETAMT END AS LINENETAMT,
-        CASE WHEN $P{ISTAXINCLUDED}='Y' THEN C_INVOICELINE.GROSS_UNIT_PRICE ELSE C_INVOICELINE.PRICEACTUAL END AS PRICEACTUAL,
-        M_INOUT.DOCUMENTNO AS INOUTNO, C_ORDER.DOCUMENTNO AS ORDERNO, M_PRODUCT.VALUE AS REFERENCE
-        FROM C_INVOICELINE left join M_PRODUCT on C_INVOICELINE.M_PRODUCT_ID = M_PRODUCT.M_PRODUCT_ID
-                           left join C_UOM on C_INVOICELINE.C_UOM_ID = C_UOM.C_UOM_ID
-                           left join M_INOUTLINE on  M_INOUTLINE.M_INOUTLINE_ID = C_INVOICELINE.M_INOUTLINE_ID
-                           left join M_INOUT on M_INOUTLINE.M_INOUT_ID = M_INOUT.M_INOUT_ID
-                           left join C_ORDERLINE on C_ORDERLINE.C_ORDERLINE_ID = C_INVOICELINE.C_ORDERLINE_ID
-                           left join C_ORDER on C_ORDERLINE.C_ORDER_ID = C_ORDER.C_ORDER_ID
-                           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_INVOICELINE.C_INVOICE_ID = $P{C_INVOICE_ID}
-        ORDER BY C_INVOICELINE.LINE]]>
-	</queryString>
-	<field name="C_INVOICE_ID" class="java.lang.String"/>
-	<field name="NAME_PRODUCT" class="java.lang.String"/>
-	<field name="QTYINVOICED" class="java.math.BigDecimal"/>
-	<field name="UOMNAME" class="java.lang.String"/>
-	<field name="DESCRIPTION" class="java.lang.String"/>
-	<field name="LINENETAMT" class="java.math.BigDecimal"/>
-	<field name="PRICEACTUAL" class="java.math.BigDecimal"/>
-	<field name="INOUTNO" class="java.lang.String"/>
-	<field name="ORDERNO" class="java.lang.String"/>
-	<field name="REFERENCE" class="java.lang.String"/>
-	<variable name="TOTAL_LINENETAMT" class="java.math.BigDecimal" resetType="Group" resetGroup="C_INVOICE_ID" calculation="Sum">
-		<variableExpression><![CDATA[$F{LINENETAMT}]]></variableExpression>
-	</variable>
-	<group name="C_INVOICE_ID" isResetPageNumber="true">
-		<groupExpression><![CDATA[$F{C_INVOICE_ID}]]></groupExpression>
-		<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" 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"/>
-						<bottomPen lineWidth="0.0" lineColor="#000000"/>
-						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					</box>
-					<textElement>
-						<font fontName="DejaVu Sans" isBold="true"/>
-					</textElement>
-					<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" 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"/>
-						<bottomPen lineWidth="0.0" lineColor="#000000"/>
-						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					</box>
-					<textElement>
-						<font fontName="DejaVu Sans" isBold="true"/>
-					</textElement>
-					<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" 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"/>
-						<bottomPen lineWidth="0.0" lineColor="#000000"/>
-						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					</box>
-					<textElement>
-						<font fontName="DejaVu Sans" isBold="true"/>
-					</textElement>
-					<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" 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"/>
-						<bottomPen lineWidth="0.0" lineColor="#000000"/>
-						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					</box>
-					<textElement textAlignment="Right">
-						<font fontName="DejaVu Sans" isBold="true" pdfFontName="Helvetica"/>
-					</textElement>
-					<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" 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" 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" uuid="2fb538b5-a2bd-4cbb-bdc9-c0ac6af56cb0"/>
-					<graphicElement>
-						<pen lineWidth="2.0" lineStyle="Double" lineColor="#A3A1A1"/>
-					</graphicElement>
-				</line>
-			</band>
-		</groupHeader>
-		<groupFooter>
-			<band height="39" splitType="Stretch">
-				<staticText>
-					<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">
-						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<bottomPen lineWidth="0.0" lineColor="#000000"/>
-						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					</box>
-					<textElement textAlignment="Right">
-						<font fontName="DejaVu Sans" size="12" isBold="true"/>
-					</textElement>
-					<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" uuid="f0d11fa4-b24c-42f8-aa61-65d52befba59">
-						<property name="net.sf.jasperreports.export.json.path" value="totalvalventa"/>
-					</reportElement>
-					<box leftPadding="2" rightPadding="2">
-						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<bottomPen lineWidth="0.0" lineColor="#000000"/>
-						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					</box>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font fontName="DejaVu Sans" isBold="true"/>
-					</textElement>
-					<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" uuid="d908f845-6dca-4285-bdac-5d02b452f9ce">
-						<printWhenExpression><![CDATA[$P{ISTAXINCLUDED}.equals("Y")]]></printWhenExpression>
-					</reportElement>
-					<box leftPadding="2" rightPadding="2">
-						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<bottomPen lineWidth="0.0" lineColor="#000000"/>
-						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					</box>
-					<textElement textAlignment="Left">
-						<font fontName="DejaVu Sans" size="12" isBold="true"/>
-					</textElement>
-					<text><![CDATA[Total]]></text>
-				</staticText>
-				<line>
-					<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>
-						<pen lineWidth="2.0"/>
-					</graphicElement>
-				</line>
-				<line>
-					<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>
-						<pen lineWidth="2.0"/>
-					</graphicElement>
-				</line>
-				<line>
-					<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>
-						<pen lineWidth="2.0"/>
-					</graphicElement>
-				</line>
-				<line>
-					<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>
-						<pen lineWidth="2.0"/>
-					</graphicElement>
-				</line>
-			</band>
-		</groupFooter>
-	</group>
-	<background>
-		<band splitType="Stretch"/>
-	</background>
-	<title>
-		<band splitType="Stretch"/>
-	</title>
-	<pageHeader>
-		<band splitType="Stretch"/>
-	</pageHeader>
-	<columnHeader>
-		<band splitType="Stretch"/>
-	</columnHeader>
-	<detail>
-		<band height="25">
-			<frame>
-				<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"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<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" uuid="14915d05-21be-4c9c-9494-bd120203fa3b">
-						<property name="net.sf.jasperreports.export.json.path" value="REFERENCE"/>
-					</reportElement>
-					<box leftPadding="2" rightPadding="2">
-						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<bottomPen lineWidth="0.0" lineColor="#000000"/>
-						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					</box>
-					<textElement verticalAlignment="Middle">
-						<font fontName="DejaVu Sans"/>
-					</textElement>
-					<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" uuid="9615b7ce-f5f2-4fd7-b213-215d1149e1f3">
-						<property name="net.sf.jasperreports.export.json.path" value="vventalinea"/>
-					</reportElement>
-					<box leftPadding="2" rightPadding="2">
-						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<bottomPen lineWidth="0.0" lineColor="#000000"/>
-						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					</box>
-					<textElement textAlignment="Right">
-						<font fontName="DejaVu Sans"/>
-					</textElement>
-					<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" uuid="e3d1b64a-712e-4676-880a-71e1831faaec">
-						<property name="net.sf.jasperreports.export.json.path" value="precio"/>
-					</reportElement>
-					<box leftPadding="2" rightPadding="2">
-						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<bottomPen lineWidth="0.0" lineColor="#000000"/>
-						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					</box>
-					<textElement textAlignment="Right">
-						<font fontName="DejaVu Sans"/>
-					</textElement>
-					<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" uuid="6cff317d-cc02-498f-8b7c-c354c2f3aa6e">
-						<property name="net.sf.jasperreports.export.json.path" value="cantidad"/>
-					</reportElement>
-					<box leftPadding="2" rightPadding="2">
-						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<bottomPen lineWidth="0.0" lineColor="#000000"/>
-						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					</box>
-					<textElement textAlignment="Right">
-						<font fontName="DejaVu Sans"/>
-					</textElement>
-					<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" uuid="347f68f2-4371-49ec-abb8-9c77288a4d66">
-						<property name="net.sf.jasperreports.export.json.path" value="UOMNAME"/>
-					</reportElement>
-					<box leftPadding="2" rightPadding="2">
-						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<bottomPen lineWidth="0.0" lineColor="#000000"/>
-						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					</box>
-					<textElement>
-						<font fontName="DejaVu Sans"/>
-					</textElement>
-					<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" uuid="1d556f94-fad4-4f31-92d1-967f6068f0cc">
-						<property name="net.sf.jasperreports.export.json.path" value="NAME_PRODUCT"/>
-					</reportElement>
-					<box leftPadding="2" rightPadding="2">
-						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<bottomPen lineWidth="0.0" lineColor="#000000"/>
-						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					</box>
-					<textElement verticalAlignment="Middle">
-						<font fontName="DejaVu Sans"/>
-					</textElement>
-					<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" uuid="bd68921a-0976-4cc4-99d4-6f5fca4b32be"/>
-				<graphicElement>
-					<pen lineWidth="1.0" lineStyle="Solid" lineColor="#A3A1A1"/>
-				</graphicElement>
-			</line>
-		</band>
-	</detail>
-	<columnFooter>
-		<band splitType="Stretch"/>
-	</columnFooter>
-	<pageFooter>
-		<band splitType="Stretch"/>
-	</pageFooter>
-	<summary>
-		<band splitType="Stretch"/>
-	</summary>
-</jasperReport>
diff --git a/src/org/openbravo/kikobar/intfactsunat/RptC_Invoice_TaxLines_new.jrxml b/src/org/openbravo/kikobar/intfactsunat/RptC_Invoice_TaxLines_new.jrxml
deleted file mode 100755
index 02a5635..0000000
--- a/src/org/openbravo/kikobar/intfactsunat/RptC_Invoice_TaxLines_new.jrxml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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.*"/>
-	<style name="default" vAlign="Middle" fontName="Bitstream Vera Sans" fontSize="8"/>
-	<style name="Report_Title" fontName="Bitstream Vera Sans" fontSize="18"/>
-	<style name="Report_Subtitle" forecolor="#555555" fontName="Bitstream Vera Sans" fontSize="14"/>
-	<style name="Report_Data_Label" fontName="Bitstream Vera Sans" fontSize="11" isBold="true"/>
-	<style name="Report_Data_Field" fontName="Bitstream Vera Sans" fontSize="11" isBold="false"/>
-	<style name="Total_Field" mode="Opaque" forecolor="#000000" backcolor="#CCCCCC" vAlign="Middle" fontName="Bitstream Vera Sans" fontSize="11" isBold="true"/>
-	<style name="GroupHeader_DarkGray" mode="Opaque" forecolor="#FFFFFF" backcolor="#555555" vAlign="Middle" fontName="Bitstream Vera Sans" fontSize="12" isBold="true"/>
-	<style name="Group_Data_Label" fontName="Bitstream Vera Sans" fontSize="11" isBold="true"/>
-	<style name="Group_Data_Field" fontName="Bitstream Vera Sans" fontSize="11"/>
-	<style name="Detail_Header" mode="Opaque" forecolor="#FFFFFF" backcolor="#5D5D5D" vAlign="Middle" fontName="Bitstream Vera Sans" fontSize="10" isBold="true"/>
-	<style name="Detail_Line" fontName="Bitstream Vera Sans" fontSize="8">
-		<conditionalStyle>
-			<conditionExpression><![CDATA[new Boolean($V{REPORT_COUNT}.intValue()%2==1)]]></conditionExpression>
-			<style mode="Opaque" backcolor="#CCCCCC"/>
-		</conditionalStyle>
-	</style>
-	<style name="Total_Gray" mode="Opaque" forecolor="#000000" backcolor="#CCCCCC"/>
-	<style name="Detail_Data_Label" mode="Opaque" backcolor="#CCCCCC" fontName="Bitstream Vera Sans" fontSize="10" isBold="true"/>
-	<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">
-		<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"/>
-	<parameter name="TOTAL_LINENET" class="java.math.BigDecimal"/>
-	<queryString>
-		<![CDATA[SELECT C_INVOICE_ID, C_TAX.NAME, C_INVOICETAX.TAXBASEAMT, C_INVOICETAX.TAXAMT
-        FROM C_INVOICETAX, C_TAX
-        WHERE C_INVOICETAX.C_TAX_ID = C_TAX.C_TAX_ID
-        AND C_INVOICETAX.C_INVOICE_ID = $P{C_INVOICE_ID}
-        ORDER BY C_INVOICETAX.LINE, C_TAX.RATE]]>
-	</queryString>
-	<field name="C_INVOICE_ID" class="java.lang.String"/>
-	<field name="NAME" class="java.lang.String"/>
-	<field name="TAXBASEAMT" class="java.math.BigDecimal"/>
-	<field name="TAXAMT" class="java.math.BigDecimal"/>
-	<variable name="TOTAL_TAXAMT" class="java.math.BigDecimal" calculation="Sum">
-		<variableExpression><![CDATA[$F{TAXAMT}]]></variableExpression>
-	</variable>
-	<group name="C_INVOICE_ID">
-		<groupExpression><![CDATA[$F{C_INVOICE_ID}]]></groupExpression>
-		<groupHeader>
-			<band splitType="Stretch"/>
-		</groupHeader>
-		<groupFooter>
-			<band height="5" splitType="Stretch"/>
-			<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" uuid="fd23e606-2e0c-4038-8f2d-92f447f2308b">
-						<property name="net.sf.jasperreports.export.json.path" value="totalineasimpuestos"/>
-					</reportElement>
-					<box>
-						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					</box>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font fontName="DejaVu Sans" size="10" isBold="true"/>
-					</textElement>
-					<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" 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" 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" uuid="f69d518c-3a81-4505-b750-026dd54c53f7"/>
-				</line>
-			</band>
-		</groupFooter>
-	</group>
-	<background>
-		<band splitType="Stretch"/>
-	</background>
-	<title>
-		<band splitType="Stretch"/>
-	</title>
-	<pageHeader>
-		<band splitType="Stretch"/>
-	</pageHeader>
-	<columnHeader>
-		<band splitType="Stretch"/>
-	</columnHeader>
-	<detail>
-		<band height="25" splitType="Stretch">
-			<textField isBlankWhenNull="false">
-				<reportElement key="textField" style="default" x="0" y="2" width="400" height="21" forecolor="#000000" uuid="55ccdcc7-0ca7-46f2-9589-1e22551f5f33">
-					<property name="net.sf.jasperreports.export.json.path" value="nombreimpuesto"/>
-				</reportElement>
-				<box>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-				</box>
-				<textElement>
-					<font fontName="DejaVu Sans"/>
-				</textElement>
-				<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" uuid="90ddfa19-f863-4262-9976-c6cf107357fc">
-					<property name="net.sf.jasperreports.export.json.path" value="impuesto"/>
-				</reportElement>
-				<box>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-				</box>
-				<textElement textAlignment="Right">
-					<font fontName="DejaVu Sans"/>
-				</textElement>
-				<textFieldExpression><![CDATA[($F{TAXAMT}!=null)?$P{NUMBERFORMAT}.format($F{TAXAMT}):new String(" ")]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="310" y="2" width="82" height="21" uuid="8525c891-f941-46b2-b17a-e0961d272116">
-					<property name="net.sf.jasperreports.export.json.path" value="baseimpuesto"/>
-					<printWhenExpression><![CDATA[$P{ISTAXINCLUDED}.equals("Y")]]></printWhenExpression>
-				</reportElement>
-				<textElement textAlignment="Right">
-					<font fontName="DejaVu Sans" size="8"/>
-				</textElement>
-				<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" 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" uuid="50b755b0-5555-4db7-916f-1f0465851640"/>
-			</line>
-		</band>
-	</detail>
-	<columnFooter>
-		<band splitType="Stretch"/>
-	</columnFooter>
-	<pageFooter>
-		<band splitType="Stretch"/>
-	</pageFooter>
-	<summary>
-		<band splitType="Stretch"/>
-	</summary>
-</jasperReport>
diff --git a/src/org/openbravo/kikobar/intfactsunat/RptC_Invoice_new.jrxml b/src/org/openbravo/kikobar/intfactsunat/RptC_Invoice_new.jrxml
deleted file mode 100755
index bde642c..0000000
--- a/src/org/openbravo/kikobar/intfactsunat/RptC_Invoice_new.jrxml
+++ /dev/null
@@ -1,573 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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.*"/>
-	<style name="default" vAlign="Middle" fontName="Bitstream Vera Sans" fontSize="8"/>
-	<style name="Report_Title" fontName="Bitstream Vera Sans" fontSize="18"/>
-	<style name="Report_Subtitle" forecolor="#555555" fontName="Bitstream Vera Sans" fontSize="14"/>
-	<style name="Report_Data_Label" fontName="Bitstream Vera Sans" fontSize="11" isBold="true"/>
-	<style name="Report_Data_Field" fontName="Bitstream Vera Sans" fontSize="11" isBold="false"/>
-	<style name="Total_Field" mode="Opaque" forecolor="#000000" backcolor="#CCCCCC" vAlign="Middle" fontName="Bitstream Vera Sans" fontSize="11" isBold="true"/>
-	<style name="GroupHeader_DarkGray" mode="Opaque" forecolor="#FFFFFF" backcolor="#555555" vAlign="Middle" fontName="Bitstream Vera Sans" fontSize="12" isBold="true"/>
-	<style name="Group_Data_Label" fontName="Bitstream Vera Sans" fontSize="11" isBold="true"/>
-	<style name="Group_Data_Field" fontName="Bitstream Vera Sans" fontSize="11"/>
-	<style name="Detail_Header" mode="Opaque" forecolor="#FFFFFF" backcolor="#5D5D5D" vAlign="Middle" fontName="Bitstream Vera Sans" fontSize="10" isBold="true"/>
-	<style name="Detail_Line" fontName="Bitstream Vera Sans" fontSize="8">
-		<conditionalStyle>
-			<conditionExpression><![CDATA[new Boolean($V{REPORT_COUNT}.intValue()%2==1)]]></conditionExpression>
-			<style mode="Opaque" backcolor="#CCCCCC"/>
-		</conditionalStyle>
-	</style>
-	<style name="Total_Gray" mode="Opaque" forecolor="#000000" backcolor="#CCCCCC"/>
-	<style name="Detail_Data_Label" mode="Opaque" backcolor="#CCCCCC" fontName="Bitstream Vera Sans" fontSize="10" isBold="true"/>
-	<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="DOCUMENT_ID" class="java.lang.String">
-		<defaultValueExpression><![CDATA["56357F2346EA49DE99C0561470FBF305"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="DOCUMENT_NAME" class="java.lang.String" isForPrompting="false">
-		<defaultValueExpression><![CDATA["'INVOICE'"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="ATTACH" class="java.lang.String" isForPrompting="false"/>
-	<parameter name="BASE_WEB" class="java.lang.String" isForPrompting="false"/>
-	<parameter name="BASE_DESIGN" class="java.lang.String" isForPrompting="false">
-		<defaultValueExpression><![CDATA["/home/openbravo/src/openbravo/erp/devel/bttCourse/pi/src"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="LANGUAGE" class="java.lang.String" isForPrompting="false">
-		<defaultValueExpression><![CDATA["en_US"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="USER_CLIENT" class="java.lang.String" isForPrompting="false">
-		<defaultValueExpression><![CDATA["'7B75C13C21B945AB9DA2B32DD993FE70'"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="USER_ORG" class="java.lang.String" isForPrompting="false">
-		<defaultValueExpression><![CDATA["'B2D9921403FB4D239382A2C8B38ECE16'"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="REPORT_TITLE" class="java.lang.String" isForPrompting="false">
-		<defaultValueExpression><![CDATA["REPORT TITLE"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="REPORT_SUBTITLE" class="java.lang.String" isForPrompting="false"/>
-	<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
-		<defaultValueExpression><![CDATA[$P{BASE_DESIGN}+"/org/openbravo/erpReports/"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="NUMBERFORMAT" class="java.text.DecimalFormat" isForPrompting="false"/>
-	<parameter name="LOCALE" class="java.util.Locale" isForPrompting="false"/>
-	<parameter name="SUBREP_RptC_Invoice_Lines_new" class="net.sf.jasperreports.engine.JasperReport" isForPrompting="false"/>
-	<parameter name="SUBREP_RptC_Invoice_TaxLines_new" class="net.sf.jasperreports.engine.JasperReport" isForPrompting="false"/>
-	<parameter name="SHOW_LOGO" class="java.lang.String"/>
-	<parameter name="SHOW_COMPANYDATA" class="java.lang.String" isForPrompting="false"/>
-	<parameter name="HEADER_MARGIN" class="java.lang.String"/>
-	<queryString>
-		<![CDATA[SELECT C_INVOICE.C_INVOICE_ID, C_BPARTNER.NAME, C_BPARTNER.TAXID AS CIF, AD_USER.NAME AS CONTACT_NAME, C_LOCATION.ADDRESS1,
-C_LOCATION.POSTAL, C_LOCATION.CITY, C_REGION.NAME AS REGION,C_COUNTRY.NAME AS COUNTRY,C_BPARTNER_LOCATION.PHONE AS PHONE, C_BPARTNER_LOCATION.FAX AS FAX,
-C_INVOICE.DATEINVOICED, C_INVOICE.DOCUMENTNO, C_BPARTNER.VALUE AS CODE_BPARTNER, C_INVOICE.C_DOCTYPE_ID, C_DOCTYPE.DOCBASETYPE,
-AD_CLIENT.DESCRIPTION AS ENTITY, C_Location_Description(AD_ORGINFO.C_LOCATION_ID) AS LOCATION, C_CURRENCY.ISO_CODE AS CURRENCY_CODE,C_CURRENCY.CURSYMBOL AS SYMBOL,
-C_PAYMENTTERM.NAME AS PAYTERM, AD_ORGINFO.ad_org_id AS ORGANIZATIONID, C_INVOICE.docstatus AS STATUS, AD_ORG.NAME AS ORG_NAME, COALESCE(AD_ORG.SOCIAL_NAME, AD_ORG.NAME) AS LEGAL_NAME, AD_ORGINFO.TAXID AS ORG_TAXID,
-C_BPARTNER.TAXID AS BP_TAXID, (COALESCE(TO_CHAR(AD_USER.NAME), '') || CASE WHEN AD_USER.NAME IS null THEN '' ELSE CHR(13) END || COALESCE(TO_CHAR(C_BPARTNER.TAXID), '') || CASE WHEN C_BPARTNER.TAXID IS null THEN '' ELSE CHR(13) END ||
-COALESCE(TO_CHAR(ADDRESS1), '') || CASE WHEN ADDRESS1 IS null THEN '' ELSE CHR(13) END || COALESCE(TO_CHAR(POSTAL), '') || CASE WHEN POSTAL IS null THEN '' ELSE CHR(13) END ||
-COALESCE(TO_CHAR(C_LOCATION.CITY), '') || CASE WHEN C_LOCATION.CITY IS null THEN '' ELSE CHR(13) END || COALESCE(TO_CHAR(C_COUNTRY.NAME), '') || CASE WHEN C_COUNTRY.NAME IS null THEN '' ELSE CHR(13) END ||
-COALESCE(TO_CHAR(C_BPARTNER_LOCATION.PHONE), '') || CASE WHEN C_BPARTNER_LOCATION.PHONE IS null THEN '' ELSE CHR(13) END || COALESCE(TO_CHAR(C_BPARTNER_LOCATION.FAX), '') ||
-CASE WHEN C_BPARTNER_LOCATION.FAX IS null THEN '' ELSE CHR(13) END) AS BP_DATA, $P{SHOW_LOGO} AS SHOWLOGO, $P{SHOW_COMPANYDATA} AS SHOWCOMPANYDATA, $P{HEADER_MARGIN} AS HEADERMARGIN, C_INVOICE.ISSOTRX,
-M_PRICELIST.ISTAXINCLUDED, C_INVOICE.ISCASHVAT
-FROM C_INVOICE LEFT JOIN C_BPARTNER ON C_INVOICE.C_BPARTNER_ID = C_BPARTNER.C_BPARTNER_ID
-	 LEFT JOIN AD_USER ON C_INVOICE.AD_USER_ID = AD_USER.AD_USER_ID
-	 LEFT JOIN C_BPARTNER_LOCATION ON C_INVOICE.C_BPARTNER_LOCATION_ID = C_BPARTNER_LOCATION.C_BPARTNER_LOCATION_ID
-	 LEFT JOIN C_LOCATION ON C_BPARTNER_LOCATION.C_LOCATION_ID = C_LOCATION.C_LOCATION_ID
-	 LEFT JOIN C_REGION ON C_LOCATION.C_REGION_ID = C_REGION.C_REGION_ID
-	 LEFT JOIN C_COUNTRY ON C_LOCATION.C_COUNTRY_ID = C_COUNTRY.C_COUNTRY_ID
-	 LEFT JOIN C_PAYMENTTERM ON C_INVOICE.C_PAYMENTTERM_ID = C_PAYMENTTERM.C_PAYMENTTERM_ID
-	 LEFT JOIN C_CURRENCY ON C_INVOICE.C_CURRENCY_ID = C_CURRENCY.C_CURRENCY_ID
-	 LEFT JOIN C_DOCTYPE ON C_INVOICE.C_DOCTYPE_ID = C_DOCTYPE.C_DOCTYPE_ID
-,
-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 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)
-                        WHERE AD_ISORGINCLUDED(C_INVOICE.AD_ORG_ID, o.ad_org_id, C_INVOICE.ad_client_id)<>-1
-                              AND (t.IsLegalEntity='Y' OR t.IsAcctLegalEntity='Y'))]]>
-	</queryString>
-	<field name="C_INVOICE_ID" class="java.lang.String"/>
-	<field name="NAME" class="java.lang.String"/>
-	<field name="CIF" class="java.lang.String"/>
-	<field name="CONTACT_NAME" class="java.lang.String"/>
-	<field name="ADDRESS1" class="java.lang.String"/>
-	<field name="POSTAL" class="java.lang.String"/>
-	<field name="CITY" class="java.lang.String"/>
-	<field name="REGION" class="java.lang.String"/>
-	<field name="COUNTRY" class="java.lang.String"/>
-	<field name="PHONE" class="java.lang.String"/>
-	<field name="FAX" class="java.lang.String"/>
-	<field name="DATEINVOICED" class="java.util.Date"/>
-	<field name="DOCUMENTNO" class="java.lang.String"/>
-	<field name="CODE_BPARTNER" class="java.lang.String"/>
-	<field name="ENTITY" class="java.lang.String"/>
-	<field name="LOCATION" class="java.lang.String"/>
-	<field name="CURRENCY_CODE" class="java.lang.String"/>
-	<field name="SYMBOL" class="java.lang.String"/>
-	<field name="PAYTERM" class="java.lang.String"/>
-	<field name="ORGANIZATIONID" class="java.lang.String"/>
-	<field name="STATUS" class="java.lang.String"/>
-	<field name="ORG_NAME" class="java.lang.String"/>
-	<field name="LEGAL_NAME" class="java.lang.String"/>
-	<field name="ORG_TAXID" class="java.lang.String"/>
-	<field name="BP_TAXID" class="java.lang.String"/>
-	<field name="BP_DATA" class="java.lang.String"/>
-	<field name="SHOWLOGO" class="java.lang.String"/>
-	<field name="SHOWCOMPANYDATA" class="java.lang.String"/>
-	<field name="HEADERMARGIN" class="java.lang.String"/>
-	<field name="ISSOTRX" class="java.lang.String"/>
-	<field name="ISTAXINCLUDED" class="java.lang.String"/>
-	<field name="ISCASHVAT" class="java.lang.String"/>
-	<field name="C_DOCTYPE_ID" class="java.lang.String"/>
-	<field name="DOCBASETYPE" class="java.lang.String"/>
-	<variable name="TOTAL_LINENETAMT" class="java.math.BigDecimal" resetType="Group" resetGroup="C_INVOICE_ID"/>
-	<variable name="TOTAL_TAXAMT" class="java.math.BigDecimal" resetType="Group" resetGroup="C_INVOICE_ID"/>
-	<variable name="SHOWLOGO" class="java.lang.String"/>
-	<variable name="SHOWCOMPANYDATA" class="java.lang.String"/>
-	<group name="PrintLarge" isReprintHeaderOnEachPage="true">
-		<groupExpression><![CDATA[]]></groupExpression>
-		<groupHeader>
-			<band height="120" splitType="Stretch">
-				<printWhenExpression><![CDATA[new Boolean($F{HEADERMARGIN}.equalsIgnoreCase("large"))]]></printWhenExpression>
-			</band>
-		</groupHeader>
-		<groupFooter>
-			<band splitType="Stretch"/>
-		</groupFooter>
-	</group>
-	<group name="PrintMedium" isReprintHeaderOnEachPage="true">
-		<groupExpression><![CDATA[]]></groupExpression>
-		<groupHeader>
-			<band height="80" splitType="Stretch">
-				<printWhenExpression><![CDATA[new Boolean($F{HEADERMARGIN}.equalsIgnoreCase("medium"))]]></printWhenExpression>
-			</band>
-		</groupHeader>
-		<groupFooter>
-			<band splitType="Stretch"/>
-		</groupFooter>
-	</group>
-	<group name="PrintSmall" isReprintHeaderOnEachPage="true">
-		<groupExpression><![CDATA[]]></groupExpression>
-		<groupHeader>
-			<band height="50" splitType="Stretch">
-				<printWhenExpression><![CDATA[new Boolean($F{HEADERMARGIN}.equalsIgnoreCase("small"))]]></printWhenExpression>
-			</band>
-		</groupHeader>
-		<groupFooter>
-			<band splitType="Stretch"/>
-		</groupFooter>
-	</group>
-	<group name="C_INVOICE_ID" isStartNewPage="true">
-		<groupExpression><![CDATA[$F{C_INVOICE_ID}]]></groupExpression>
-		<groupHeader>
-			<band height="255" splitType="Stretch">
-				<image scaleImage="RetainShape" hAlign="Right" vAlign="Top" isUsingCache="true">
-					<reportElement key="image-1" style="Report_Footer" x="0" y="13" width="153" height="78" uuid="bd9ac800-78f9-43af-b426-a5b5ea0d54c7">
-						<printWhenExpression><![CDATA[new Boolean($F{SHOWLOGO}.equalsIgnoreCase("Y"))]]></printWhenExpression>
-					</reportElement>
-					<box>
-						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<bottomPen lineWidth="0.0" lineColor="#000000"/>
-						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					</box>
-					<imageExpression><![CDATA[org.openbravo.erpCommon.utility.Utility.showImageLogo("yourcompanylegal", $F{ORGANIZATIONID})]]></imageExpression>
-				</image>
-				<textField isStretchWithOverflow="true" isBlankWhenNull="false">
-					<reportElement key="textField-9" style="Report_Footer" positionType="Float" x="314" y="51" width="168" height="27" isPrintWhenDetailOverflows="true" forecolor="#FF0000" uuid="6a600564-2f5b-434c-afd1-d603c8666608"/>
-					<box>
-						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<bottomPen lineWidth="0.0" lineColor="#000000"/>
-						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font fontName="DejaVu Sans" size="22"/>
-					</textElement>
-					<textFieldExpression><![CDATA[(($F{STATUS}.compareTo("VO")==0) ? "VOIDED" : " ")]]></textFieldExpression>
-				</textField>
-				<textField isBlankWhenNull="false">
-					<reportElement key="textField-14" x="1" y="137" width="234" height="103" isPrintWhenDetailOverflows="true" uuid="3a7bc047-80b7-44a6-b7d9-51da1c8a282f">
-						<property name="net.sf.jasperreports.export.json.path" value="NAME"/>
-					</reportElement>
-					<textElement verticalAlignment="Top">
-						<font fontName="DejaVu Sans" size="9" isBold="true"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{NAME} + "\n" + $F{BP_DATA}]]></textFieldExpression>
-				</textField>
-				<textField isBlankWhenNull="false">
-					<reportElement key="textField-15" style="Report_Footer" x="165" y="2" width="257" height="28" isPrintInFirstWholeBand="true" isPrintWhenDetailOverflows="true" uuid="60beddfb-c2bd-4ce7-9cb7-c7da5d2e9904">
-						<property name="net.sf.jasperreports.export.json.path" value="LEGAL_NAME"/>
-						<printWhenExpression><![CDATA[new Boolean($F{SHOWCOMPANYDATA}.equalsIgnoreCase("Y"))]]></printWhenExpression>
-					</reportElement>
-					<textElement verticalAlignment="Top">
-						<font fontName="DejaVu Sans" size="11" isBold="true"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{LEGAL_NAME}]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement key="staticText-15" style="Report_Footer" x="235" y="96" width="247" height="25" uuid="3f8512ce-5809-4d94-bb2e-fda86424552f">
-						<printWhenExpression><![CDATA[new Boolean($F{ISSOTRX}.equalsIgnoreCase("N") && !$F{DOCBASETYPE}.equalsIgnoreCase("APC"))]]></printWhenExpression>
-					</reportElement>
-					<textElement textAlignment="Right" verticalAlignment="Top">
-						<font fontName="DejaVu Sans" size="16"/>
-					</textElement>
-					<text><![CDATA[PURCHASE INVOICE]]></text>
-				</staticText>
-				<staticText>
-					<reportElement key="staticText-16" style="Report_Footer" x="235" y="96" width="247" height="25" uuid="330fcc32-1120-41db-86cd-de00ee3d3233">
-						<printWhenExpression><![CDATA[new Boolean($F{ISSOTRX}.equalsIgnoreCase("Y") && !$F{DOCBASETYPE}.equalsIgnoreCase("ARC"))]]></printWhenExpression>
-					</reportElement>
-					<textElement textAlignment="Right" verticalAlignment="Top">
-						<font fontName="DejaVu Sans" size="16"/>
-					</textElement>
-					<text><![CDATA[TAX INVOICE]]></text>
-				</staticText>
-				<staticText>
-					<reportElement key="staticText-8" style="Group_Data_Label" x="425" y="134" width="57" height="18" forecolor="#7E7979" backcolor="#FFFFFF" uuid="8bb4185f-0323-41d9-8e20-a478fed0c8de"/>
-					<box>
-						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<bottomPen lineWidth="0.0" lineColor="#000000"/>
-						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font fontName="DejaVu Sans" size="9" isBold="true" pdfFontName="Helvetica"/>
-					</textElement>
-					<text><![CDATA[Date]]></text>
-				</staticText>
-				<staticText>
-					<reportElement key="staticText-6" style="Group_Data_Label" x="290" y="134" width="72" height="18" forecolor="#7E7979" backcolor="#FFFFFF" uuid="d38f20da-e2b0-4872-bb19-69231544e9ba"/>
-					<box>
-						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<bottomPen lineWidth="0.0" lineColor="#000000"/>
-						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font fontName="DejaVu Sans" size="9"/>
-					</textElement>
-					<text><![CDATA[Document Nº]]></text>
-				</staticText>
-				<line direction="BottomUp">
-					<reportElement key="line-1" x="363" y="131" width="1" height="46" forecolor="#CCCCCC" uuid="743b301e-f80d-4d90-95a6-b0938fe79dd3"/>
-					<graphicElement>
-						<pen lineWidth="1.0" lineStyle="Solid" lineColor="#A3A1A1"/>
-					</graphicElement>
-				</line>
-				<textField isBlankWhenNull="false">
-					<reportElement key="textField-8" x="290" y="154" width="72" height="20" uuid="f391a639-3b9d-4cc5-bdac-d5fe86eb24b6">
-						<property name="net.sf.jasperreports.export.json.path" value="DOCUMENTNO"/>
-					</reportElement>
-					<box>
-						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<bottomPen lineWidth="0.0" lineColor="#000000"/>
-						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					</box>
-					<textElement textAlignment="Center">
-						<font fontName="DejaVu Sans" size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{DOCUMENTNO}]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement key="staticText-11" style="Group_Data_Label" x="365" y="134" width="57" height="18" forecolor="#7E7979" backcolor="#FFFFFF" uuid="950d7a00-2e51-40a0-b564-fc2a2758145c"/>
-					<box>
-						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<bottomPen lineWidth="0.0" lineColor="#000000"/>
-						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font fontName="DejaVu Sans" size="9" isBold="true" pdfFontName="Helvetica"/>
-					</textElement>
-					<text><![CDATA[Currency]]></text>
-				</staticText>
-				<line>
-					<reportElement key="line-1" x="1" y="130" width="482" height="1" forecolor="#CCCCCC" uuid="02862bd4-a148-4f6c-b669-966e01107ea0"/>
-					<graphicElement>
-						<pen lineWidth="1.0" lineStyle="Solid" lineColor="#A3A1A1"/>
-					</graphicElement>
-				</line>
-				<line direction="BottomUp">
-					<reportElement key="line-1" x="288" y="131" width="1" height="46" forecolor="#CCCCCC" uuid="fe5db7c0-ec3e-45d8-abdd-e6cc76a13dd4"/>
-					<graphicElement>
-						<pen lineWidth="1.0" lineStyle="Solid" lineColor="#A3A1A1"/>
-					</graphicElement>
-				</line>
-				<line>
-					<reportElement key="line-1" x="288" y="177" width="195" height="1" forecolor="#CCCCCC" uuid="9ceb279b-7567-43cb-9c79-6ff4ec61f3af"/>
-					<graphicElement>
-						<pen lineWidth="1.0" lineStyle="Solid" lineColor="#A3A1A1"/>
-					</graphicElement>
-				</line>
-				<textField isBlankWhenNull="false">
-					<reportElement key="textField-24" x="365" y="154" width="57" height="20" uuid="76fff310-3a18-48d2-8b7f-0c535f68c8c8">
-						<property name="net.sf.jasperreports.export.json.path" value="CURRENCY_CODE"/>
-					</reportElement>
-					<box>
-						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<bottomPen lineWidth="0.0" lineColor="#000000"/>
-						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					</box>
-					<textElement textAlignment="Center">
-						<font fontName="DejaVu Sans" size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{CURRENCY_CODE}]]></textFieldExpression>
-				</textField>
-				<line direction="BottomUp">
-					<reportElement key="line-1" x="483" y="131" width="1" height="46" forecolor="#CCCCCC" uuid="588f9d4a-3932-4767-b4b6-5e22c4117ffe"/>
-					<graphicElement>
-						<pen lineWidth="1.0" lineStyle="Solid" lineColor="#A3A1A1"/>
-					</graphicElement>
-				</line>
-				<line direction="BottomUp">
-					<reportElement key="line-1" x="423" y="131" width="1" height="46" forecolor="#CCCCCC" uuid="42a200ad-a915-48a1-9e5f-f3f66dc6802c"/>
-					<graphicElement>
-						<pen lineWidth="1.0" lineStyle="Solid" lineColor="#A3A1A1"/>
-					</graphicElement>
-				</line>
-				<textField isBlankWhenNull="false">
-					<reportElement key="textField" x="425" y="154" width="57" height="20" uuid="b035905d-ec1b-4a59-9607-bf1424cd5fcf">
-						<property name="net.sf.jasperreports.export.json.path" value="fecha"/>
-					</reportElement>
-					<box>
-						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-						<bottomPen lineWidth="0.0" lineColor="#000000"/>
-						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					</box>
-					<textElement textAlignment="Center">
-						<font fontName="DejaVu Sans" size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[org.openbravo.erpCommon.utility.Utility.applyCountryDateFormat($F{DATEINVOICED},$F{ORGANIZATIONID})]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement key="staticText-16" style="Report_Footer" x="235" y="96" width="247" height="25" uuid="26a02a41-7b58-44c6-8ca8-64f9322588c8">
-						<printWhenExpression><![CDATA[new Boolean($F{ISSOTRX}.equalsIgnoreCase("Y") && $F{DOCBASETYPE}.equalsIgnoreCase("ARC"))]]></printWhenExpression>
-					</reportElement>
-					<textElement textAlignment="Right" verticalAlignment="Top">
-						<font fontName="DejaVu Sans" size="16"/>
-					</textElement>
-					<text><![CDATA[CREDIT NOTE]]></text>
-				</staticText>
-				<staticText>
-					<reportElement key="staticText-15" style="Report_Footer" x="235" y="96" width="247" height="25" uuid="e33b9fb3-4c50-4c77-aaad-a5699f711908">
-						<printWhenExpression><![CDATA[new Boolean($F{ISSOTRX}.equalsIgnoreCase("N") && $F{DOCBASETYPE}.equalsIgnoreCase("APC"))]]></printWhenExpression>
-					</reportElement>
-					<textElement textAlignment="Right" verticalAlignment="Top">
-						<font fontName="DejaVu Sans" size="16"/>
-					</textElement>
-					<text><![CDATA[DEBIT NOTE]]></text>
-				</staticText>
-				<textField isBlankWhenNull="false">
-					<reportElement key="textField-15" style="Report_Footer" x="165" y="31" width="214" height="65" isPrintInFirstWholeBand="true" isPrintWhenDetailOverflows="true" uuid="d10fc70f-f842-4a68-ad83-461aaa5e0873">
-						<property name="net.sf.jasperreports.export.json.path" value="direccion"/>
-						<printWhenExpression><![CDATA[new Boolean($F{SHOWCOMPANYDATA}.equalsIgnoreCase("Y"))]]></printWhenExpression>
-					</reportElement>
-					<textElement verticalAlignment="Top">
-						<font fontName="DejaVu Sans" size="9"/>
-					</textElement>
-					<textFieldExpression><![CDATA[($F{LOCATION}==null ? $F{ORG_TAXID} + "\n" : $F{ORG_TAXID} + "\n" + $F{LOCATION})]]></textFieldExpression>
-				</textField>
-			</band>
-		</groupHeader>
-		<groupFooter>
-			<band splitType="Stretch"/>
-		</groupFooter>
-	</group>
-	<group name="tax" minHeightToStartNewPage="300">
-		<groupExpression><![CDATA[]]></groupExpression>
-		<groupHeader>
-			<band splitType="Stretch"/>
-		</groupHeader>
-		<groupFooter>
-			<band height="16" splitType="Stretch">
-				<subreport isUsingCache="true">
-					<reportElement key="subreport-2" style="Report_Footer" positionType="Float" x="0" y="0" width="482" height="16" uuid="56eeaa52-a444-4723-a6a7-fa7563c66134"/>
-					<subreportParameter name="NUMBERFORMAT">
-						<subreportParameterExpression><![CDATA[org.openbravo.erpCommon.utility.Utility.getCountryNumberFormat($F{ORGANIZATIONID},$P{NUMBERFORMAT})]]></subreportParameterExpression>
-					</subreportParameter>
-					<subreportParameter name="LOCALE">
-						<subreportParameterExpression><![CDATA[$P{LOCALE}]]></subreportParameterExpression>
-					</subreportParameter>
-					<subreportParameter name="ISTAXINCLUDED">
-						<subreportParameterExpression><![CDATA[$F{ISTAXINCLUDED}]]></subreportParameterExpression>
-					</subreportParameter>
-					<subreportParameter name="TOTAL_LINENET">
-						<subreportParameterExpression><![CDATA[$V{TOTAL_LINENETAMT}]]></subreportParameterExpression>
-					</subreportParameter>
-					<subreportParameter name="C_INVOICE_ID">
-						<subreportParameterExpression><![CDATA[$F{C_INVOICE_ID}]]></subreportParameterExpression>
-					</subreportParameter>
-					<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
-					<returnValue subreportVariable="TOTAL_TAXAMT" toVariable="TOTAL_TAXAMT"/>
-					<subreportExpression><![CDATA[$P{SUBREP_RptC_Invoice_TaxLines_new}]]></subreportExpression>
-				</subreport>
-			</band>
-		</groupFooter>
-	</group>
-	<background>
-		<band splitType="Stretch"/>
-	</background>
-	<title>
-		<band splitType="Stretch"/>
-	</title>
-	<pageHeader>
-		<band splitType="Stretch"/>
-	</pageHeader>
-	<columnHeader>
-		<band splitType="Stretch"/>
-	</columnHeader>
-	<detail>
-		<band height="27" splitType="Stretch">
-			<subreport isUsingCache="true">
-				<reportElement key="subreport-3" style="Report_Footer" x="0" y="0" width="482" height="16" uuid="19ca1311-07c7-4ab8-8651-fc2ed87b88a6"/>
-				<subreportParameter name="NUMBERFORMAT">
-					<subreportParameterExpression><![CDATA[org.openbravo.erpCommon.utility.Utility.getCountryNumberFormat($F{ORGANIZATIONID},$P{NUMBERFORMAT})]]></subreportParameterExpression>
-				</subreportParameter>
-				<subreportParameter name="LOCALE">
-					<subreportParameterExpression><![CDATA[$P{LOCALE}]]></subreportParameterExpression>
-				</subreportParameter>
-				<subreportParameter name="ISTAXINCLUDED">
-					<subreportParameterExpression><![CDATA[$F{ISTAXINCLUDED}]]></subreportParameterExpression>
-				</subreportParameter>
-				<subreportParameter name="C_INVOICE_ID">
-					<subreportParameterExpression><![CDATA[$F{C_INVOICE_ID}]]></subreportParameterExpression>
-				</subreportParameter>
-				<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
-				<returnValue subreportVariable="TOTAL_LINENETAMT" toVariable="TOTAL_LINENETAMT"/>
-				<subreportExpression><![CDATA[$P{SUBREP_RptC_Invoice_Lines_new}]]></subreportExpression>
-			</subreport>
-		</band>
-	</detail>
-	<columnFooter>
-		<band splitType="Stretch"/>
-	</columnFooter>
-	<pageFooter>
-		<band height="104" splitType="Stretch">
-			<staticText>
-				<reportElement key="staticText-9" style="default" x="304" y="3" width="171" height="32" forecolor="#7E7979" uuid="138ef7c4-052d-4855-a90e-308d35e85a6a"/>
-				<box leftPadding="2">
-					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-				</box>
-				<textElement textAlignment="Left">
-					<font fontName="DejaVu Sans" size="9" isBold="true"/>
-				</textElement>
-				<text><![CDATA[Payment Terms]]></text>
-			</staticText>
-			<line>
-				<reportElement key="line-3" style="default" x="0" y="4" width="483" height="1" forecolor="#CCCCCC" uuid="e8cd20e5-1411-4b21-a730-0e5de45124f7"/>
-				<graphicElement>
-					<pen lineWidth="2.0" lineStyle="Solid"/>
-				</graphicElement>
-			</line>
-			<textField isStretchWithOverflow="true" isBlankWhenNull="false">
-				<reportElement key="textField-22" x="308" y="37" width="167" height="22" isPrintWhenDetailOverflows="true" uuid="0f746ec3-0fe1-4d2c-b505-d35cc0bc0bd3"/>
-				<textElement>
-					<font fontName="DejaVu Sans" size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{PAYTERM}]]></textFieldExpression>
-			</textField>
-			<textField evaluationTime="Report" pattern="" isBlankWhenNull="false">
-				<reportElement key="textField-9" x="439" y="82" width="36" height="19" forecolor="#000000" backcolor="#FFFFFF" uuid="78bfc753-6f05-419c-bae9-11dbc57c4949"/>
-				<box>
-					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-				</box>
-				<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None">
-					<font fontName="DejaVu Sans" size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfFontName="Helvetica" pdfEncoding="CP1252" isPdfEmbedded="false"/>
-					<paragraph lineSpacing="Single"/>
-				</textElement>
-				<textFieldExpression><![CDATA["" + $V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
-			<textField pattern="" isBlankWhenNull="false">
-				<reportElement key="textField-10" x="340" y="82" width="95" height="19" uuid="7e3c4027-0d44-4434-bd51-ecbee25e9b8b"/>
-				<box>
-					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-				</box>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font fontName="DejaVu Sans" size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA["Page " + $V{PAGE_NUMBER} + " of "]]></textFieldExpression>
-			</textField>
-			<line>
-				<reportElement key="line-2" x="0" y="79" width="483" height="1" forecolor="#CCCCCC" uuid="f1a7d93c-3853-44d8-86cd-da01a251b22b"/>
-				<graphicElement>
-					<pen lineWidth="0.25" lineStyle="Solid"/>
-				</graphicElement>
-			</line>
-			<staticText>
-				<reportElement key="staticText" x="1" y="63" width="307" height="19" uuid="b981687d-b2f1-4fff-b087-4b85b45da10b">
-					<printWhenExpression><![CDATA["Y".equals($F{ISCASHVAT})]]></printWhenExpression>
-				</reportElement>
-				<textElement>
-					<font fontName="DejaVu Sans" size="8"/>
-				</textElement>
-				<text><![CDATA[Cash VAT Invoice]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="0" y="7" width="300" height="58" uuid="8fbeb87d-b387-466d-ade5-5f7262091bdd">
-					<printWhenExpression><![CDATA[new Boolean($F{ISSOTRX}.equalsIgnoreCase("Y") && !$F{DOCBASETYPE}.equalsIgnoreCase("ARC"))]]></printWhenExpression>
-				</reportElement>
-				<textElement>
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA["- Cheques should be crossed and made payable to: '"+$F{LEGAL_NAME}+"'."+"\n"+"- Please write the Invoice Number at the back of the cheque."+"\n"+"- Interest of 1% per month will be charged on overdue accounts."+"\n"+"- This is a computer generated document. No signature is required."]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="0" y="7" width="300" height="58" uuid="2940f761-be7d-4564-ba2b-6f573f920475">
-					<printWhenExpression><![CDATA[new Boolean($F{ISSOTRX}.equalsIgnoreCase("N") && $F{DOCBASETYPE}.equalsIgnoreCase("APC"))]]></printWhenExpression>
-				</reportElement>
-				<textElement>
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA["- Cheques should be crossed and made payable to: '"+$F{LEGAL_NAME}+"'."+"\n"+"- Please write the Invoice Number at the back of the cheque."+"\n"+"- Interest of 1% per month will be charged on overdue accounts."+"\n"+"- This is a computer generated document. No signature is required."]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="1" y="7" width="300" height="58" uuid="09b75db3-2d0a-45e1-9be6-9b6b81781366">
-					<printWhenExpression><![CDATA[new Boolean($F{ISSOTRX}.equalsIgnoreCase("N") && !$F{DOCBASETYPE}.equalsIgnoreCase("APC"))]]></printWhenExpression>
-				</reportElement>
-				<textElement>
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA["- This is a computer generated document. No signature is required."]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="2" y="7" width="300" height="58" uuid="1348fd41-1c7a-4d9d-87db-e6478bc398cd">
-					<printWhenExpression><![CDATA[new Boolean($F{ISSOTRX}.equalsIgnoreCase("Y") && $F{DOCBASETYPE}.equalsIgnoreCase("ARC"))]]></printWhenExpression>
-				</reportElement>
-				<textElement>
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA["- This is a computer generated document. No signature is required."]]></textFieldExpression>
-			</textField>
-		</band>
-	</pageFooter>
-	<summary>
-		<band splitType="Stretch"/>
-	</summary>
-</jasperReport>