From 84a2e8b7b77b032ec14f4c155473f08f91949a8e Mon Sep 17 00:00:00 2001
From: root <root@prod-erp-indoteknikcom.c.project-indoteknik-com.internal>
Date: Wed, 11 Sep 2024 10:40:46 +0700
Subject: jasper update

---
 .../custom_reports/Customer Comision.jrxml         | 289 ++++++++++++
 .../custom_reports/DeliverySlip_A5.jrxml           |   7 +-
 .../DeliverySlip_A5_Font_Besar (2).jrxml           | 497 ++++++++++++++++++++
 .../DeliverySlip_A5_Font_Besar.jrxml               |  28 +-
 .../DeliverySlip_A5_Nomor_SO (3).jrxml             | 513 +++++++++++++++++++++
 .../custom_reports/DeliverySlip_A5_Nomor_SO.jrxml  |   7 +-
 6 files changed, 1330 insertions(+), 11 deletions(-)
 create mode 100644 jasper_reports/custom_reports/Customer Comision.jrxml
 create mode 100644 jasper_reports/custom_reports/DeliverySlip_A5_Font_Besar (2).jrxml
 create mode 100644 jasper_reports/custom_reports/DeliverySlip_A5_Nomor_SO (3).jrxml

diff --git a/jasper_reports/custom_reports/Customer Comision.jrxml b/jasper_reports/custom_reports/Customer Comision.jrxml
new file mode 100644
index 0000000..820a595
--- /dev/null
+++ b/jasper_reports/custom_reports/Customer Comision.jrxml	
@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.20.5.final using JasperReports Library version 6.20.5-3efcf2e67f959db3888d79f73dde2dbd7acb4f8e  -->
+<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="Customer Comision" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="267dd142-45c8-4e58-bdae-72f60761b287">
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="Customer Comision"/>
+	<property name="ODOO_RELATIONS">
+		<![CDATA[['commision_lines']]]>
+	</property>
+	<queryString language="XPath">
+		<![CDATA[]]>
+	</queryString>
+	<field name="Document No" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Document_No-number"/>
+		<fieldDescription><![CDATA[/data/record/Document_No-number]]></fieldDescription>
+	</field>
+	<field name="Partner Name" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Partner-partner_ids/Name-name"/>
+		<fieldDescription><![CDATA[/data/record/Partner-partner_ids/Name-name]]></fieldDescription>
+	</field>
+	<field name="Partner Name Line" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Lines-commision_lines/Customer-partner_id/Name-name"/>
+		<fieldDescription><![CDATA[/data/record/Lines-commision_lines/Customer-partner_id/Name-name]]></fieldDescription>
+	</field>
+	<field name="Invoice Name" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Lines-commision_lines/Invoice-invoice_id/Number-name"/>
+		<fieldDescription><![CDATA[/data/record/Lines-commision_lines/Invoice-invoice_id/Number-name]]></fieldDescription>
+	</field>
+	<field name="DPP" class="java.math.BigDecimal">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Lines-commision_lines/DPP-dpp"/>
+		<fieldDescription><![CDATA[/data/record/Lines-commision_lines/DPP-dpp]]></fieldDescription>
+	</field>
+	<field name="Total Margin" class="java.math.BigDecimal">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Lines-commision_lines/Total_Margin-total_percent_margin"/>
+		<fieldDescription><![CDATA[/data/record/Lines-commision_lines/Total_Margin-total_percent_margin]]></fieldDescription>
+	</field>
+	<field name="Status Invoice" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Lines-commision_lines/InvStatus-state"/>
+		<fieldDescription><![CDATA[/data/record/Lines-commision_lines/InvStatus-state]]></fieldDescription>
+	</field>
+	<field name="Date From" class="java.sql.Date">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Date_From-date_from"/>
+		<fieldDescription><![CDATA[/data/record/Date_From-date_from]]></fieldDescription>
+	</field>
+	<field name="Date To" class="java.sql.Date">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Date_To-date_to"/>
+		<fieldDescription><![CDATA[/data/record/Date_To-date_to]]></fieldDescription>
+	</field>
+	<field name="Total DPP" class="java.math.BigDecimal">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Total_DPP-total_dpp"/>
+		<fieldDescription><![CDATA[/data/record/Total_DPP-total_dpp]]></fieldDescription>
+	</field>
+	<field name="Commision Amount" class="java.math.BigDecimal">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Commision_Amount-commision_amt"/>
+		<fieldDescription><![CDATA[/data/record/Commision_Amount-commision_amt]]></fieldDescription>
+	</field>
+	<field name="Commision %" class="java.math.BigDecimal">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Commision__-commision_percent"/>
+		<fieldDescription><![CDATA[/data/record/Commision__-commision_percent]]></fieldDescription>
+	</field>
+	<variable name="DPP" class="java.math.BigDecimal" incrementType="Column">
+		<variableExpression><![CDATA[$F{DPP}]]></variableExpression>
+	</variable>
+	<variable name="Total_Margin" class="java.math.BigDecimal" incrementType="Column">
+		<variableExpression><![CDATA[$F{Total Margin}]]></variableExpression>
+	</variable>
+	<variable name="Commision_%" class="java.math.BigDecimal" incrementType="Column">
+		<variableExpression><![CDATA[$F{Commision %}]]></variableExpression>
+	</variable>
+	<variable name="Commision_Amount" class="java.math.BigDecimal" incrementType="Column">
+		<variableExpression><![CDATA[$F{Commision Amount}]]></variableExpression>
+	</variable>
+	<variable name="Total DPP" class="java.math.BigDecimal" incrementType="Column">
+		<variableExpression><![CDATA[$F{Total DPP}]]></variableExpression>
+	</variable>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="204" splitType="Stretch">
+			<textField>
+				<reportElement x="151" y="0" width="253" height="50" uuid="ad497d39-25aa-4e99-888a-6e3221d070e4"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{Document No}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="1" y="55" width="100" height="30" uuid="3e8e85ed-c77c-4377-80b4-f8817995f545">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="5fc91896-e17c-432f-bb0a-8cfc2e7549e2"/>
+				</reportElement>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font isBold="true"/>
+				</textElement>
+				<text><![CDATA[Partner Name ]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="105" y="55" width="455" height="30" uuid="d859b5fd-d805-4c86-a1c7-617fa72a3a25">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="5fc91896-e17c-432f-bb0a-8cfc2e7549e2"/>
+				</reportElement>
+				<textElement textAlignment="Left" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{Partner Name}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="1" y="90" width="100" height="30" uuid="850d8de0-d90d-4d7b-a6cf-c7279c1d49da">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="5fc91896-e17c-432f-bb0a-8cfc2e7549e2"/>
+				</reportElement>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font isBold="true"/>
+				</textElement>
+				<text><![CDATA[Date From ]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="360" y="91" width="66" height="30" uuid="5f75f83a-e4bf-441d-94dd-4bb0a6b98ef6">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="5fc91896-e17c-432f-bb0a-8cfc2e7549e2"/>
+				</reportElement>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font isBold="true"/>
+				</textElement>
+				<text><![CDATA[Date To]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="1" y="127" width="100" height="30" uuid="ee030619-4aa4-4c1b-bf18-94b8a4b77578">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="5fc91896-e17c-432f-bb0a-8cfc2e7549e2"/>
+				</reportElement>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font isBold="true"/>
+				</textElement>
+				<text><![CDATA[Commision % ]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="0" y="167" width="100" height="30" uuid="9a60a3ae-72dc-4a06-84be-3ecf879bc7be">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="5fc91896-e17c-432f-bb0a-8cfc2e7549e2"/>
+				</reportElement>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font isBold="true"/>
+				</textElement>
+				<text><![CDATA[Commision Amount ]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="360" y="164" width="66" height="30" uuid="e1c94634-0398-4d98-843e-8e2a3286b427">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="5fc91896-e17c-432f-bb0a-8cfc2e7549e2"/>
+				</reportElement>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font isBold="true"/>
+				</textElement>
+				<text><![CDATA[Total DPP ]]></text>
+			</staticText>
+			<textField pattern="MMMM d, yyyy">
+				<reportElement x="105" y="90" width="100" height="30" uuid="7b9631c0-b30e-4e5d-9061-768bfe786b8d"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{Date From}]]></textFieldExpression>
+			</textField>
+			<textField pattern="MMMM d, yyyy">
+				<reportElement x="430" y="91" width="100" height="30" uuid="f066682f-eabd-477e-8895-8455f49d2579"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{Date To}]]></textFieldExpression>
+			</textField>
+			<textField pattern="#,#00.00#;(#,#00.00#-)">
+				<reportElement x="430" y="164" width="124" height="30" uuid="6983367e-a6f1-409f-be98-3cfa7f6f77b3"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{Total DPP}]]></textFieldExpression>
+			</textField>
+			<textField pattern="#,#00.00#;(#,#00.00#-)">
+				<reportElement x="105" y="162" width="164" height="30" uuid="8c626b25-555a-4681-b491-0ab1d0321cde"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[ $F{Commision Amount}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="105" y="127" width="100" height="30" uuid="e2ebe3a4-f126-440b-b057-96126ad5098e"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{Commision %} + " %"]]></textFieldExpression>
+			</textField>
+		</band>
+	</title>
+	<columnHeader>
+		<band height="30" splitType="Stretch">
+			<staticText>
+				<reportElement x="0" y="0" width="156" height="30" uuid="17571371-537e-4cb7-a11c-db822e33e074">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="e50ddf3c-3644-4aa9-ae22-3d13c50042cc"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.75"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font isBold="true"/>
+				</textElement>
+				<text><![CDATA[Customer]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="156" y="0" width="160" height="30" uuid="2adc8d84-e0bd-4ce2-bc82-9b80178a78e6">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="2a258251-88c2-4d37-8cca-4bbc12be0e70"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.75"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font isBold="true"/>
+				</textElement>
+				<text><![CDATA[Invoice]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="316" y="0" width="64" height="30" uuid="4bde0bed-2421-4557-a45f-5a665f2ba080">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="c696cbe2-085a-4130-9dfc-976622aff9d4"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.75"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font isBold="true"/>
+				</textElement>
+				<text><![CDATA[Status Invoice]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="380" y="0" width="75" height="30" uuid="9a00a7e1-900b-4d6b-bdeb-3b7f0f7e6a5d">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="70d6c4bd-60d2-4606-b48b-2c2f9e15ff92"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.75"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font isBold="true"/>
+				</textElement>
+				<text><![CDATA[DPP]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="455" y="0" width="100" height="30" uuid="f4a50d94-89b5-4f23-818d-fadcc0f34092">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="0917b22c-3856-447c-ac45-689148535ef7"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.75"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font isBold="true"/>
+				</textElement>
+				<text><![CDATA[Total Margin]]></text>
+			</staticText>
+		</band>
+	</columnHeader>
+	<detail>
+		<band height="43" splitType="Stretch">
+			<textField>
+				<reportElement x="0" y="0" width="156" height="42" uuid="20886f7d-e695-42f4-8274-7e7424c74a6f">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="e50ddf3c-3644-4aa9-ae22-3d13c50042cc"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.75"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{Partner Name Line}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="156" y="0" width="160" height="42" uuid="1153f0c3-8080-4f61-8fb7-21d743546826">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="2a258251-88c2-4d37-8cca-4bbc12be0e70"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.75"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{Invoice Name}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="316" y="0" width="64" height="42" uuid="c702275c-c708-4f27-9f81-fb40ccaefa7f">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="c696cbe2-085a-4130-9dfc-976622aff9d4"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.75"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{Status Invoice}]]></textFieldExpression>
+			</textField>
+			<textField pattern="#,#00.00#;(#,#00.00#-)">
+				<reportElement x="380" y="0" width="75" height="42" uuid="f55b5f39-7f6e-4d42-8cfb-bdb990b4991e"/>
+				<box>
+					<bottomPen lineWidth="0.75"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$V{DPP}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="455" y="0" width="100" height="42" uuid="fb2ba136-db4c-4c37-ab43-9616acf30398"/>
+				<box>
+					<bottomPen lineWidth="0.75"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$V{Total_Margin}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<summary>
+		<band height="75" splitType="Stretch"/>
+	</summary>
+</jasperReport>
diff --git a/jasper_reports/custom_reports/DeliverySlip_A5.jrxml b/jasper_reports/custom_reports/DeliverySlip_A5.jrxml
index 69365bf..d3397e2 100755
--- a/jasper_reports/custom_reports/DeliverySlip_A5.jrxml
+++ b/jasper_reports/custom_reports/DeliverySlip_A5.jrxml
@@ -385,7 +385,7 @@
 		</band>
 	</pageFooter>
 	<summary>
-		<band height="50" splitType="Stretch">
+		<band height="140" splitType="Stretch">
 			<textField>
 				<reportElement x="260" y="0" width="80" height="12" uuid="f08b4b72-4323-4532-9791-8ff8aa2df593"/>
 				<textElement textAlignment="Right" verticalAlignment="Bottom">
@@ -470,6 +470,11 @@
 					<pen lineWidth="0.5"/>
 				</graphicElement>
 			</line>
+			<staticText>
+				<reportElement x="-1" y="110" width="556" height="30" uuid="e43e72fd-2878-45b7-8063-4ed007c2c87f"/>
+				<text><![CDATA[PERHATIAN: Harap memeriksa kelengkapan & kondisi barang dengan video ketika paket akan dibuka. Komplain harus menyertakan video unboxing
+]]></text>
+			</staticText>
 		</band>
 	</summary>
 </jasperReport>
diff --git a/jasper_reports/custom_reports/DeliverySlip_A5_Font_Besar (2).jrxml b/jasper_reports/custom_reports/DeliverySlip_A5_Font_Besar (2).jrxml
new file mode 100644
index 0000000..cfd7507
--- /dev/null
+++ b/jasper_reports/custom_reports/DeliverySlip_A5_Font_Besar (2).jrxml	
@@ -0,0 +1,497 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.20.5.final using JasperReports Library version 6.20.5-3efcf2e67f959db3888d79f73dde2dbd7acb4f8e  -->
+<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="ODOO_RELATIONS">
+		<![CDATA[['move_line_ids_without_package']]]>
+	</property>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="males.jrdax"/>
+	<queryString language="xPath">
+		<![CDATA[/data/record/]]>
+	</queryString>
+	<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/Display_Name-display_name]]></fieldDescription>
+	</field>
+	<field name="Address" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="Contact-partner_id/Street-street"/>
+		<fieldDescription><![CDATA[Contact-partner_id/Street-street]]></fieldDescription>
+	</field>
+	<field name="Phone" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="Contact-partner_id/Phone-phone"/>
+		<fieldDescription><![CDATA[Contact-partner_id/Phone-phone]]></fieldDescription>
+	</field>
+	<field name="SONo" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="Source_Document-origin"/>
+		<fieldDescription><![CDATA[Source_Document-origin]]></fieldDescription>
+	</field>
+	<field name="Date" class="java.sql.Date">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="Date_of_Transfer-date_done"/>
+		<fieldDescription><![CDATA[Date_of_Transfer-date_done]]></fieldDescription>
+	</field>
+	<field name="DONo" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="Reference-name"/>
+		<fieldDescription><![CDATA[Reference-name]]></fieldDescription>
+	</field>
+	<field name="Ekspedisi" class="java.lang.String">
+		<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="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="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>
+	<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>
+	<field name="cust_reference" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Procurement_Group-group_id/Sale_Order-sale_id/Customer_Reference-client_order_ref"/>
+		<fieldDescription><![CDATA[/data/record/Procurement_Group-group_id/Sale_Order-sale_id/Customer_Reference-client_order_ref]]></fieldDescription>
+	</field>
+	<field name="scheduledDate" class="java.sql.Date">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Scheduled_Date-scheduled_date"/>
+		<fieldDescription><![CDATA[/data/record/Scheduled_Date-scheduled_date]]></fieldDescription>
+	</field>
+	<field name="tglkirim" class="java.sql.Date">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Tanggal_Kirim_di_SJ-date_doc_kirim"/>
+		<fieldDescription><![CDATA[/data/record/Tanggal_Kirim_di_SJ-date_doc_kirim]]></fieldDescription>
+	</field>
+	<field name="Display_Name-display_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="Display_Name-display_name_1" 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="Printed_Surat_Jalan-printed_sj" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Printed_Surat_Jalan-printed_sj"/>
+		<fieldDescription><![CDATA[/data/record/Printed_Surat_Jalan-printed_sj]]></fieldDescription>
+	</field>
+	<field name="Printed-printed" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Printed-printed"/>
+		<fieldDescription><![CDATA[/data/record/Printed-printed]]></fieldDescription>
+	</field>
+	<field name="Note-note" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Operations_without_package-move_line_ids_without_package/Note-note"/>
+		<fieldDescription><![CDATA[/data/record/Operations_without_package-move_line_ids_without_package/Note-note]]></fieldDescription>
+	</field>
+	<variable name="Jumlah_Barang" class="java.lang.Integer" calculation="Count">
+		<variableExpression><![CDATA[$F{product_name}]]></variableExpression>
+	</variable>
+	<variable name="Total_Qty" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{Done-qty_done}]]></variableExpression>
+	</variable>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="70" splitType="Stretch">
+			<staticText>
+				<reportElement x="0" y="0" width="180" height="19" uuid="e5b47894-822c-470d-b8ef-1d32cdb8fdd8"/>
+				<textElement markup="none">
+					<font size="9" isBold="true"/>
+				</textElement>
+				<text><![CDATA[PT Indoteknik Dotcom Gemilang]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="231" y="0" width="100" height="18" uuid="27e03116-dfa6-4f71-af4b-94238bfe6db8">
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Center" markup="none">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<text><![CDATA[Surat Jalan]]></text>
+			</staticText>
+			<image scaleImage="FillFrame">
+				<reportElement x="355" y="0" width="200" height="19" uuid="c1fd4c13-d80d-44ba-82c7-e10435c3931c"/>
+				<imageExpression><![CDATA["https://erp.indoteknik.com/report/barcode/?type=EAN13&value="+$F{Picking_Code-picking_code}+"&width=800&height=40"]]></imageExpression>
+			</image>
+			<textField>
+				<reportElement x="355" y="24" width="200" height="10" uuid="87b21b3f-a965-467b-a390-09387ff4c2bf"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{Picking_Code-picking_code}]]></textFieldExpression>
+			</textField>
+			<image hAlign="Center">
+				<reportElement x="226" y="0" width="110" height="70" uuid="06799828-6b20-43b2-990e-ea6e4e8d7c67"/>
+				<imageExpression><![CDATA[$F{Printed_Surat_Jalan-printed_sj}.equals("True") ? "https://erp.indoteknik.com/api/image/ir.attachment/datas/2368779" : null]]></imageExpression>
+			</image>
+		</band>
+	</title>
+	<pageHeader>
+		<band height="50" splitType="Stretch">
+			<staticText>
+				<reportElement x="0" y="0" width="280" height="10" uuid="6ca71a9b-cc1e-42ae-9985-72121f9be1a9"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Kepada]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="0" y="10" width="280" height="10" uuid="29cbb842-a147-4d34-9911-1c426789311e"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{CustomerName}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="0" y="20" width="280" height="20" uuid="f0515c7c-ded5-438c-bc64-3f907c262501"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{Address}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="0" y="40" width="280" height="10" uuid="41904a3a-1284-49a6-a1e6-a29b527d9d42"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{Phone}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="280" y="0" width="100" height="10" uuid="32162bd1-d6e4-453b-afa3-77f953a56557"/>
+				<textElement textAlignment="Right">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[No Order]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="280" y="20" width="100" height="10" uuid="1f3941da-bda3-4650-8ceb-697ae43be3c7"/>
+				<textElement textAlignment="Right">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Reference]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="280" y="30" width="100" height="10" uuid="94652b05-841f-4150-99cc-a8adec5be297"/>
+				<textElement textAlignment="Right">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Ekspedisi]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="390" y="0" width="165" height="10" uuid="0aadd48d-abbe-49bb-b460-9d52e7ae4780"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{SONo}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="390" y="10" width="165" height="10" uuid="326e9ee0-8924-40c6-b4f7-145a2496f6a5"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{DONo}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="390" y="30" width="165" height="10" uuid="2f7ff77b-bef5-4092-9ad3-6e955359fa08"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{Ekspedisi}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="280" y="40" width="100" height="10" uuid="a228c42e-26c8-4023-a7f7-fa19f5b94cab"/>
+				<textElement textAlignment="Right">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Tanggal]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="390" y="40" width="165" height="10" uuid="2eed016f-218a-4880-8e70-2c6dbfd41a35"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{tglkirim}]]></textFieldExpression>
+				<patternExpression><![CDATA[new SimpleDateFormat("dd/MM/yyyy").format($F{tglkirim})]]></patternExpression>
+			</textField>
+			<textField>
+				<reportElement x="390" y="20" width="165" height="10" uuid="86208a54-fbe9-4a01-a22b-1faacb4538f0"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{cust_reference}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="280" y="10" width="100" height="10" uuid="2e97f076-f6b8-4915-86d3-f79641dc83ad"/>
+				<textElement textAlignment="Right">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[No DO]]></text>
+			</staticText>
+		</band>
+	</pageHeader>
+	<columnHeader>
+		<band height="10" splitType="Stretch">
+			<staticText>
+				<reportElement x="0" y="0" width="20" height="10" uuid="9329023d-d677-4f77-ac6f-57a0b917db83"/>
+				<box>
+					<bottomPen lineWidth="0.5"/>
+				</box>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[No]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="20" y="0" width="417" height="10" uuid="bd07fa03-7433-44af-a2f1-f7a33a75217b">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="2cb61511-dfd0-4a31-8e17-8d0abb141bf1"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.5"/>
+				</box>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Product]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="437" y="0" width="43" height="10" uuid="2ed28f46-ba65-41a0-a9c9-a07c887d2d83">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="1b4ef0cd-e036-41aa-8f13-5493a4ae0ad6"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Right">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Qty]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="480" y="0" width="75" height="10" uuid="de53e020-b3e7-48dd-af39-00a36a283b2b">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="859e0bfe-3143-40bc-86e1-45d14977b47c"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Right">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[UOM]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="150" y="0" width="158" height="10" uuid="4cffedac-3c73-459e-a8ab-68c0fa872d1a">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="0bcc99a3-cc54-4be1-b167-2b4ac273b8d5"/>
+				</reportElement>
+				<text><![CDATA[Display_Name-display_name]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="79" y="0" width="107" height="10" uuid="6b159e6a-b6b2-403a-97bb-755e9bb7852d">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="fb6d9389-8b2d-4dc5-88ed-eb7ef23d32f4"/>
+				</reportElement>
+				<text><![CDATA[Display_Name-display_name_1]]></text>
+			</staticText>
+		</band>
+	</columnHeader>
+	<detail>
+		<band height="45" splitType="Stretch">
+			<textField>
+				<reportElement x="0" y="0" width="20" height="25" uuid="9bdcb204-03f7-456a-a1e1-35a3dcd6cb1e">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement verticalAlignment="Middle">
+					<font size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{REPORT_COUNT}]]></textFieldExpression>
+			</textField>
+			<textField pattern="#,##0.###;(#,##0.###-)" isBlankWhenNull="true">
+				<reportElement x="437" y="0" width="43" height="25" uuid="9b6f58bd-145d-4835-bb03-319d3ffd4c0a">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="6b7c7a4c-8485-4025-b48d-b29fb2cdb6e7"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{Done-qty_done}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="480" y="0" width="75" height="25" 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="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{uom_name}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="20" y="0" width="417" height="25" uuid="4c9f0d43-8d40-476f-94e9-d63ec9bca238">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="fb6d9389-8b2d-4dc5-88ed-eb7ef23d32f4"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Left" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{Display_Name-display_name_1}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="20" y="25" width="30" height="19" uuid="effb88f5-4cad-4e14-a28f-54397b6b4315">
+					<printWhenExpression><![CDATA[$F{Note-note} != null && !$F{Note-note}.isEmpty()]]></printWhenExpression>
+				</reportElement>
+				<textElement markup="none">
+					<font size="9" isBold="false"/>
+				</textElement>
+				<text><![CDATA[Note : ]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="50" y="25" width="505" height="19" uuid="9f5b8618-5b6c-47ef-9345-f79e5d0a3228">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="ad4c1616-41e3-4987-989c-d73ff6562fda"/>
+				</reportElement>
+				<textFieldExpression><![CDATA[$F{Note-note}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<pageFooter>
+		<band height="10">
+			<staticText>
+				<reportElement x="437" y="0" width="39" height="10" uuid="47958420-1dcb-4ecf-a3aa-9ae4ea040130"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Halaman]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="506" y="0" width="19" height="10" uuid="19843949-b9d1-4d2d-9728-51f701ec11fa"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[dari]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="476" y="0" width="30" height="10" uuid="b9133a7f-6e33-4ba2-a3f8-7791d82b4576"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<textField evaluationTime="Report">
+				<reportElement x="525" y="0" width="30" height="10" uuid="16a7219a-7de8-47ed-ab16-3f24c89f4f2e"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<break>
+				<reportElement x="0" y="0" width="99" height="1" uuid="9611fbef-4224-48d6-b9cd-09e91ef84d77">
+					<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					<printWhenExpression><![CDATA[$V{REPORT_COUNT}==12]]></printWhenExpression>
+				</reportElement>
+			</break>
+		</band>
+	</pageFooter>
+	<summary>
+		<band height="140" splitType="Stretch">
+			<textField>
+				<reportElement x="260" y="0" width="80" height="12" uuid="f08b4b72-4323-4532-9791-8ff8aa2df593"/>
+				<textElement textAlignment="Right" verticalAlignment="Bottom">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{Jumlah_Barang}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="200" y="0" width="60" height="12" uuid="799b4bd4-7604-45fb-b8ef-2eba344dd101"/>
+				<textElement textAlignment="Right" verticalAlignment="Bottom">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Jumlah Barang]]></text>
+			</staticText>
+			<textField pattern="#,##0.###;(#,##0.###-)">
+				<reportElement x="420" y="0" width="60" height="12" uuid="c2f3749a-89aa-494a-ae30-4683e46c90b5"/>
+				<textElement textAlignment="Right" verticalAlignment="Bottom">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{Total_Qty}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="340" y="0" width="80" height="12" uuid="497e85ca-e95a-4300-8ff4-588d134d8c2d"/>
+				<textElement textAlignment="Right" verticalAlignment="Bottom">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Total Qty]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="492" y="40" width="50" height="10" uuid="a59a8370-0ec7-4bc1-9acb-4f16756eab2c"/>
+				<box>
+					<topPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Penerima]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="410" y="40" width="50" height="10" uuid="8ed381ef-c03d-46ad-ac67-491edc0cb715"/>
+				<box>
+					<topPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Security]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="305" y="40" width="50" height="10" uuid="5fadd41c-f414-46ff-a2f2-3022fdf615a2"/>
+				<box>
+					<topPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Driver]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="205" y="40" width="50" height="10" uuid="ff36a278-3484-462b-a491-26d11b76dd14"/>
+				<box>
+					<topPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Gudang]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="100" y="40" width="50" height="10" uuid="2ac2e22f-ddf8-44f4-bdd6-a30b11d5ab2f"/>
+				<box>
+					<topPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Finance]]></text>
+			</staticText>
+			<line>
+				<reportElement x="0" y="0" width="555" height="1" uuid="cfaed684-f1df-483d-a8f0-0f5a64c10951"/>
+				<graphicElement>
+					<pen lineWidth="0.5"/>
+				</graphicElement>
+			</line>
+			<staticText>
+				<reportElement x="-1" y="110" width="556" height="30" uuid="d22fccc2-8fee-4323-8a74-4334eedcac27"/>
+				<text><![CDATA[PERHATIAN: Harap memeriksa kelengkapan & kondisi barang dengan video ketika paket akan dibuka. Komplain harus menyertakan video unboxing
+]]></text>
+			</staticText>
+		</band>
+	</summary>
+</jasperReport>
diff --git a/jasper_reports/custom_reports/DeliverySlip_A5_Font_Besar.jrxml b/jasper_reports/custom_reports/DeliverySlip_A5_Font_Besar.jrxml
index e8732ce..979dfb9 100644
--- a/jasper_reports/custom_reports/DeliverySlip_A5_Font_Besar.jrxml
+++ b/jasper_reports/custom_reports/DeliverySlip_A5_Font_Besar.jrxml
@@ -345,14 +345,14 @@
 				<textFieldExpression><![CDATA[$F{Display_Name-display_name_1}]]></textFieldExpression>
 			</textField>
 			<staticText>
