Merge branch 'master' of bitbucket.org:altafixco/indoteknik14

5 files changed, 922 insertions, 19 deletions

diff --git a/jasper_reports/custom_reports/DeliverySlip_A5.jrxml b/jasper_reports/custom_reports/DeliverySlip_A5.jrxml
index 4a499ff..57c20b9 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  -->
 <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="Delivery Order XML"/>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="Stock Picking"/>
 	<property name="ODOO_RELATIONS">
 		<![CDATA[['move_line_ids_without_package']]]>
 	</property>
@@ -68,6 +68,14 @@
 		<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>
 	<variable name="Jumlah_Barang" class="java.lang.Integer" calculation="Count">
 		<variableExpression><![CDATA[$F{product_name}]]></variableExpression>
 	</variable>
@@ -193,8 +201,8 @@
 				<textElement>
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{Date}]]></textFieldExpression>
-				<patternExpression><![CDATA[new SimpleDateFormat("dd/MM/yyyy").format($F{Date})]]></patternExpression>
+				<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"/>
diff --git a/jasper_reports/custom_reports/DeliverySlip_A5_Font_Besar.jrxml b/jasper_reports/custom_reports/DeliverySlip_A5_Font_Besar.jrxml
new file mode 100644
index 0000000..43a14db
--- /dev/null
+++ b/jasper_reports/custom_reports/DeliverySlip_A5_Font_Besar.jrxml
@@ -0,0 +1,438 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.20.0.final using JasperReports Library version 6.20.0-2bc7ab61c56f459e8176eb05c7705e145cd400ad  -->
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Blank_A4_5" pageWidth="595" pageHeight="420" orientation="Landscape" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="7ca89ceb-4b1e-446c-bd67-06493bb506b1">
+	<property name="ODOO_RELATIONS">
+		<![CDATA[['move_line_ids_without_package']]]>
+	</property>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="Stock Picking"/>
+	<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>
+	<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="40" 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>
+		</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="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="420" y="0" width="60" 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>
+		</band>
+	</columnHeader>
+	<detail>
+		<band height="20" 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="20" 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="420" y="0" width="60" 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>
+		</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="50" 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>
+		</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
new file mode 100644
index 0000000..a7a285e
--- /dev/null
+++ b/jasper_reports/custom_reports/DeliverySlip_A5_Nomor_SO.jrxml
@@ -0,0 +1,459 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.20.0.final using JasperReports Library version 6.20.0-2bc7ab61c56f459e8176eb05c7705e145cd400ad  -->
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Blank_A4_5" pageWidth="595" pageHeight="420" orientation="Landscape" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="7ca89ceb-4b1e-446c-bd67-06493bb506b1">
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="Stock Picking"/>
+	<property name="ODOO_RELATIONS">
+		<![CDATA[['move_line_ids_without_package']]]>
+	</property>
+	<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>
+	<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="40" 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>
+		</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="370" 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="420" y="0" width="60" 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>
+		</band>
+	</columnHeader>
+	<detail>
+		<band height="23" 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="370" 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="420" y="0" width="60" 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>
+		</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="50" 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>
+		</band>
+	</summary>
+</jasperReport>
diff --git a/jasper_reports/custom_reports/proforma_invoice.jrxml b/jasper_reports/custom_reports/proforma_invoice.jrxml
index da09732..26e04cc 100755
--- a/jasper_reports/custom_reports/proforma_invoice.jrxml
+++ b/jasper_reports/custom_reports/proforma_invoice.jrxml
@@ -398,14 +398,13 @@ Indonesia]]></text>
 				<textElement verticalAlignment="Middle">
 					<font size="8"/>
 				</textElement>
-				<text><![CDATA[1. Harga sudah berikut Pajak Pertambahan Nilai (Ppn)
-2. Kirimkan Data NPWP & SPPKP pada saat pertama kali melakukan pemesanan ke finance@indoteknik.co.id
-3. Penawaran ini memiliki jangka waktu, harga, dan stock tidak mengikat
-4. 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/sales_without_disc.jrxml b/jasper_reports/custom_reports/sales_without_disc.jrxml
index e71a443..9f256e5 100755
--- a/jasper_reports/custom_reports/sales_without_disc.jrxml
+++ b/jasper_reports/custom_reports/sales_without_disc.jrxml
@@ -398,14 +398,13 @@ Indonesia]]></text>
 				<textElement verticalAlignment="Middle">
 					<font size="8"/>
 				</textElement>
-				<text><![CDATA[1. Harga sudah berikut Pajak Pertambahan Nilai (Ppn)
-2. Kirimkan Data NPWP & SPPKP pada saat pertama kali melakukan pemesanan ke finance@indoteknik.co.id
-3. Penawaran ini memiliki jangka waktu, harga, dan stock tidak mengikat
-4. 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>