bug fix empty line in so

2 files changed, 40 insertions, 38 deletions

diff --git a/jasper_reports/custom_reports/proforma_invoice.jrxml b/jasper_reports/custom_reports/proforma_invoice.jrxml
index 3ee83a1..5190896 100755
--- a/jasper_reports/custom_reports/proforma_invoice.jrxml
+++ b/jasper_reports/custom_reports/proforma_invoice.jrxml
@@ -114,11 +114,19 @@
 		<property name="net.sf.jasperreports.xpath.field.expression" value="Customer-partner_id/Parent_name-parent_name"/>
 		<fieldDescription><![CDATA[Customer-partner_id/Parent_name-parent_name]]></fieldDescription>
 	</field>
+	<field name="Description-orderline" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="Order_Lines-order_line/Description-name"/>
+		<fieldDescription><![CDATA[Order_Lines-order_line/Description-name]]></fieldDescription>
+	</field>
 	<variable name="UnitPrice" class="java.math.BigDecimal">
-		<variableExpression><![CDATA[$F{Included_in_Price-price_include}=="True"?new BigDecimal($F{pricewithtax}):new BigDecimal($F{pricewithouttax})]]></variableExpression>
+		<variableExpression><![CDATA[$F{Included_in_Price-price_include}=="True"
+	?$F{pricewithtax}.equals("")?new BigDecimal("0"):new BigDecimal($F{pricewithtax})
+	:$F{pricewithouttax}.equals("")?new BigDecimal("0"):new BigDecimal($F{pricewithouttax})]]></variableExpression>
 	</variable>
 	<variable name="Amount" class="java.math.BigDecimal">
-		<variableExpression><![CDATA[$F{Included_in_Price-price_include}=="True"?new BigDecimal($F{Total-price_total}):new BigDecimal($F{Subtotal-price_subtotal})]]></variableExpression>
+		<variableExpression><![CDATA[$F{Included_in_Price-price_include}=="True"
+	?$F{Total-price_total}.equals("")?new BigDecimal("0"):new BigDecimal($F{Total-price_total})
+	:$F{Subtotal-price_subtotal}.equals("")?new BigDecimal("0"):new BigDecimal($F{Subtotal-price_subtotal})]]></variableExpression>
 	</variable>
 	<variable name="Total" class="java.math.BigDecimal">
 		<variableExpression><![CDATA[new BigDecimal($F{Total-amount_total})]]></variableExpression>
@@ -257,23 +265,7 @@ Indonesia]]></text>
 	</columnHeader>
 	<detail>
 		<band height="20" splitType="Stretch">
-			<textField>
-				<reportElement x="0" y="0" width="265" height="20" uuid="a0af1b59-8f1c-496a-b6ce-84fcd8b694ea">
-					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="a14cd5e1-8456-4ddb-9362-01aa96837ebc"/>
-				</reportElement>
-				<box>
-					<pen lineWidth="0.0"/>
-					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-				</box>
-				<textElement verticalAlignment="Middle" markup="none">
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{productdisplayname}]]></textFieldExpression>
-			</textField>
-			<textField>
+			<textField isBlankWhenNull="true">
 				<reportElement x="265" y="0" width="40" height="20" uuid="9ea04257-114c-4a32-a57c-825bff2fb289">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="a799cdde-15df-4f44-a5d1-e148a3ec898b"/>
 				</reportElement>
@@ -325,6 +317,15 @@ Indonesia]]></text>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$V{Amount}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement x="0" y="0" width="265" height="20" uuid="33c8dc87-4428-4535-9dc0-113385409a3d">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="1539fbdd-77c7-45fe-b8ea-5a6e33af620d"/>
+				</reportElement>
+				<textElement verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{Description-orderline}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<summary>
diff --git a/jasper_reports/custom_reports/sales_without_disc.jrxml b/jasper_reports/custom_reports/sales_without_disc.jrxml
index a897ab7..2e99453 100755
--- a/jasper_reports/custom_reports/sales_without_disc.jrxml
+++ b/jasper_reports/custom_reports/sales_without_disc.jrxml
@@ -114,11 +114,19 @@
 		<property name="net.sf.jasperreports.xpath.field.expression" value="Customer-partner_id/Parent_name-parent_name"/>
 		<fieldDescription><![CDATA[Customer-partner_id/Parent_name-parent_name]]></fieldDescription>
 	</field>
+	<field name="Description-orderline" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="Order_Lines-order_line/Description-name"/>
+		<fieldDescription><![CDATA[Order_Lines-order_line/Description-name]]></fieldDescription>
+	</field>
 	<variable name="UnitPrice" class="java.math.BigDecimal">
-		<variableExpression><![CDATA[$F{Included_in_Price-price_include}=="True"?new BigDecimal($F{pricewithtax}):new BigDecimal($F{pricewithouttax})]]></variableExpression>
+		<variableExpression><![CDATA[$F{Included_in_Price-price_include}=="True"
+	?$F{pricewithtax}.equals("")?new BigDecimal("0"):new BigDecimal($F{pricewithtax})
+	:$F{pricewithouttax}.equals("")?new BigDecimal("0"):new BigDecimal($F{pricewithouttax})]]></variableExpression>
 	</variable>
 	<variable name="Amount" class="java.math.BigDecimal">
-		<variableExpression><![CDATA[$F{Included_in_Price-price_include}=="True"?new BigDecimal($F{Total-price_total}):new BigDecimal($F{Subtotal-price_subtotal})]]></variableExpression>
+		<variableExpression><![CDATA[$F{Included_in_Price-price_include}=="True"
+	?$F{Total-price_total}.equals("")?new BigDecimal("0"):new BigDecimal($F{Total-price_total})
+	:$F{Subtotal-price_subtotal}.equals("")?new BigDecimal("0"):new BigDecimal($F{Subtotal-price_subtotal})]]></variableExpression>
 	</variable>
 	<variable name="Total" class="java.math.BigDecimal">
 		<variableExpression><![CDATA[new BigDecimal($F{Total-amount_total})]]></variableExpression>
@@ -257,23 +265,7 @@ Indonesia]]></text>
 	</columnHeader>
 	<detail>
 		<band height="20" splitType="Stretch">
-			<textField>
-				<reportElement x="0" y="0" width="265" height="20" uuid="a0af1b59-8f1c-496a-b6ce-84fcd8b694ea">
-					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="a14cd5e1-8456-4ddb-9362-01aa96837ebc"/>
-				</reportElement>
-				<box>
-					<pen lineWidth="0.0"/>
-					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-				</box>
-				<textElement verticalAlignment="Middle" markup="none">
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{productdisplayname}]]></textFieldExpression>
-			</textField>
-			<textField>
+			<textField isBlankWhenNull="true">
 				<reportElement x="265" y="0" width="40" height="20" uuid="9ea04257-114c-4a32-a57c-825bff2fb289">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="a799cdde-15df-4f44-a5d1-e148a3ec898b"/>
 				</reportElement>
@@ -325,6 +317,15 @@ Indonesia]]></text>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$V{Amount}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement x="0" y="0" width="265" height="20" uuid="5678f0b7-b898-4ff0-ab6d-5ba0bc59e245">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="27203e0a-c380-41a3-b44b-a14439887167"/>
+				</reportElement>
+				<textElement verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{Description-orderline}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<summary>