From e6e50dd2a1d8552ce75b733bd2eb8cdcb9e76e94 Mon Sep 17 00:00:00 2001
From: root <root@prod-erp-indoteknikcom.c.project-indoteknik-com.internal>
Date: Thu, 29 Aug 2024 15:31:16 +0700
Subject: modified jasper

---
 jasper_reports/custom_reports/Blank_A4_7.jrxml     |   2 +-
 .../custom_reports/DeliverySlip_A5.jrxml           |  45 +-
 .../DeliverySlip_A5_Font_Besar.jrxml               |  37 +-
 .../DeliverySlip_A5_Nomor_SO (2).jrxml             | 508 +++++++++++++++++++++
 .../custom_reports/DeliverySlip_A5_Nomor_SO.jrxml  |  51 ++-
 jasper_reports/custom_reports/PickingList.jrxml    |  20 +-
 jasper_reports/custom_reports/ShipmentGroup.jrxml  | 216 +++++++++
 jasper_reports/custom_reports/logbook_sj.jrxml     |  46 +-
 .../custom_reports/proforma_invoice.jrxml          |  63 ++-
 jasper_reports/custom_reports/saleorderimage.jrxml |  40 +-
 10 files changed, 960 insertions(+), 68 deletions(-)
 create mode 100644 jasper_reports/custom_reports/DeliverySlip_A5_Nomor_SO (2).jrxml
 create mode 100644 jasper_reports/custom_reports/ShipmentGroup.jrxml

diff --git a/jasper_reports/custom_reports/Blank_A4_7.jrxml b/jasper_reports/custom_reports/Blank_A4_7.jrxml
index 09ecf15..e319782 100644
--- a/jasper_reports/custom_reports/Blank_A4_7.jrxml
+++ b/jasper_reports/custom_reports/Blank_A4_7.jrxml
@@ -247,7 +247,7 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{Invoice_Bill_Date-invoice_date}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,#00.00#;(#,#00.00#-)">
+			<textField pattern="#,#00.00#;(#,#00.00#-)" isBlankWhenNull="true">
 				<reportElement x="131" y="189" width="166" height="25" uuid="d8c1109f-b815-45b6-83b7-28e6cf385cae"/>
 				<textElement verticalAlignment="Middle">
 					<font isBold="true"/>
diff --git a/jasper_reports/custom_reports/DeliverySlip_A5.jrxml b/jasper_reports/custom_reports/DeliverySlip_A5.jrxml
index 57c20b9..69365bf 100755
--- a/jasper_reports/custom_reports/DeliverySlip_A5.jrxml
+++ b/jasper_reports/custom_reports/DeliverySlip_A5.jrxml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.20.0.final using JasperReports Library version 6.20.0-2bc7ab61c56f459e8176eb05c7705e145cd400ad  -->
+<!-- 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="com.jaspersoft.studio.data.defaultdataadapter" value="Stock Picking"/>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="males.jrdax"/>
 	<property name="ODOO_RELATIONS">
 		<![CDATA[['move_line_ids_without_package']]]>
 	</property>
@@ -76,6 +76,18 @@
 		<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="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>
@@ -86,7 +98,7 @@
 		<band splitType="Stretch"/>
 	</background>
 	<title>
-		<band height="40" splitType="Stretch">
+		<band height="71" splitType="Stretch">
 			<staticText>
 				<reportElement x="0" y="0" width="180" height="19" uuid="e5b47894-822c-470d-b8ef-1d32cdb8fdd8"/>
 				<textElement markup="none">
@@ -115,6 +127,10 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{Picking_Code-picking_code}]]></textFieldExpression>
 			</textField>
+			<image hAlign="Center">
+				<reportElement x="226" y="0" width="110" height="70" uuid="6222a8c9-e873-48fa-a98a-029970fbb4ff"/>
+				<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>
@@ -268,10 +284,16 @@
 				</textElement>
 				<text><![CDATA[UOM]]></text>
 			</staticText>
+			<staticText>
+				<reportElement x="75" y="0" width="100" height="10" uuid="1df6a925-4fc7-4c91-82a7-050140f93e1e">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="0fca90e2-8ed9-4893-b9c9-815df15a6fb7"/>
+				</reportElement>
+				<text><![CDATA[Note-note]]></text>
+			</staticText>
 		</band>
 	</columnHeader>
 	<detail>
-		<band height="12" splitType="Stretch">
+		<band height="30" splitType="Stretch">
 			<textField>
 				<reportElement x="0" y="0" width="20" height="10" uuid="9bdcb204-03f7-456a-a1e1-35a3dcd6cb1e"/>
 				<textElement verticalAlignment="Middle">
@@ -313,6 +335,21 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{uom_name}]]></textFieldExpression>
 			</textField>
