bug fix note in sales order

1 files changed, 11 insertions, 14 deletions

diff --git a/jasper_reports/custom_reports/sales_without_disc.jrxml b/jasper_reports/custom_reports/sales_without_disc.jrxml
index 9f256e5..d902a12 100755
--- a/jasper_reports/custom_reports/sales_without_disc.jrxml
+++ b/jasper_reports/custom_reports/sales_without_disc.jrxml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Jaspersoft Studio version 6.20.0.final using JasperReports Library version 6.20.0-2bc7ab61c56f459e8176eb05c7705e145cd400ad  -->
 <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="sales_without_disc" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="5569a288-a46f-49ec-91b2-f60f77ccdd63">
-	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="Sale Order Dev XML"/>
 	<property name="com.jaspersoft.studio.data.sql.SQLQueryDesigner.sash.w1" value="261"/>
 	<property name="com.jaspersoft.studio.data.sql.SQLQueryDesigner.sash.w2" value="733"/>
 	<property name="ODOO_RELATIONS">
 		<![CDATA[['order_line']]]>
 	</property>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="Sales Order"/>
 	<queryString language="XPath">
 		<![CDATA[/data/record]]>
 	</queryString>
@@ -122,6 +122,10 @@
 		<property name="net.sf.jasperreports.xpath.field.expression" value="Payment_Terms-payment_term_id/Payment_Terms-name"/>
 		<fieldDescription><![CDATA[Payment_Terms-payment_term_id/Payment_Terms-name]]></fieldDescription>
 	</field>
+	<field name="Terms_and_conditions-note" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="Terms_and_conditions-note"/>
+		<fieldDescription><![CDATA[Terms_and_conditions-note]]></fieldDescription>
+	</field>
 	<variable name="UnitPrice" class="java.math.BigDecimal">
 		<variableExpression><![CDATA[$F{Included_in_Price-price_include}=="True"
 	?$F{pricewithtax}.equals("")?new BigDecimal("0"):new BigDecimal($F{pricewithtax})
@@ -213,7 +217,7 @@ Indonesia]]></text>
 				<reportElement x="280" y="20" width="275" height="40" uuid="7e7d81ad-fb57-4528-bbd2-88f4d15f3ccc"/>
 				<textFieldExpression><![CDATA[$F{Street-street}]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField isBlankWhenNull="true">
 				<reportElement x="280" y="0" width="275" height="20" uuid="f5c9f6ff-5207-4521-8418-7bb0b0058add"/>
 				<textFieldExpression><![CDATA[$V{customer_name}]]></textFieldExpression>
 			</textField>
@@ -393,20 +397,13 @@ Indonesia]]></text>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$V{Total}]]></textFieldExpression>
 			</textField>
-			<staticText>
-				<reportElement x="0" y="60" width="555" height="99" uuid="f561a33c-50e8-4bfb-b0b3-f4d1628d6bb7"/>
-				<textElement verticalAlignment="Middle">
+			<textField>
+				<reportElement x="0" y="60" width="555" height="99" uuid="9ba61388-f101-473a-89f4-e64b5a767c83"/>
+				<textElement>
 					<font size="8"/>
 				</textElement>
-				<text><![CDATA[1. Kirimkan Data NPWP & SPPKP pada saat pertama kali melakukan pemesanan ke finance@indoteknik.co.id

-2. Penawaran ini memiliki jangka waktu, harga, dan stock tidak mengikat

-3. Pembelian tidak dapat dikembalikan

-

-Data Bank PT. INDOTEKNIK DOTCOM GEMILANG

-BCA CAB. PURI BOTANICAL Acc. No. 8870 4000 81

-Pembayaran giro/cek dinyatakan lunas hanya setelah pencairan

-Biaya administrasi bank dibebankan ke konsumen]]></text>
-			</staticText>
+				<textFieldExpression><![CDATA[$F{Terms_and_conditions-note}]]></textFieldExpression>
+			</textField>
 		</band>
 	</summary>
 </jasperReport>