fix double line delivery slip

2 files changed, 33 insertions, 74 deletions

diff --git a/jasper_reports/custom_reports/DeliverySlip_A5.jasper b/jasper_reports/custom_reports/DeliverySlip_A5.jasper
index 4c04c52..c1e1ad8 100755
--- a/jasper_reports/custom_reports/DeliverySlip_A5.jasper
+++ b/jasper_reports/custom_reports/DeliverySlip_A5.jasper
diff --git a/jasper_reports/custom_reports/DeliverySlip_A5.jrxml b/jasper_reports/custom_reports/DeliverySlip_A5.jrxml
index 8b19c45..532421e 100755
--- a/jasper_reports/custom_reports/DeliverySlip_A5.jrxml
+++ b/jasper_reports/custom_reports/DeliverySlip_A5.jrxml
@@ -6,16 +6,8 @@
 		<![CDATA[['move_lines']]]>
 	</property>
 	<queryString language="xPath">
-		<![CDATA[/data/record]]>
+		<![CDATA[/data/record/]]>
 	</queryString>
-	<field name="ItemCode" class="java.lang.String">
-		<property name="net.sf.jasperreports.xpath.field.expression" value="Operations_without_package-move_line_ids_without_package/Product-product_id/Internal_Reference-default_code"/>
-		<fieldDescription><![CDATA[Operations_without_package-move_line_ids_without_package/Product-product_id/Internal_Reference-default_code]]></fieldDescription>
-	</field>
-	<field name="ProductName" class="java.lang.String">
-		<property name="net.sf.jasperreports.xpath.field.expression" value="Operations_without_package-move_line_ids_without_package/Product-product_id/Name-name"/>
-		<fieldDescription><![CDATA[Operations_without_package-move_line_ids_without_package/Product-product_id/Name-name]]></fieldDescription>
-	</field>
 	<field name="CustomerName" class="java.lang.String">
 		<property name="net.sf.jasperreports.xpath.field.expression" value="Contact-partner_id/Name-name"/>
 		<fieldDescription><![CDATA[Contact-partner_id/Name-name]]></fieldDescription>
@@ -44,39 +36,27 @@
 		<property name="net.sf.jasperreports.xpath.field.expression" value="Carrier-carrier_id/Delivery_Method-name"/>
 		<fieldDescription><![CDATA[Carrier-carrier_id/Delivery_Method-name]]></fieldDescription>
 	</field>
-	<field name="UOM" class="java.lang.String">
-		<property name="net.sf.jasperreports.xpath.field.expression" value="Operations_without_package-move_line_ids_without_package/Unit_of_Measure-product_uom_id/Unit_of_Measure-name"/>
-		<fieldDescription><![CDATA[Operations_without_package-move_line_ids_without_package/Unit_of_Measure-product_uom_id/Unit_of_Measure-name]]></fieldDescription>
-	</field>
-	<field name="Internal_Reference-default_code" class="java.lang.String">
-		<property name="net.sf.jasperreports.xpath.field.expression" value="Stock_Moves-move_lines/Product-product_id/Internal_Reference-default_code"/>
-		<fieldDescription><![CDATA[Stock_Moves-move_lines/Product-product_id/Internal_Reference-default_code]]></fieldDescription>
-	</field>
-	<field name="Name-name" class="java.lang.String">
-		<property name="net.sf.jasperreports.xpath.field.expression" value="Stock_Moves-move_lines/Product-product_id/Name-name"/>
-		<fieldDescription><![CDATA[Stock_Moves-move_lines/Product-product_id/Name-name]]></fieldDescription>
-	</field>
-	<field name="Real_Quantity-product_qty" class="java.math.BigDecimal">
-		<property name="net.sf.jasperreports.xpath.field.expression" value="Stock_Moves-move_lines/Real_Quantity-product_qty"/>
-		<fieldDescription><![CDATA[Stock_Moves-move_lines/Real_Quantity-product_qty]]></fieldDescription>
-	</field>
-	<field name="Unit_of_Measure-name" class="java.lang.String">
-		<property name="net.sf.jasperreports.xpath.field.expression" value="Stock_Moves-move_lines/Unit_of_Measure-product_uom/Unit_of_Measure-name"/>
-		<fieldDescription><![CDATA[Stock_Moves-move_lines/Unit_of_Measure-product_uom/Unit_of_Measure-name]]></fieldDescription>
-	</field>
 	<field name="Picking_Code-picking_code" class="java.lang.String">
 		<property name="net.sf.jasperreports.xpath.field.expression" value="Picking_Code-picking_code"/>
 		<fieldDescription><![CDATA[Picking_Code-picking_code]]></fieldDescription>
 	</field>