-                <reportElement x="20" y="25" width="30" height="19" uuid="effb88f5-4cad-4e14-a28f-54397b6b4315">
-                    <printWhenExpression><![CDATA[$F{Note-note} != null && !$F{Note-note}.isEmpty()]]></printWhenExpression>
-                </reportElement>
-                <textElement markup="none">
-                    <font size="9" isBold="false"/>
-                </textElement>
-                <text><![CDATA[Note : ]]></text>
-            </staticText>
+				<reportElement x="20" y="25" width="30" height="19" uuid="effb88f5-4cad-4e14-a28f-54397b6b4315">
+					<printWhenExpression><![CDATA[$F{Note-note} != null && !$F{Note-note}.isEmpty()]]></printWhenExpression>
+				</reportElement>
+				<textElement markup="none">
+					<font size="9" isBold="false"/>
+				</textElement>
+				<text><![CDATA[Note : ]]></text>
+			</staticText>
 			<textField>
 				<reportElement x="50" y="25" width="505" height="19" uuid="9f5b8618-5b6c-47ef-9345-f79e5d0a3228">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="ad4c1616-41e3-4987-989c-d73ff6562fda"/>
@@ -402,7 +402,7 @@
 		</band>
 	</pageFooter>
 	<summary>
-		<band height="50" splitType="Stretch">
+		<band height="113" splitType="Stretch">
 			<textField>
 				<reportElement x="260" y="0" width="80" height="12" uuid="f08b4b72-4323-4532-9791-8ff8aa2df593"/>
 				<textElement textAlignment="Right" verticalAlignment="Bottom">