+			<staticText>
+				<reportElement x="20" y="11" 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="11" width="100" height="13" uuid="fa033af6-56d1-46ba-a0dd-7fdf62836fc9">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="0fca90e2-8ed9-4893-b9c9-815df15a6fb7"/>
+				</reportElement>
+				<textFieldExpression><![CDATA[$F{Note-note}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<pageFooter>
diff --git a/jasper_reports/custom_reports/DeliverySlip_A5_Font_Besar.jrxml b/jasper_reports/custom_reports/DeliverySlip_A5_Font_Besar.jrxml
index 8dcbeaa..e8732ce 100644
--- a/jasper_reports/custom_reports/DeliverySlip_A5_Font_Besar.jrxml
+++ b/jasper_reports/custom_reports/DeliverySlip_A5_Font_Besar.jrxml
@@ -4,7 +4,7 @@
 	<property name="ODOO_RELATIONS">
 		<![CDATA[['move_line_ids_without_package']]]>
 	</property>
-	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="transfer.jrdax"/>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="males.jrdax"/>
 	<queryString language="xPath">
 		<![CDATA[/data/record/]]>
 	</queryString>
@@ -84,6 +84,18 @@
 		<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>
@@ -94,7 +106,7 @@
 		<band splitType="Stretch"/>
 	</background>
 	<title>
-		<band height="40" splitType="Stretch">
+		<band height="70" splitType="Stretch">
 			<staticText>
 				<reportElement x="0" y="0" width="180" height="19" uuid="e5b47894-822c-470d-b8ef-1d32cdb8fdd8"/>
 				<textElement markup="none">
@@ -123,6 +135,10 @@
 				</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>
@@ -291,7 +307,7 @@
 		</band>
 	</columnHeader>
 	<detail>
-		<band height="25" splitType="Stretch">
+		<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"/>
@@ -328,6 +344,21 @@
 				<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>
diff --git a/jasper_reports/custom_reports/DeliverySlip_A5_Nomor_SO (2).jrxml b/jasper_reports/custom_reports/DeliverySlip_A5_Nomor_SO (2).jrxml
new file mode 100644
index 0000000..fbc2219
--- /dev/null
+++ b/jasper_reports/custom_reports/DeliverySlip_A5_Nomor_SO (2).jrxml	
@@ -0,0 +1,508 @@
+	<?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="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>
+	<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="386" 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="42" 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="116" 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="386" 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="437" y="0" width="42" 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" 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="18" width="505" height="19" uuid="7d8599d0-f7da-4570-aa49-cef04f43984d">
+			        <printWhenExpression><![CDATA[$F{Note-note} != null && !$F{Note-note}.isEmpty()]]></printWhenExpression>
+			        <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"/>
+					<printWhenExpression><![CDATA[$V{REPORT_COUNT}==12]]></printWhenExpression>
+				</reportElement>
+			</break>
+		</band>
+	</pageFooter>
+	<summary>
+		<band height="100" 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>
+		</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 84c02de..b949578 100644
--- a/jasper_reports/custom_reports/DeliverySlip_A5_Nomor_SO.jrxml
+++ b/jasper_reports/custom_reports/DeliverySlip_A5_Nomor_SO.jrxml
@@ -4,7 +4,7 @@
 	<property name="ODOO_RELATIONS">
 		<![CDATA[['move_line_ids_without_package']]]>
 	</property>
-	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="transfer.jrdax"/>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="males.jrdax"/>
 	<queryString language="xPath">
 		<![CDATA[/data/record/]]>
 	</queryString>
@@ -84,6 +84,18 @@
 		<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>
 	<variable name="Jumlah_Barang" class="java.lang.Integer" calculation="Count">
 		<variableExpression><![CDATA[$F{product_name}]]></variableExpression>
 	</variable>
@@ -94,7 +106,7 @@
 		<band splitType="Stretch"/>
 	</background>
 	<title>
-		<band height="40" splitType="Stretch">
+		<band height="70" splitType="Stretch">
 			<staticText>
 				<reportElement x="0" y="0" width="180" height="19" uuid="e5b47894-822c-470d-b8ef-1d32cdb8fdd8"/>
 				<textElement markup="none">
@@ -123,6 +135,10 @@
 				</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>
@@ -241,7 +257,7 @@
 				<text><![CDATA[No]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="50" y="0" width="370" height="10" uuid="bd07fa03-7433-44af-a2f1-f7a33a75217b">
+				<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>
@@ -253,7 +269,7 @@
 				<text><![CDATA[Product]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="420" y="0" width="60" height="10" uuid="2ed28f46-ba65-41a0-a9c9-a07c887d2d83">
+				<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>
@@ -286,10 +302,16 @@
 				</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="23" splitType="Stretch">
+		<band height="37" splitType="Stretch">
 			<textField>
 				<reportElement x="0" y="0" width="20" height="18" uuid="9bdcb204-03f7-456a-a1e1-35a3dcd6cb1e"/>
 				<textElement verticalAlignment="Middle">
@@ -298,7 +320,7 @@
 				<textFieldExpression><![CDATA[$V{REPORT_COUNT}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="50" y="0" width="370" height="18" uuid="82de5c54-26c3-423f-a520-ac8734e90bff">
+				<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">
@@ -307,7 +329,7 @@
 				<textFieldExpression><![CDATA[$F{product_name}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.###;(#,##0.###-)" isBlankWhenNull="true">
-				<reportElement x="420" y="0" width="60" height="18" uuid="9b6f58bd-145d-4835-bb03-319d3ffd4c0a">
+				<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">
@@ -331,6 +353,21 @@
 				</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>
diff --git a/jasper_reports/custom_reports/PickingList.jrxml b/jasper_reports/custom_reports/PickingList.jrxml
index b293872..07af3c2 100755
--- a/jasper_reports/custom_reports/PickingList.jrxml
+++ b/jasper_reports/custom_reports/PickingList.jrxml
@@ -13,7 +13,7 @@
 	<property name="ODOO_RELATIONS">
 		<![CDATA[['move_ids_without_package']]]>
 	</property>
-	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="StockPicking.jrdax"/>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="males.jrdax"/>
 	<queryString language="XPath">
 		<![CDATA[/data/record]]>
 	</queryString>
@@ -101,6 +101,18 @@
 		<property name="net.sf.jasperreports.xpath.field.expression" value="Matches_SO-sale_order"/>
 		<fieldDescription><![CDATA[Matches_SO-sale_order]]></fieldDescription>
 	</field>
+	<field name="Printed-printed" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="Printed-printed"/>
+		<fieldDescription><![CDATA[Printed-printed]]></fieldDescription>
+	</field>
+	<field name="Printed_Surat_Jalan-printed_sj" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="Printed_Surat_Jalan-printed_sj"/>
+		<fieldDescription><![CDATA[Printed_Surat_Jalan-printed_sj]]></fieldDescription>
+	</field>
+	<field name="Printed_-status_printed" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="Printed_-status_printed"/>
+		<fieldDescription><![CDATA[Printed_-status_printed]]></fieldDescription>
+	</field>
 	<variable name="SumQty" class="java.math.BigDecimal" calculation="Sum">
 		<variableExpression><![CDATA[$F{Demand-product_uom_qty}]]></variableExpression>
 	</variable>
@@ -134,11 +146,15 @@
 		<band splitType="Stretch"/>
 	</background>
 	<title>
-		<band height="42" splitType="Stretch">
+		<band height="70" splitType="Stretch">
 			<image>
 				<reportElement x="0" y="0" width="140" height="40" uuid="c561d629-3c19-4c9b-a958-80bcc05cc33b"/>
 				<imageExpression><![CDATA["/odoo14/images/logo_indoteknik_no_color.jpeg"]]></imageExpression>
 			</image>
+			<image hAlign="Center">
+				<reportElement x="140" y="0" width="110" height="70" uuid="855c97c3-988b-42de-8f89-8cd82a9974fe"/>
+				<imageExpression><![CDATA[$F{Printed_-status_printed}.equals("printed") ? "https://erp.indoteknik.com/api/image/ir.attachment/datas/2368779" : null]]></imageExpression>
+			</image>
 		</band>
 	</title>
 	<pageHeader>
diff --git a/jasper_reports/custom_reports/ShipmentGroup.jrxml b/jasper_reports/custom_reports/ShipmentGroup.jrxml
new file mode 100644
index 0000000..bc772c1
--- /dev/null
+++ b/jasper_reports/custom_reports/ShipmentGroup.jrxml
@@ -0,0 +1,216 @@
+<?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="ShipmentGroup" pageWidth="595" pageHeight="420" orientation="Landscape" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="ee023038-1099-4af8-8961-17b5517d4b2b">
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="shipmenttttt.jrdax"/>
+	<property name="ODOO_RELATIONS">
+		<![CDATA[['shipment_line']]]>
+	</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" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Customer-partner_id/Name-name"/>
+		<fieldDescription><![CDATA[/data/record/Customer-partner_id/Name-name]]></fieldDescription>
+	</field>
+	<field name="Line Partner" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Shipment_Group_Lines-shipment_line/Customer-partner_id/Name-name"/>
+		<fieldDescription><![CDATA[/data/record/Shipment_Group_Lines-shipment_line/Customer-partner_id/Name-name]]></fieldDescription>
+	</field>
+	<field name="DO Number" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Shipment_Group_Lines-shipment_line/Picking-picking_id/Reference-name"/>
+		<fieldDescription><![CDATA[/data/record/Shipment_Group_Lines-shipment_line/Picking-picking_id/Reference-name]]></fieldDescription>
+	</field>
+	<field name="SO Number" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Shipment_Group_Lines-shipment_line/Sale_Order-sale_id/Order_Reference-name"/>
+		<fieldDescription><![CDATA[/data/record/Shipment_Group_Lines-shipment_line/Sale_Order-sale_id/Order_Reference-name]]></fieldDescription>
+	</field>
+	<field name="Status" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Shipment_Group_Lines-shipment_line/Status-state"/>
+		<fieldDescription><![CDATA[/data/record/Shipment_Group_Lines-shipment_line/Status-state]]></fieldDescription>
+	</field>
+	<field name="Display Name Partner" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Customer-partner_id/Display_Name-display_name"/>
+		<fieldDescription><![CDATA[/data/record/Customer-partner_id/Display_Name-display_name]]></fieldDescription>
+	</field>
+	<field name="Display_Name-display_name" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Shipment_Group_Lines-shipment_line/Customer-partner_id/Display_Name-display_name"/>
+		<fieldDescription><![CDATA[/data/record/Shipment_Group_Lines-shipment_line/Customer-partner_id/Display_Name-display_name]]></fieldDescription>
+	</field>
+	<field name="Shipping_Paid_by-shipping_paid_by" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Shipment_Group_Lines-shipment_line/Shipping_Paid_by-shipping_paid_by"/>
+		<fieldDescription><![CDATA[/data/record/Shipment_Group_Lines-shipment_line/Shipping_Paid_by-shipping_paid_by]]></fieldDescription>
+	</field>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="55" splitType="Stretch">
+			<staticText>
+				<reportElement x="2" y="0" width="550" height="30" uuid="48be6e24-7ca1-44d2-b5e3-17dc1fbf616b"/>
+				<textElement textAlignment="Center" verticalAlignment="Top">
+					<font size="20" isBold="true"/>
+				</textElement>
+				<text><![CDATA[Shipment Group]]></text>
+			</staticText>
+		</band>
+	</title>
+	<pageHeader>
+		<band height="60" splitType="Stretch">
+			<textField>
+				<reportElement x="0" y="0" width="220" height="50" uuid="e4a7118c-841b-411e-a059-9c41f24b73e4"/>
+				<textElement textAlignment="Center">
+					<font size="16" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{Document No}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="220" y="0" width="332" height="50" uuid="7a096341-32d5-4f73-b31c-f367591847ce"/>
+				<textElement textAlignment="Center">
+					<font size="16" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{Display Name Partner}]]></textFieldExpression>
+			</textField>
+		</band>
+	</pageHeader>
+	<columnHeader>
+		<band height="30" splitType="Stretch">
+			<staticText>
+				<reportElement x="80" y="0" width="190" height="30" uuid="01ae10e1-96a2-48ce-9b79-2b432b8e5067">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="2e94d44a-9423-488b-a401-afaf2c16b860"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12"/>
+				</textElement>
+				<text><![CDATA[Line Partner]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="0" y="0" width="80" height="30" uuid="d1a5649c-1ed7-4076-a167-e73211d90428">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="671d5960-8b0c-4929-9cef-5c27ddaa0d90"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12"/>
+				</textElement>
+				<text><![CDATA[DO Number]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="270" y="0" width="100" height="30" uuid="0fef1278-e03b-4b45-b8cd-f4fc98651d0d">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="94acfe89-a1ec-4054-89d5-857f5c3004f1"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12"/>
+				</textElement>
+				<text><![CDATA[SO Number]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="480" y="0" width="73" height="30" uuid="fd42216a-69e8-4339-bf47-f7d5df34fb30">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="462e19c7-ebc5-4ab4-b4b9-24dc4a333126"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12"/>
+				</textElement>
+				<text><![CDATA[Status]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="370" y="0" width="110" height="30" uuid="18a3822d-9de0-4e77-af2b-2a63d651a0a1">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="26d7f951-8e46-4b2e-b073-2cff9a705fa0"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12"/>
+				</textElement>
+				<text><![CDATA[Shipping paid by]]></text>
+			</staticText>
+		</band>
+	</columnHeader>
+	<detail>
+		<band height="43" splitType="Stretch">
+			<textField>
+				<reportElement x="0" y="0" width="80" height="30" uuid="2caf9efd-5cbd-4f24-bad1-770b7e5c1c64">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="671d5960-8b0c-4929-9cef-5c27ddaa0d90"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="11"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{DO Number}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="270" y="0" width="100" height="30" uuid="7cd4d47f-e53f-44bb-9c98-7dbafa79ec2f">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="94acfe89-a1ec-4054-89d5-857f5c3004f1"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="11"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{SO Number}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="480" y="0" width="73" height="30" uuid="c4b01e34-aad5-46f4-98a7-6d50d6dfd237">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="462e19c7-ebc5-4ab4-b4b9-24dc4a333126"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="11"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{Status}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="80" y="0" width="190" height="30" uuid="c1d6709a-d962-43c3-bf76-460fc6c60498">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="969c5763-868b-4788-b966-1498d6b831e4"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="11"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{Display_Name-display_name}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="370" y="0" width="110" height="30" uuid="dbf054d8-55cd-487e-99ae-10d3e8352aa5">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="26d7f951-8e46-4b2e-b073-2cff9a705fa0"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="11"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{Shipping_Paid_by-shipping_paid_by}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<columnFooter>
+		<band height="45" splitType="Stretch"/>
+	</columnFooter>
+	<pageFooter>
+		<band height="54" splitType="Stretch"/>
+	</pageFooter>
+	<summary>
+		<band height="42" splitType="Stretch"/>
+	</summary>
+</jasperReport>
diff --git a/jasper_reports/custom_reports/logbook_sj.jrxml b/jasper_reports/custom_reports/logbook_sj.jrxml
index 9cf38e4..388dbcb 100644
--- a/jasper_reports/custom_reports/logbook_sj.jrxml
+++ b/jasper_reports/custom_reports/logbook_sj.jrxml
@@ -48,6 +48,10 @@
 		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Logbook_SJ_Line-report_logbook_sj_line/Departure_Date-departure_date"/>
 		<fieldDescription><![CDATA[/data/record/Logbook_SJ_Line-report_logbook_sj_line/Departure_Date-departure_date]]></fieldDescription>
 	</field>
+	<field name="Parent_name-parent_name" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Logbook_SJ_Line-report_logbook_sj_line/Customer-partner_id/Parent_name-parent_name"/>
+		<fieldDescription><![CDATA[/data/record/Logbook_SJ_Line-report_logbook_sj_line/Customer-partner_id/Parent_name-parent_name]]></fieldDescription>
+	</field>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
@@ -120,7 +124,7 @@
 				<text><![CDATA[Customer]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="92" y="0" width="90" height="30" uuid="e9a6b68f-a462-4e5a-b3f5-c4f5102820fa"/>
+				<reportElement x="91" y="0" width="90" height="30" uuid="e9a6b68f-a462-4e5a-b3f5-c4f5102820fa"/>
 				<box>
 					<pen lineWidth="1.0"/>
 				</box>
@@ -130,7 +134,7 @@
 				<text><![CDATA[No Picking]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="182" y="0" width="90" height="30" uuid="acd8a5fc-92b6-411c-909d-13f37dfb1efe"/>
+				<reportElement x="181" y="0" width="90" height="30" uuid="acd8a5fc-92b6-411c-909d-13f37dfb1efe"/>
 				<box>
 					<pen lineWidth="1.0"/>
 				</box>
@@ -140,7 +144,7 @@
 				<text><![CDATA[No SO]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="273" y="0" width="90" height="30" uuid="cfbb56e7-92c7-4c14-acd0-b6e21aed682b"/>
+				<reportElement x="271" y="0" width="90" height="30" uuid="cfbb56e7-92c7-4c14-acd0-b6e21aed682b"/>
 				<box>
 					<pen lineWidth="1.0"/>
 				</box>
@@ -150,7 +154,7 @@
 				<text><![CDATA[Driver]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="363" y="0" width="90" height="30" uuid="2e566559-f915-4dd7-b092-8a3bf382120d"/>
+				<reportElement x="361" y="0" width="90" height="30" uuid="2e566559-f915-4dd7-b092-8a3bf382120d"/>
 				<box>
 					<pen lineWidth="1.0"/>
 				</box>
@@ -160,7 +164,7 @@
 				<text><![CDATA[Shipping Method]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="453" y="0" width="92" height="30" uuid="6d462229-750c-492f-a7d5-358097e8355a"/>
+				<reportElement x="451" y="0" width="92" height="30" uuid="6d462229-750c-492f-a7d5-358097e8355a"/>
 				<box>
 					<pen lineWidth="1.0"/>
 				</box>
@@ -173,17 +177,6 @@
 	</columnHeader>
 	<detail>
 		<band height="30" splitType="Stretch">
-			<textField>
-				<reportElement x="1" y="0" width="90" height="30" uuid="b05a45f2-b836-488d-bef7-797cdce16ddf">
-					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="a6dc69da-7c59-4895-9302-1da41ffe990b"/>
-				</reportElement>
-				<box>
-					<topPen lineWidth="0.5"/>
-					<bottomPen lineWidth="0.5"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{Customer}]]></textFieldExpression>
-			</textField>
 			<textField>
 				<reportElement x="91" y="0" width="91" height="30" uuid="1bab2b10-cbff-46d8-aead-2fe0604fcb5f">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="02c28e92-1108-4659-97c1-7a47f06e979e"/>
@@ -196,7 +189,7 @@
 				<textFieldExpression><![CDATA[$F{PO}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="182" y="0" width="90" height="30" uuid="90affdf0-a109-4a5d-be7e-1444767d09cd">
+				<reportElement x="182" y="0" width="89" height="30" uuid="90affdf0-a109-4a5d-be7e-1444767d09cd">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="38404627-3374-4b80-bc1c-20fe87aab743"/>
 				</reportElement>
 				<box>
@@ -207,7 +200,7 @@
 				<textFieldExpression><![CDATA[$F{SO}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="273" y="0" width="90" height="30" uuid="71463154-d00d-413e-a1a1-e2881d6ef809">
+				<reportElement x="271" y="0" width="90" height="30" uuid="71463154-d00d-413e-a1a1-e2881d6ef809">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="bfd8dec3-2bc9-4b38-a643-e18724aaf3ed"/>
 				</reportElement>
 				<box>
@@ -218,7 +211,7 @@
 				<textFieldExpression><![CDATA[$F{Driver}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="363" y="0" width="90" height="30" uuid="6d4b0665-5a7c-474e-b2f8-1acde0e36a06">
+				<reportElement x="361" y="0" width="90" height="30" uuid="6d4b0665-5a7c-474e-b2f8-1acde0e36a06">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="b92bdba1-3992-4940-874a-4159fa47e605"/>
 				</reportElement>
 				<box>
@@ -229,7 +222,7 @@
 				<textFieldExpression><![CDATA[$F{Shipping Method}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="453" y="0" width="92" height="30" uuid="465e4dce-f36e-4d61-9f26-4b1dea2d1cda">
+				<reportElement x="451" y="0" width="92" height="30" uuid="465e4dce-f36e-4d61-9f26-4b1dea2d1cda">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="3a1e60b9-75bb-4594-a1b1-13be9ad8219b"/>
 				</reportElement>
 				<box>
@@ -239,6 +232,19 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{Deparutre Date}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement x="1" y="0" width="90" height="30" uuid="afddf8fa-2f8e-4297-8ed6-3b624fb3330e">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="ab32b878-aa1c-4663-8396-ecdab500a66c"/>
+				</reportElement>
+				<box>
+					<topPen lineWidth="0.5"/>
+					<bottomPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{Parent_name-parent_name} != null && !$F{Parent_name-parent_name}.isEmpty() ? 
+			        $F{Parent_name-parent_name} : 
+			        $F{Customer}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<columnFooter>
diff --git a/jasper_reports/custom_reports/proforma_invoice.jrxml b/jasper_reports/custom_reports/proforma_invoice.jrxml
index 26e04cc..0bdfee6 100755
--- a/jasper_reports/custom_reports/proforma_invoice.jrxml
+++ b/jasper_reports/custom_reports/proforma_invoice.jrxml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.20.0.final using JasperReports Library version 6.20.0-2bc7ab61c56f459e8176eb05c7705e145cd400ad  -->
+<!-- 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="sales_without_disc" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="5569a288-a46f-49ec-91b2-f60f77ccdd63">
-	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="Sale Order Dev XML"/>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="saleorderlokal.jrdax"/>
 	<property name="com.jaspersoft.studio.data.sql.SQLQueryDesigner.sash.w1" value="261"/>
 	<property name="com.jaspersoft.studio.data.sql.SQLQueryDesigner.sash.w2" value="733"/>
 	<property name="ODOO_RELATIONS">
@@ -122,6 +122,10 @@
 		<property name="net.sf.jasperreports.xpath.field.expression" value="Payment_Terms-payment_term_id/Payment_Terms-name"/>
 		<fieldDescription><![CDATA[Payment_Terms-payment_term_id/Payment_Terms-name]]></fieldDescription>
 	</field>
+	<field name="Product_Image-image_small" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="Order_Lines-order_line/Product_Image-image_small"/>
+		<fieldDescription><![CDATA[Order_Lines-order_line/Product_Image-image_small]]></fieldDescription>
+	</field>
 	<variable name="UnitPrice" class="java.math.BigDecimal">
 		<variableExpression><![CDATA[$F{Included_in_Price-price_include}=="True"
 	?$F{pricewithtax}.equals("")?new BigDecimal("0"):new BigDecimal($F{pricewithtax})
@@ -230,9 +234,9 @@ Indonesia]]></text>
 		</band>
 	</pageHeader>
 	<columnHeader>
-		<band height="20" splitType="Stretch">
+		<band height="21" splitType="Stretch">
 			<staticText>
-				<reportElement x="0" y="0" width="265" height="20" forecolor="#000066" uuid="d3c73a17-1a25-4dfb-9072-96bd673f1574">
+				<reportElement x="80" y="0" width="185" height="20" forecolor="#000066" uuid="d3c73a17-1a25-4dfb-9072-96bd673f1574">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="a14cd5e1-8456-4ddb-9362-01aa96837ebc"/>
 				</reportElement>
 				<box>
@@ -275,12 +279,23 @@ Indonesia]]></text>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<text><![CDATA[Amount]]></text>
 			</staticText>
+			<staticText>
+				<reportElement x="0" y="0" width="80" height="20" forecolor="#000066" uuid="f1224bf6-77ba-4bc5-bc85-e208f92b3be0">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="a799cdde-15df-4f44-a5d1-e148a3ec898b"/>
+				</reportElement>
+				<box>
+					<topPen lineWidth="0.0" lineColor="#030303"/>
+					<bottomPen lineWidth="0.25" lineColor="#030303"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<text><![CDATA[Image]]></text>
+			</staticText>
 		</band>
 	</columnHeader>
 	<detail>
-		<band height="20" splitType="Stretch">
+		<band height="50" splitType="Stretch">
 			<textField isBlankWhenNull="true">
-				<reportElement x="265" y="0" width="40" height="20" uuid="9ea04257-114c-4a32-a57c-825bff2fb289">
+				<reportElement x="265" y="0" width="40" height="50" uuid="9ea04257-114c-4a32-a57c-825bff2fb289">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="a799cdde-15df-4f44-a5d1-e148a3ec898b"/>
 				</reportElement>
 				<box>
@@ -294,7 +309,7 @@ Indonesia]]></text>
 				<textFieldExpression><![CDATA[$F{qty}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="305" y="0" width="50" height="20" uuid="0f0b8830-f25a-4fb0-9db3-e2c24d43edf9">
+				<reportElement x="305" y="0" width="50" height="50" uuid="0f0b8830-f25a-4fb0-9db3-e2c24d43edf9">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="ae4680ee-5de0-468d-9294-75cb0dd03490"/>
 				</reportElement>
 				<box>
@@ -308,7 +323,7 @@ Indonesia]]></text>
 				<textFieldExpression><![CDATA[$F{uomname}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00#;(#,##0.00#-)">
-				<reportElement x="355" y="0" width="100" height="20" uuid="93441816-7747-40d0-aae8-1b71df8c2a12"/>
+				<reportElement x="355" y="0" width="100" height="50" uuid="93441816-7747-40d0-aae8-1b71df8c2a12"/>
 				<box>
 					<pen lineWidth="0.0"/>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -320,7 +335,7 @@ Indonesia]]></text>
 				<textFieldExpression><![CDATA[$V{UnitPrice}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00#;(#,##0.00#-)">
-				<reportElement x="455" y="0" width="100" height="20" uuid="1769c5ba-1cc0-4053-965a-6a2af93d4e1b"/>
+				<reportElement x="455" y="0" width="100" height="50" uuid="1769c5ba-1cc0-4053-965a-6a2af93d4e1b"/>
 				<box>
 					<pen lineWidth="0.0"/>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -332,7 +347,7 @@ Indonesia]]></text>
 				<textFieldExpression><![CDATA[$V{Amount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="0" y="0" width="265" height="20" uuid="33c8dc87-4428-4535-9dc0-113385409a3d">
+				<reportElement x="80" y="0" width="185" height="50" uuid="33c8dc87-4428-4535-9dc0-113385409a3d">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="1539fbdd-77c7-45fe-b8ea-5a6e33af620d"/>
 				</reportElement>
 				<textElement verticalAlignment="Middle">
@@ -340,6 +355,20 @@ Indonesia]]></text>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{Description-orderline}]]></textFieldExpression>
 			</textField>
+			<image hAlign="Center" onErrorType="Blank">
+				<reportElement x="0" y="0" width="80" height="50" isRemoveLineWhenBlank="true" uuid="eebc72c7-0f1d-411e-bc04-a0d037e7e97c">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="cc4a5789-2434-434e-b7f5-03f64145e6ad"/>
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<box>
+					<pen lineWidth="1.0" lineStyle="Solid"/>
+					<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>
+				<imageExpression><![CDATA[$F{Product_Image-image_small}]]></imageExpression>
+			</image>
 		</band>
 	</detail>
 	<summary>
@@ -398,13 +427,13 @@ Indonesia]]></text>
 				<textElement verticalAlignment="Middle">
 					<font size="8"/>
 				</textElement>
-				<text><![CDATA[1. Kirimkan Data NPWP & SPPKP pada saat pertama kali melakukan pemesanan ke finance@indoteknik.co.id
-2. Penawaran ini memiliki jangka waktu, harga, dan stock tidak mengikat
-3. Pembelian tidak dapat dikembalikan
-
-Data Bank PT. INDOTEKNIK DOTCOM GEMILANG
-BCA CAB. PURI BOTANICAL Acc. No. 8870 4000 81
-Pembayaran giro/cek dinyatakan lunas hanya setelah pencairan
+				<text><![CDATA[1. Kirimkan Data NPWP & SPPKP pada saat pertama kali melakukan pemesanan ke finance@indoteknik.co.id
+2. Penawaran ini memiliki jangka waktu, harga, dan stock tidak mengikat
+3. Pembelian tidak dapat dikembalikan
+
+Data Bank PT. INDOTEKNIK DOTCOM GEMILANG
+BCA CAB. PURI BOTANICAL Acc. No. 8870 4000 81
+Pembayaran giro/cek dinyatakan lunas hanya setelah pencairan
 Biaya administrasi bank dibebankan ke konsumen]]></text>
 			</staticText>
 		</band>
diff --git a/jasper_reports/custom_reports/saleorderimage.jrxml b/jasper_reports/custom_reports/saleorderimage.jrxml
index 791aedc..d394737 100644
--- a/jasper_reports/custom_reports/saleorderimage.jrxml
+++ b/jasper_reports/custom_reports/saleorderimage.jrxml
@@ -128,6 +128,18 @@
 		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Order_Lines-order_line/Description-name"/>
 		<fieldDescription><![CDATA[/data/record/Order_Lines-order_line/Description-name]]></fieldDescription>
 	</field>
+	<field name="Payment_Terms-payment_term_id" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Payment_Terms-payment_term_id"/>
+		<fieldDescription><![CDATA[/data/record/Payment_Terms-payment_term_id]]></fieldDescription>
+	</field>
+	<field name="Terms_and_conditions-note" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Terms_and_conditions-note"/>
+		<fieldDescription><![CDATA[/data/record/Terms_and_conditions-note]]></fieldDescription>
+	</field>
+	<field name="Payment_Terms-name" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Payment_Terms-payment_term_id/Payment_Terms-name"/>
+		<fieldDescription><![CDATA[/data/record/Payment_Terms-payment_term_id/Payment_Terms-name]]></fieldDescription>
+	</field>
 	<variable name="subtotal" class="java.math.BigDecimal">
 		<variableExpression><![CDATA[new BigDecimal($F{Untaxed_Amount-amount_untaxed})]]></variableExpression>
 	</variable>
@@ -226,6 +238,16 @@ Indonesia]]></text>
 				<textElement verticalAlignment="Top"/>
 				<textFieldExpression><![CDATA[$F{Customer_Reference-client_order_ref}]]></textFieldExpression>
 			</textField>
+			<staticText>
+				<reportElement x="1" y="110" width="89" height="20" forecolor="#000066" uuid="8f68ff85-c74f-4d9a-81a8-18901cfa0de2"/>
+				<textElement verticalAlignment="Middle"/>
+				<text><![CDATA[Payment Term :]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="90" y="110" width="190" height="20" uuid="708ca3a1-0a06-4724-b511-fd41a65450e3"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{Payment_Terms-name}]]></textFieldExpression>
+			</textField>
 		</band>
 	</title>
 	<columnHeader>
@@ -483,13 +505,6 @@ Indonesia]]></text>
 				</textElement>
 				<text><![CDATA[Total :]]></text>
 			</staticText>
-			<staticText>
-				<reportElement x="2" y="120" width="556" height="40" uuid="698ac1df-f661-4e72-8166-37bde455c352"/>
-				<text><![CDATA[1. Kirimkan Data NPWP & SPPKP pada saat pertama kali melakukan pemesanan ke finance@indoteknik.co.id.
-2. Penawaran ini memiliki jangka waktu, harga dan stok tidak mengikat.
-3. Pembelian tidak dapat dikembalikan.
-]]></text>
-			</staticText>
 			<staticText>
 				<reportElement x="437" y="53" width="43" height="20" uuid="67b996f7-8233-45c1-ab3a-9c4f7debde8c">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="2dfd3f0c-531e-450e-86fc-9aa69249f4a4"/>
@@ -523,13 +538,6 @@ Indonesia]]></text>
 					<pen lineWidth="1.0"/>
 				</graphicElement>
 			</line>
-			<staticText>
-				<reportElement x="1" y="170" width="556" height="40" uuid="9d700a0d-5d35-4eb5-97d7-eddcd069c1dd"/>
-				<text><![CDATA[Data Bank PT. INDOTEKNIK DOTCOM GEMILANG
-BCA CAB. PURI BOTANICAL Acc. No. 8870 4000 81
-Pembayaran giro/cek dinyatakan lunas hanya setelah pencairan.
-]]></text>
-			</staticText>
 			<textField pattern="#,###.00#;(#,###.00#-)" isBlankWhenNull="false">
 				<reportElement x="480" y="53" width="76" height="20" uuid="bd23120c-46ba-4860-b819-53c7d034ff88"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
@@ -604,6 +612,10 @@ Pembayaran giro/cek dinyatakan lunas hanya setelah pencairan.
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$V{grand_total}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement x="0" y="113" width="556" height="151" uuid="a7a360bd-a723-46e1-811d-21b86a53fec7"/>
+				<textFieldExpression><![CDATA[$F{Terms_and_conditions-note}]]></textFieldExpression>
+			</textField>
 		</band>
 	</summary>
 </jasperReport>
-- 
cgit v1.2.3