From c94f2f37963a3a54f8c2a14254ea75135e565513 Mon Sep 17 00:00:00 2001
From: root <root@prod-erp-indoteknikcom.c.project-indoteknik-com.internal>
Date: Wed, 9 Nov 2022 08:58:20 +0700
Subject: fix surat jalan dot matrix

---
 .../custom_reports/DeliverySlip_A5.jrxml           | 26 ++++++++++++++++------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/jasper_reports/custom_reports/DeliverySlip_A5.jrxml b/jasper_reports/custom_reports/DeliverySlip_A5.jrxml
index b1f6ba9..c10474c 100755
--- a/jasper_reports/custom_reports/DeliverySlip_A5.jrxml
+++ b/jasper_reports/custom_reports/DeliverySlip_A5.jrxml
@@ -1,9 +1,9 @@
 <?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="Blank_A4_5" pageWidth="595" pageHeight="420" orientation="Landscape" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="7ca89ceb-4b1e-446c-bd67-06493bb506b1">
-	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="New Data Adapter (2)"/>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="Delivery Order XML"/>
 	<property name="ODOO_RELATIONS">
-		<![CDATA[['move_lines']]]>
+		<![CDATA[['move_line_ids_without_package']]]>
 	</property>
 	<queryString language="xPath">
 		<![CDATA[/data/record/]]>
@@ -52,11 +52,23 @@
 		<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>
+	<field name="product_name" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Operations_without_package-move_line_ids_without_package/Product-product_id/Display_Name-display_name"/>
+		<fieldDescription><![CDATA[/data/record/Operations_without_package-move_line_ids_without_package/Product-product_id/Display_Name-display_name]]></fieldDescription>
+	</field>
+	<field name="uom_name" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Operations_without_package-move_line_ids_without_package/Unit_of_Measure-product_uom_id/Unit_of_Measure-name"/>
+		<fieldDescription><![CDATA[/data/record/Operations_without_package-move_line_ids_without_package/Unit_of_Measure-product_uom_id/Unit_of_Measure-name]]></fieldDescription>
+	</field>
+	<field name="Done-qty_done" class="java.math.BigDecimal">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Operations_without_package-move_line_ids_without_package/Done-qty_done"/>
+		<fieldDescription><![CDATA[/data/record/Operations_without_package-move_line_ids_without_package/Done-qty_done]]></fieldDescription>
+	</field>
 	<variable name="Jumlah_Barang" class="java.lang.Integer" calculation="Count">
-		<variableExpression><![CDATA[$F{Product Name}]]></variableExpression>
+		<variableExpression><![CDATA[$F{product_name}]]></variableExpression>
 	</variable>
 	<variable name="Total_Qty" class="java.math.BigDecimal" calculation="Sum">
-		<variableExpression><![CDATA[$F{Quantity_Done-quantity_done}]]></variableExpression>
+		<variableExpression><![CDATA[$F{Done-qty_done}]]></variableExpression>
 	</variable>
 	<background>
 		<band splitType="Stretch"/>
@@ -262,7 +274,7 @@
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{Product Name}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{product_name}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.###;(#,##0.###-)" isBlankWhenNull="true">
 				<reportElement x="420" y="0" width="60" height="10" uuid="9b6f58bd-145d-4835-bb03-319d3ffd4c0a">
@@ -271,7 +283,7 @@
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{Quantity_Done-quantity_done}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{Done-qty_done}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement x="480" y="0" width="75" height="10" uuid="17178369-02cc-47e2-9239-25ce8a290275">
@@ -280,7 +292,7 @@
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{Unit_of_Measure-name}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{uom_name}]]></textFieldExpression>
 			</textField>
 		</band>
 	</detail>
-- 
cgit v1.2.3