-	<field name="Qty_BigDecimal" class="java.math.BigDecimal">
-		<property name="net.sf.jasperreports.xpath.field.expression" value="Stock_Moves-move_lines/Real_Quantity-product_qty"/>
-		<fieldDescription><![CDATA[Stock_Moves-move_lines/Real_Quantity-product_qty]]></fieldDescription>
+	<field name="Product Name" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Stock_Moves-move_lines/Product-product_id/Display_Name-display_name"/>
+		<fieldDescription><![CDATA[/data/record/Stock_Moves-move_lines/Product-product_id/Display_Name-display_name]]></fieldDescription>
+	</field>
+	<field name="Unit_of_Measure-name" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Stock_Moves-move_lines/Unit_of_Measure-product_uom/Unit_of_Measure-name"/>
+		<fieldDescription><![CDATA[/data/record/Stock_Moves-move_lines/Unit_of_Measure-product_uom/Unit_of_Measure-name]]></fieldDescription>
+	</field>
+	<field name="Quantity_Done-quantity_done" class="java.math.BigDecimal">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Stock_Moves-move_lines/Quantity_Done-quantity_done"/>
+		<fieldDescription><![CDATA[/data/record/Stock_Moves-move_lines/Quantity_Done-quantity_done]]></fieldDescription>
 	</field>
 	<variable name="Jumlah_Barang" class="java.lang.Integer" calculation="Count">
-		<variableExpression><![CDATA[$F{ProductName}]]></variableExpression>
+		<variableExpression><![CDATA[$F{Product Name}]]></variableExpression>
 	</variable>
 	<variable name="Total_Qty" class="java.math.BigDecimal" calculation="Sum">
-		<variableExpression><![CDATA[$F{Qty_BigDecimal}]]></variableExpression>
+		<variableExpression><![CDATA[$F{Quantity_Done-quantity_done}]]></variableExpression>
 	</variable>
 	<background>
 		<band splitType="Stretch"/>
@@ -137,7 +117,7 @@
 				<textFieldExpression><![CDATA[$F{Address}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="0" y="40" width="100" height="10" uuid="41904a3a-1284-49a6-a1e6-a29b527d9d42"/>
+				<reportElement x="0" y="40" width="280" height="10" uuid="41904a3a-1284-49a6-a1e6-a29b527d9d42"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
@@ -207,19 +187,7 @@
 				<text><![CDATA[No]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="20" y="0" width="100" height="10" uuid="3f275bdf-4dc8-4bb5-a719-d1aef5a84e46">
-					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="2fbd4baa-83af-42f6-9b81-5099916b205b"/>
-				</reportElement>
-				<box>
-					<bottomPen lineWidth="0.5"/>
-				</box>
-				<textElement>
-					<font size="8"/>
-				</textElement>
-				<text><![CDATA[Item Code]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="120" y="0" width="300" height="10" uuid="bd07fa03-7433-44af-a2f1-f7a33a75217b">
+				<reportElement x="20" y="0" width="400" height="10" uuid="bd07fa03-7433-44af-a2f1-f7a33a75217b">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="2cb61511-dfd0-4a31-8e17-8d0abb141bf1"/>
 				</reportElement>
 				<box>
@@ -259,24 +227,6 @@
 	<detail>
 		<band height="12" splitType="Stretch">
 			<textField>
-				<reportElement x="120" y="0" width="300" height="10" uuid="a6166c16-dddf-4d4b-9507-a36d5a03dbef">
-					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="ebb69155-e03c-4113-a895-144d5307e239"/>
-				</reportElement>
-				<textElement verticalAlignment="Middle">
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{Name-name}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="480" y="0" width="75" height="10" uuid="f92f1f54-ecd2-4461-9d0d-d517523bb273">
-					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="2b17ae44-66f6-4e69-942f-8d75337f080e"/>
-				</reportElement>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{Unit_of_Measure-name}]]></textFieldExpression>
-			</textField>
-			<textField>
 				<reportElement x="0" y="0" width="20" height="10" uuid="9bdcb204-03f7-456a-a1e1-35a3dcd6cb1e"/>
 				<textElement verticalAlignment="Middle">
 					<font size="8"/>
@@ -291,22 +241,31 @@
 				</reportElement>
 			</break>
 			<textField>
-				<reportElement x="20" y="0" width="100" height="10" uuid="d7ed5eeb-4493-467f-8bc3-46c9dedec7ae">
-					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="0fc318ec-7a48-48ed-9e3a-7c3810d848f7"/>
+				<reportElement x="20" y="0" width="400" height="10" uuid="82de5c54-26c3-423f-a520-ac8734e90bff">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="b0313fae-0979-4224-a72e-d94057ff0702"/>
 				</reportElement>
-				<textElement verticalAlignment="Middle">
+				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{Internal_Reference-default_code}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{Product Name}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.###;(#,##0.###-)">
-				<reportElement x="420" y="0" width="60" height="10" uuid="03ca17c9-c940-4aea-8d4d-9f6822998001">
-					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="79fe52b4-2f7c-4811-944b-55ee974e991c"/>
+			<textField pattern="#,##0.###;(#,##0.###-)" isBlankWhenNull="true">
+				<reportElement x="420" y="0" width="60" height="10" uuid="9b6f58bd-145d-4835-bb03-319d3ffd4c0a">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="6b7c7a4c-8485-4025-b48d-b29fb2cdb6e7"/>
+				</reportElement>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{Quantity_Done-quantity_done}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="480" y="0" width="75" height="10" uuid="17178369-02cc-47e2-9239-25ce8a290275">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="909ea2e8-ff60-44b3-a812-e77fa8643cda"/>
 				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{Qty_BigDecimal}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{Unit_of_Measure-name}]]></textFieldExpression>
 			</textField>
 		</band>
 	</detail>