@@ -487,6 +487,16 @@
 					<pen lineWidth="0.5"/>
 				</graphicElement>
 			</line>
+			<staticText>
+				<reportElement x="0" y="80" width="554" height="32" isRemoveLineWhenBlank="true" uuid="d6a6d5f1-8617-4a68-b841-e3cdbe4631fa">
+					<printWhenExpression><![CDATA[$F{Note-note} != null && !$F{Note-note}.isEmpty()]]></printWhenExpression>
+				</reportElement>
+				<textElement markup="none">
+					<font size="9" isBold="false"/>
+				</textElement>
+				<text><![CDATA[PERHATIAN: Harap memeriksa kelengkapan & kondisi barang dengan video ketika paket akan dibuka. Komplain harus menyertakan video unboxing
+]]></text>
+			</staticText>
 		</band>
 	</summary>
 </jasperReport>
diff --git a/jasper_reports/custom_reports/DeliverySlip_A5_Nomor_SO (3).jrxml b/jasper_reports/custom_reports/DeliverySlip_A5_Nomor_SO (3).jrxml
new file mode 100644
index 0000000..2880b9a
--- /dev/null
+++ b/jasper_reports/custom_reports/DeliverySlip_A5_Nomor_SO (3).jrxml	
@@ -0,0 +1,513 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.20.5.final using JasperReports Library version 6.20.5-3efcf2e67f959db3888d79f73dde2dbd7acb4f8e  -->
+<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" language="javascript" pageWidth="595" pageHeight="420" orientation="Landscape" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="7ca89ceb-4b1e-446c-bd67-06493bb506b1">
+	<property name="ODOO_RELATIONS">
+		<![CDATA[['move_line_ids_without_package']]]>
+	</property>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="males.jrdax"/>
+	<queryString language="xPath">
+		<![CDATA[/data/record/]]>
+	</queryString>
+	<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/Display_Name-display_name]]></fieldDescription>
+	</field>
+	<field name="Address" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="Contact-partner_id/Street-street"/>
+		<fieldDescription><![CDATA[Contact-partner_id/Street-street]]></fieldDescription>
+	</field>
+	<field name="Phone" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="Contact-partner_id/Phone-phone"/>
+		<fieldDescription><![CDATA[Contact-partner_id/Phone-phone]]></fieldDescription>
+	</field>
+	<field name="SONo" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="Source_Document-origin"/>
+		<fieldDescription><![CDATA[Source_Document-origin]]></fieldDescription>
+	</field>
+	<field name="Date" class="java.sql.Date">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="Date_of_Transfer-date_done"/>
+		<fieldDescription><![CDATA[Date_of_Transfer-date_done]]></fieldDescription>
+	</field>
+	<field name="DONo" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="Reference-name"/>
+		<fieldDescription><![CDATA[Reference-name]]></fieldDescription>
+	</field>
+	<field name="Ekspedisi" class="java.lang.String">
+		<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="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="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>
+	<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>
+	<field name="cust_reference" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Procurement_Group-group_id/Sale_Order-sale_id/Customer_Reference-client_order_ref"/>
+		<fieldDescription><![CDATA[/data/record/Procurement_Group-group_id/Sale_Order-sale_id/Customer_Reference-client_order_ref]]></fieldDescription>
+	</field>
+	<field name="No-line_no" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Operations_without_package-move_line_ids_without_package/No-line_no"/>
+		<fieldDescription><![CDATA[/data/record/Operations_without_package-move_line_ids_without_package/No-line_no]]></fieldDescription>
+	</field>
+	<field name="scheduledDate" class="java.sql.Date">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Scheduled_Date-scheduled_date"/>
+		<fieldDescription><![CDATA[/data/record/Scheduled_Date-scheduled_date]]></fieldDescription>
+	</field>
+	<field name="tglkirim" class="java.sql.Date">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Tanggal_Kirim_di_SJ-date_doc_kirim"/>
+		<fieldDescription><![CDATA[/data/record/Tanggal_Kirim_di_SJ-date_doc_kirim]]></fieldDescription>
+	</field>
+	<field name="Notes-note" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Notes-note"/>
+		<fieldDescription><![CDATA[/data/record/Notes-note]]></fieldDescription>
+	</field>
+	<field name="Printed_Surat_Jalan-printed_sj" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Printed_Surat_Jalan-printed_sj"/>
+		<fieldDescription><![CDATA[/data/record/Printed_Surat_Jalan-printed_sj]]></fieldDescription>
+	</field>
+	<field name="Printed-printed" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Printed-printed"/>
+		<fieldDescription><![CDATA[/data/record/Printed-printed]]></fieldDescription>
+	</field>
+	<field name="Note-note" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Operations_without_package-move_line_ids_without_package/Note-note"/>
+		<fieldDescription><![CDATA[/data/record/Operations_without_package-move_line_ids_without_package/Note-note]]></fieldDescription>
+	</field>
+	<sortField name="No-line_no"/>
+	<variable name="Jumlah_Barang" class="java.lang.Integer" calculation="Count">
+		<variableExpression><![CDATA[$F{product_name}]]></variableExpression>
+	</variable>
+	<variable name="Total_Qty" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{Done-qty_done}]]></variableExpression>
+	</variable>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="70" splitType="Stretch">
+			<staticText>
+				<reportElement x="0" y="0" width="180" height="19" uuid="e5b47894-822c-470d-b8ef-1d32cdb8fdd8"/>
+				<textElement markup="none">
+					<font size="9" isBold="true"/>
+				</textElement>
+				<text><![CDATA[PT Indoteknik Dotcom Gemilang]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="231" y="0" width="100" height="18" uuid="27e03116-dfa6-4f71-af4b-94238bfe6db8">
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Center" markup="none">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<text><![CDATA[Surat Jalan]]></text>
+			</staticText>
+			<image scaleImage="FillFrame">
+				<reportElement x="355" y="0" width="200" height="19" uuid="c1fd4c13-d80d-44ba-82c7-e10435c3931c"/>
+				<imageExpression><![CDATA["https://erp.indoteknik.com/report/barcode/?type=Code128&value="+$F{Picking_Code-picking_code}+"&width=800&height=40"]]></imageExpression>
+			</image>
+			<textField>
+				<reportElement x="355" y="24" width="200" height="10" uuid="87b21b3f-a965-467b-a390-09387ff4c2bf"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{Picking_Code-picking_code}]]></textFieldExpression>
+			</textField>
+			<image hAlign="Center">
+				<reportElement x="226" y="0" width="110" height="70" uuid="855c97c3-988b-42de-8f89-8cd82a9974fe"/>
+				<imageExpression><![CDATA[$F{Printed_Surat_Jalan-printed_sj}.equals("True") ? "https://erp.indoteknik.com/api/image/ir.attachment/datas/2368779" : null]]></imageExpression>
+			</image>
+		</band>
+	</title>
+	<pageHeader>
+		<band height="50" splitType="Stretch">
+			<staticText>
+				<reportElement x="0" y="0" width="280" height="10" uuid="6ca71a9b-cc1e-42ae-9985-72121f9be1a9"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Kepada]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="0" y="10" width="280" height="10" uuid="29cbb842-a147-4d34-9911-1c426789311e"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{CustomerName}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="0" y="20" width="280" height="20" uuid="f0515c7c-ded5-438c-bc64-3f907c262501"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{Address}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="0" y="40" width="280" height="10" uuid="41904a3a-1284-49a6-a1e6-a29b527d9d42"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{Phone}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="280" y="0" width="100" height="10" uuid="32162bd1-d6e4-453b-afa3-77f953a56557"/>
+				<textElement textAlignment="Right">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[No Order]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="280" y="20" width="100" height="10" uuid="1f3941da-bda3-4650-8ceb-697ae43be3c7"/>
+				<textElement textAlignment="Right">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Reference]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="280" y="30" width="100" height="10" uuid="94652b05-841f-4150-99cc-a8adec5be297"/>
+				<textElement textAlignment="Right">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Ekspedisi]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="390" y="0" width="165" height="10" uuid="0aadd48d-abbe-49bb-b460-9d52e7ae4780"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{SONo}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="390" y="10" width="165" height="10" uuid="326e9ee0-8924-40c6-b4f7-145a2496f6a5"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{DONo}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="390" y="30" width="165" height="10" uuid="2f7ff77b-bef5-4092-9ad3-6e955359fa08"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{Ekspedisi}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="280" y="40" width="100" height="10" uuid="a228c42e-26c8-4023-a7f7-fa19f5b94cab"/>
+				<textElement textAlignment="Right">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Tanggal]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="390" y="40" width="165" height="10" uuid="2eed016f-218a-4880-8e70-2c6dbfd41a35"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{tglkirim}]]></textFieldExpression>
+				<patternExpression><![CDATA[new SimpleDateFormat("dd/MM/yyyy").format($F{tglkirim})]]></patternExpression>
+			</textField>
+			<textField>
+				<reportElement x="390" y="20" width="165" height="10" uuid="86208a54-fbe9-4a01-a22b-1faacb4538f0"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{cust_reference}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="280" y="10" width="100" height="10" uuid="2e97f076-f6b8-4915-86d3-f79641dc83ad"/>
+				<textElement textAlignment="Right">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[No DO]]></text>
+			</staticText>
+		</band>
+	</pageHeader>
+	<columnHeader>
+		<band height="10" splitType="Stretch">
+			<staticText>
+				<reportElement x="0" y="0" width="20" height="10" uuid="9329023d-d677-4f77-ac6f-57a0b917db83"/>
+				<box>
+					<bottomPen lineWidth="0.5"/>
+				</box>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[No]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="50" 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>
+					<bottomPen lineWidth="0.5"/>
+				</box>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Product]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="450" y="0" width="30" height="10" uuid="2ed28f46-ba65-41a0-a9c9-a07c887d2d83">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="1b4ef0cd-e036-41aa-8f13-5493a4ae0ad6"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Right">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Qty]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="480" y="0" width="75" height="10" uuid="de53e020-b3e7-48dd-af39-00a36a283b2b">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="859e0bfe-3143-40bc-86e1-45d14977b47c"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Right">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[UOM]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="20" y="0" width="30" height="10" uuid="6fb93c09-5e46-496e-a13d-d8797833206d"/>
+				<box>
+					<bottomPen lineWidth="0.5"/>
+				</box>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[SO No]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="72" y="0" width="130" height="10" uuid="832e265a-3cb7-4c16-8e72-e7c1f9b2d5ec">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="ad4c1616-41e3-4987-989c-d73ff6562fda"/>
+				</reportElement>
+				<text><![CDATA[Note-note]]></text>
+			</staticText>
+		</band>
+	</columnHeader>
+	<detail>
+		<band height="37" splitType="Stretch">
+			<textField>
+				<reportElement x="0" y="0" width="20" height="18" uuid="9bdcb204-03f7-456a-a1e1-35a3dcd6cb1e"/>
+				<textElement verticalAlignment="Middle">
+					<font size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{REPORT_COUNT}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="50" y="0" width="400" height="18" uuid="82de5c54-26c3-423f-a520-ac8734e90bff">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="b0313fae-0979-4224-a72e-d94057ff0702"/>
+				</reportElement>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{product_name}]]></textFieldExpression>
+			</textField>
+			<textField pattern="#,##0.###;(#,##0.###-)" isBlankWhenNull="true">
+				<reportElement x="450" y="0" width="30" height="18" 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="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{Done-qty_done}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="480" y="0" width="75" height="18" 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="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{uom_name}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="20" y="0" width="30" height="18" uuid="a5033c13-2efb-4c52-91d9-bad1f3223218"/>
+				<textElement verticalAlignment="Middle">
+					<font size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{No-line_no}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="20" y="18" width="30" height="19" isRemoveLineWhenBlank="true" uuid="effb88f5-4cad-4e14-a28f-54397b6b4315">
+					<printWhenExpression><![CDATA[$F{Note-note} != null && !$F{Note-note}.isEmpty()]]></printWhenExpression>
+				</reportElement>
+				<textElement markup="none">
+					<font size="9" isBold="false"/>
+				</textElement>
+				<text><![CDATA[Note : ]]></text>
+			</staticText>
+			<textField isBlankWhenNull="true">
+				<reportElement x="50" y="18" width="505" height="19" isRemoveLineWhenBlank="true" uuid="7d8599d0-f7da-4570-aa49-cef04f43984d">
+					<printWhenExpression><![CDATA[$F{Note-note} != null && !$F{Note-note}.isEmpty()]]></printWhenExpression>
+				</reportElement>
+				<textFieldExpression><![CDATA[$F{Note-note}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<pageFooter>
+		<band height="10">
+			<staticText>
+				<reportElement x="437" y="0" width="39" height="10" uuid="47958420-1dcb-4ecf-a3aa-9ae4ea040130"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Halaman]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="506" y="0" width="19" height="10" uuid="19843949-b9d1-4d2d-9728-51f701ec11fa"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[dari]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="476" y="0" width="30" height="10" uuid="b9133a7f-6e33-4ba2-a3f8-7791d82b4576"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<textField evaluationTime="Report">
+				<reportElement x="525" y="0" width="30" height="10" uuid="16a7219a-7de8-47ed-ab16-3f24c89f4f2e"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<break>
+				<reportElement x="0" y="0" width="99" height="1" uuid="9611fbef-4224-48d6-b9cd-09e91ef84d77">
+					<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<printWhenExpression><![CDATA[$V{REPORT_COUNT}==12]]></printWhenExpression>
+				</reportElement>
+			</break>
+		</band>
+	</pageFooter>
+	<summary>
+		<band height="142" splitType="Stretch">
+			<textField>
+				<reportElement x="260" y="0" width="80" height="12" uuid="f08b4b72-4323-4532-9791-8ff8aa2df593"/>
+				<textElement textAlignment="Right" verticalAlignment="Bottom">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{Jumlah_Barang}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="200" y="0" width="60" height="12" uuid="799b4bd4-7604-45fb-b8ef-2eba344dd101"/>
+				<textElement textAlignment="Right" verticalAlignment="Bottom">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Jumlah Barang]]></text>
+			</staticText>
+			<textField pattern="#,##0.###;(#,##0.###-)">
+				<reportElement x="420" y="0" width="60" height="12" uuid="c2f3749a-89aa-494a-ae30-4683e46c90b5"/>
+				<textElement textAlignment="Right" verticalAlignment="Bottom">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{Total_Qty}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="340" y="0" width="80" height="12" uuid="497e85ca-e95a-4300-8ff4-588d134d8c2d"/>
+				<textElement textAlignment="Right" verticalAlignment="Bottom">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Total Qty]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="492" y="40" width="50" height="10" uuid="a59a8370-0ec7-4bc1-9acb-4f16756eab2c"/>
+				<box>
+					<topPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Penerima]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="410" y="40" width="50" height="10" uuid="8ed381ef-c03d-46ad-ac67-491edc0cb715"/>
+				<box>
+					<topPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Security]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="305" y="40" width="50" height="10" uuid="5fadd41c-f414-46ff-a2f2-3022fdf615a2"/>
+				<box>
+					<topPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Driver]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="205" y="40" width="50" height="10" uuid="ff36a278-3484-462b-a491-26d11b76dd14"/>
+				<box>
+					<topPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Gudang]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="100" y="40" width="50" height="10" uuid="2ac2e22f-ddf8-44f4-bdd6-a30b11d5ab2f"/>
+				<box>
+					<topPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Finance]]></text>
+			</staticText>
+			<line>
+				<reportElement x="0" y="0" width="555" height="1" uuid="cfaed684-f1df-483d-a8f0-0f5a64c10951"/>
+				<graphicElement>
+					<pen lineWidth="0.5"/>
+				</graphicElement>
+			</line>
+			<textField isBlankWhenNull="true">
+				<reportElement x="-1" y="70" width="557" height="30" uuid="a3cf58a5-f3c8-489f-b126-1788de799698"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{Notes-note}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="-1" y="110" width="556" height="30" uuid="dce1fdb2-afec-4246-a795-d46e3fe53e47"/>
+				<text><![CDATA[PERHATIAN: Harap memeriksa kelengkapan & kondisi barang dengan video ketika paket akan dibuka. Komplain harus menyertakan video unboxing
+]]></text>
+			</staticText>
+		</band>
+	</summary>
+</jasperReport>
diff --git a/jasper_reports/custom_reports/DeliverySlip_A5_Nomor_SO.jrxml b/jasper_reports/custom_reports/DeliverySlip_A5_Nomor_SO.jrxml
index b949578..de05857 100644
--- a/jasper_reports/custom_reports/DeliverySlip_A5_Nomor_SO.jrxml
+++ b/jasper_reports/custom_reports/DeliverySlip_A5_Nomor_SO.jrxml
@@ -410,7 +410,7 @@
 		</band>
 	</pageFooter>
 	<summary>
-		<band height="100" splitType="Stretch">
+		<band height="140" splitType="Stretch">
 			<textField>
 				<reportElement x="260" y="0" width="80" height="12" uuid="f08b4b72-4323-4532-9791-8ff8aa2df593"/>
 				<textElement textAlignment="Right" verticalAlignment="Bottom">
@@ -502,6 +502,11 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{Notes-note}]]></textFieldExpression>
 			</textField>
+			<staticText>
+				<reportElement x="-1" y="110" width="556" height="30" uuid="7404a0f0-063b-45c7-b1ba-1ceae7a8f26e"/>
+				<text><![CDATA[PERHATIAN: Harap memeriksa kelengkapan & kondisi barang dengan video ketika paket akan dibuka. Komplain harus menyertakan video unboxing
+]]></text>
+			</staticText>
 		</band>
 	</summary>
 </jasperReport>
-- 
cgit v1.2.3