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

3 files changed, 308 insertions, 40 deletions

diff --git a/jasper_reports/custom_reports/DunningRun.jrxml b/jasper_reports/custom_reports/DunningRun.jrxml
index e76aba1..57f8af1 100644
--- a/jasper_reports/custom_reports/DunningRun.jrxml
+++ b/jasper_reports/custom_reports/DunningRun.jrxml
@@ -397,21 +397,21 @@ PT. Indoteknik Dotcom Gemilang
 			</staticText>
 			<staticText>
 				<reportElement x="240" y="31" width="110" height="19" uuid="2d02021f-ffd3-4694-917d-0bf584038278"/>
-				<text><![CDATA[Yang menyerahkan,

-

-

-

-

+				<text><![CDATA[Yang menyerahkan,
+
+
+
+
 ]]></text>
 			</staticText>
 			<image>
 				<reportElement x="231" y="51" width="126" height="59" uuid="7ddbd82e-5e16-4e91-8220-26b35cef48db"/>
-				<imageExpression><![CDATA["https://erp.indoteknik.com/api/image/ir.attachment/datas/1839336"]]></imageExpression>
+				<imageExpression><![CDATA["https://erp.indoteknik.com/api/image/ir.attachment/datas/1892527"]]></imageExpression>
 			</image>
 			<staticText>
 				<reportElement x="248" y="110" width="82" height="20" uuid="526748bf-97a4-470e-a0a9-4530098f3048"/>
 				<textElement textAlignment="Center"/>
-				<text><![CDATA[Manzilah Septia]]></text>
+				<text><![CDATA[Widya Riyanti]]></text>
 			</staticText>
 		</band>
 	</summary>
diff --git a/jasper_reports/custom_reports/PickingList.jrxml b/jasper_reports/custom_reports/PickingList.jrxml
index 27fd997..6ee9d43 100755
--- a/jasper_reports/custom_reports/PickingList.jrxml
+++ b/jasper_reports/custom_reports/PickingList.jrxml
@@ -45,6 +45,58 @@
 		<property name="net.sf.jasperreports.xpath.field.expression" value="Source_Document-origin"/>
 		<fieldDescription><![CDATA[Source_Document-origin]]></fieldDescription>
 	</field>
+	<field name="Delivery_Method-name" 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="forecast_qty" class="java.math.BigDecimal">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="Stock_moves_not_in_package-move_ids_without_package/Forecast_Availability-forecast_availability"/>
+		<fieldDescription><![CDATA[Stock_moves_not_in_package-move_ids_without_package/Forecast_Availability-forecast_availability]]></fieldDescription>
+	</field>
+	<field name="uom_name" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="Stock_moves_not_in_package-move_ids_without_package/Unit_of_Measure-product_uom/Unit_of_Measure-name"/>
+		<fieldDescription><![CDATA[Stock_moves_not_in_package-move_ids_without_package/Unit_of_Measure-product_uom/Unit_of_Measure-name]]></fieldDescription>
+	</field>
+	<field name="Inventory_Availability-inventory_availability" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="Stock_moves_not_in_package-move_ids_without_package/Product-product_id/Inventory_Availability-inventory_availability"/>
+		<fieldDescription><![CDATA[Stock_moves_not_in_package-move_ids_without_package/Product-product_id/Inventory_Availability-inventory_availability]]></fieldDescription>
+	</field>
+	<field name="Quantity_On_Hand-qty_available" class="java.math.BigDecimal">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="Stock_moves_not_in_package-move_ids_without_package/Product-product_id/Quantity_On_Hand-qty_available"/>
+		<fieldDescription><![CDATA[Stock_moves_not_in_package-move_ids_without_package/Product-product_id/Quantity_On_Hand-qty_available]]></fieldDescription>
+	</field>
+	<field name="Full_Location_Name-complete_name" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="Stock_moves_not_in_package-move_ids_without_package/Source_Location-location_id/Full_Location_Name-complete_name"/>
+		<fieldDescription><![CDATA[Stock_moves_not_in_package-move_ids_without_package/Source_Location-location_id/Full_Location_Name-complete_name]]></fieldDescription>
+	</field>
+	<field name="location_display_name" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="Stock_moves_not_in_package-move_ids_without_package/Source_Location-location_id/Display_Name-display_name"/>
+		<fieldDescription><![CDATA[Stock_moves_not_in_package-move_ids_without_package/Source_Location-location_id/Display_Name-display_name]]></fieldDescription>
+	</field>
+	<field name="partner_display_name" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="Contact-partner_id/Display_Name-display_name"/>
+		<fieldDescription><![CDATA[Contact-partner_id/Display_Name-display_name]]></fieldDescription>
+	</field>
+	<field name="status_state" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="Status-state"/>
+		<fieldDescription><![CDATA[Status-state]]></fieldDescription>
+	</field>
+	<field name="scheduled_date" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="Scheduled_Date-scheduled_date"/>
+		<fieldDescription><![CDATA[Scheduled_Date-scheduled_date]]></fieldDescription>
+	</field>
+	<field name="weight" class="java.math.BigDecimal">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="Weight-weight"/>
+		<fieldDescription><![CDATA[Weight-weight]]></fieldDescription>
+	</field>
+	<field name="weight_uom" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="Weight_unit_of_measure_label-weight_uom_name"/>
+		<fieldDescription><![CDATA[Weight_unit_of_measure_label-weight_uom_name]]></fieldDescription>
+	</field>
+	<field name="qty_reserved" class="java.math.BigDecimal">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="Stock_moves_not_in_package-move_ids_without_package/Quantity_Reserved-reserved_availability"/>
+		<fieldDescription><![CDATA[Stock_moves_not_in_package-move_ids_without_package/Quantity_Reserved-reserved_availability]]></fieldDescription>
+	</field>
 	<variable name="SumQty" class="java.math.BigDecimal" calculation="Sum">
 		<variableExpression><![CDATA[$F{Demand-product_uom_qty}]]></variableExpression>
 	</variable>
@@ -52,6 +104,22 @@
 		<variableExpression><![CDATA[$F{Demand-product_uom_qty}]]></variableExpression>
 	</variable>
 	<variable name="PartnerName" class="java.lang.String"/>
+	<variable name="status" class="java.lang.String">
+		<variableExpression><![CDATA[$F{status_state}.equals("assigned")
+	? "Ready" 
+	: $F{status_state}.equals("confirmed")
+		? "Waiting" 
+		: $F{status_state}.equals("waiting")
+			? "Waiting Another Operation"
+			: $F{status_state}]]></variableExpression>
+		<initialValueExpression><![CDATA[$F{status_state}.equals("assigned")
+	? "Ready" 
+	: $F{status_state}.equals("confirmed")
+		? "Waiting" 
+		: $F{status_state}.equals("waiting")
+			? "Waiting Another Operation"
+			: $F{status_state}]]></initialValueExpression>
+	</variable>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
@@ -64,30 +132,102 @@
 		</band>
 	</title>
 	<pageHeader>
-		<band height="50" splitType="Stretch">
+		<band height="84" splitType="Stretch">
 			<textField>
-				<reportElement x="0" y="0" width="180" height="30" uuid="70b70e92-fd37-4045-a6e9-0efe5b553dbb"/>
+				<reportElement x="200" y="0" width="180" height="30" uuid="70b70e92-fd37-4045-a6e9-0efe5b553dbb"/>
 				<textElement verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{CustomerName-name}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{partner_display_name}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="180" y="0" width="200" height="30" uuid="609a5eaf-b3b3-4908-997a-b8d9662f0d82"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
+				<reportElement x="0" y="0" width="200" height="30" uuid="609a5eaf-b3b3-4908-997a-b8d9662f0d82"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{DocNoReference-name}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="180" y="30" width="200" height="20" uuid="d6cce15b-c49a-4122-87f7-53b9072f51bc"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle"/>
+				<reportElement x="0" y="50" width="70" height="20" uuid="d6cce15b-c49a-4122-87f7-53b9072f51bc"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
 				<textFieldExpression><![CDATA[$F{Source_Document-origin}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement x="230" y="50" width="80" height="20" uuid="e7684c20-5edd-4676-a4e4-4817b1d9d3b3"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{Delivery_Method-name}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="0" y="30" width="70" height="20" uuid="e8098600-d4b9-477f-8268-18ca54de1fa3"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Order:]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="70" y="30" width="70" height="20" uuid="85096316-3211-4121-867b-a979cc7c3cea"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Status:]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="140" y="30" width="90" height="20" uuid="fe9aa44d-5d2a-40fb-bfde-6affff2191d9"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Scheduled Date:]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="230" y="30" width="80" height="20" uuid="705e2324-4836-4580-bb9a-4425094b2800"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Carrier:]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="310" y="30" width="70" height="20" uuid="2c9d5567-12c6-4e01-a7ea-bbff70ed2af6"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Weight:]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="70" y="50" width="70" height="20" uuid="f861e0f7-8963-41c8-ac95-eafcd97df001"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{status}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="140" y="50" width="90" height="20" uuid="487fda54-c965-4a30-8c48-0351ace42750"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{scheduled_date}]]></textFieldExpression>
+			</textField>
+			<textField pattern="#00.###;(#00.###-)">
+				<reportElement x="310" y="50" width="30" height="20" uuid="9dd6810a-cb0d-40c8-943e-265464c78e8a"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{weight}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="340" y="50" width="40" height="20" uuid="e379fcd9-5f67-4f5e-8009-595bc88252eb"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{weight_uom}]]></textFieldExpression>
+			</textField>
 		</band>
 	</pageHeader>
 	<columnHeader>
 		<band height="20" splitType="Stretch">
 			<staticText>
-				<reportElement x="0" y="0" width="310" height="20" uuid="0e9068bc-1d75-4802-8d3c-67586c1c8b94">
+				<reportElement x="30" y="0" width="170" height="20" forecolor="#080278" uuid="0e9068bc-1d75-4802-8d3c-67586c1c8b94">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="cb0f2359-ee11-48ca-96cd-d0df561f9bcc"/>
 				</reportElement>
 				<box>
@@ -97,56 +237,187 @@
 				<text><![CDATA[Kode & Nama Barang]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="310" y="0" width="70" height="20" uuid="04ecff5f-cf8d-4dfd-8de7-7a4429e36150">
+				<reportElement x="200" y="0" width="60" height="20" forecolor="#080278" uuid="04ecff5f-cf8d-4dfd-8de7-7a4429e36150">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="de1ff7fb-ba90-40dc-b343-59f9ec2710ca"/>
 				</reportElement>
 				<box>
 					<bottomPen lineWidth="0.25"/>
 				</box>
-				<textElement textAlignment="Right" verticalAlignment="Middle"/>
-				<text><![CDATA[Qty]]></text>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Demand]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="0" y="0" width="30" height="20" forecolor="#080278" uuid="064a36cd-c552-4792-8552-114d28e6ce4b"/>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement verticalAlignment="Middle"/>
+				<text><![CDATA[No]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="260" y="0" width="40" height="20" forecolor="#080278" uuid="01234b47-d045-4dae-9e89-14fffc44167b">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="de1ff7fb-ba90-40dc-b343-59f9ec2710ca"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Reserve]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="300" y="0" width="40" height="20" forecolor="#080278" uuid="d0b948cf-ab6e-4b73-9b75-2093ecbb3a44">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="de1ff7fb-ba90-40dc-b343-59f9ec2710ca"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[OnHand]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="340" y="0" width="40" height="20" forecolor="#080278" uuid="6313f349-e253-441a-88d9-b919b6b12889">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="de1ff7fb-ba90-40dc-b343-59f9ec2710ca"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Source]]></text>
 			</staticText>
 		</band>
 	</columnHeader>
 	<detail>
-		<band height="20" splitType="Stretch">
+		<band height="22" splitType="Stretch">
 			<textField>
-				<reportElement x="0" y="0" width="310" height="20" uuid="a71f43a7-9234-4311-b2b5-cad4e125d3a7">
+				<reportElement x="30" y="0" width="170" height="20" uuid="a71f43a7-9234-4311-b2b5-cad4e125d3a7">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="cb0f2359-ee11-48ca-96cd-d0df561f9bcc"/>
 				</reportElement>
+				<box>
+					<topPen lineWidth="0.0"/>
+					<leftPen lineWidth="0.25"/>
+					<bottomPen lineWidth="0.25"/>
+					<rightPen lineWidth="0.25"/>
+				</box>
 				<textElement verticalAlignment="Middle">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{ProductDisplay_Name-display_name}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.###;(#,##0.###-)">
-				<reportElement x="310" y="0" width="70" height="20" uuid="bad07ba5-f6f0-47ff-a0b9-280627d17e6a">
+				<reportElement x="200" y="0" width="30" height="20" uuid="bad07ba5-f6f0-47ff-a0b9-280627d17e6a">
 					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="de1ff7fb-ba90-40dc-b343-59f9ec2710ca"/>
 				</reportElement>
-				<textElement textAlignment="Right" verticalAlignment="Middle"/>
+				<box>
+					<topPen lineWidth="0.0"/>
+					<leftPen lineWidth="0.25"/>
+					<bottomPen lineWidth="0.25"/>
+					<rightPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
 				<textFieldExpression><![CDATA[$F{Demand-product_uom_qty}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement x="0" y="0" width="30" height="20" uuid="4ddf826f-d106-4506-bcb2-a4a0968041a0"/>
+				<box>
+					<topPen lineWidth="0.0"/>
+					<leftPen lineWidth="0.25"/>
+					<bottomPen lineWidth="0.25"/>
+					<rightPen lineWidth="0.25"/>
+				</box>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$V{REPORT_COUNT}]]></textFieldExpression>
+			</textField>
+			<textField pattern="#,##0.###;(#,##0.###-)" isBlankWhenNull="true">
+				<reportElement x="260" y="0" width="40" height="20" uuid="d9ba32c9-c209-4960-9d61-e3037383c153">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="de1ff7fb-ba90-40dc-b343-59f9ec2710ca"/>
+				</reportElement>
+				<box>
+					<topPen lineWidth="0.0"/>
+					<leftPen lineWidth="0.25"/>
+					<bottomPen lineWidth="0.25"/>
+					<rightPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{qty_reserved}]]></textFieldExpression>
+			</textField>
+			<textField pattern="#,##0.###;(#,##0.###-)">
+				<reportElement x="230" y="0" width="30" height="20" uuid="3f804d35-b770-4dcf-87c7-e59777dd8fe8">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="de1ff7fb-ba90-40dc-b343-59f9ec2710ca"/>
+				</reportElement>
+				<box>
+					<topPen lineWidth="0.0"/>
+					<leftPen lineWidth="0.25"/>
+					<bottomPen lineWidth="0.25"/>
+					<rightPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{uom_name}]]></textFieldExpression>
+			</textField>
+			<textField pattern="#,##0.###;(#,##0.###-)" isBlankWhenNull="true">
+				<reportElement x="300" y="0" width="40" height="20" uuid="29910648-38a8-4d0b-9953-a520245f236d">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="de1ff7fb-ba90-40dc-b343-59f9ec2710ca"/>
+				</reportElement>
+				<box>
+					<topPen lineWidth="0.0"/>
+					<leftPen lineWidth="0.25"/>
+					<bottomPen lineWidth="0.25"/>
+					<rightPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{Quantity_On_Hand-qty_available}]]></textFieldExpression>
+			</textField>
+			<textField pattern="#,##0.###;(#,##0.###-)" isBlankWhenNull="true">
+				<reportElement x="340" y="0" width="40" height="20" uuid="cc2740a0-4bc7-426d-b145-9e2b4ffeda60">
+					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="de1ff7fb-ba90-40dc-b343-59f9ec2710ca"/>
+				</reportElement>
+				<box>
+					<topPen lineWidth="0.0"/>
+					<leftPen lineWidth="0.25"/>
+					<bottomPen lineWidth="0.25"/>
+					<rightPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{location_display_name}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<summary>
 		<band height="40" splitType="Stretch">
 			<textField pattern="#,##0.###;(#,##0.###-)">
-				<reportElement x="310" y="0" width="70" height="20" uuid="27e8c52e-5695-4c5a-98c2-686df7b414b7"/>
+				<reportElement x="170" y="0" width="60" height="20" uuid="27e8c52e-5695-4c5a-98c2-686df7b414b7"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$V{SumQty}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="310" y="20" width="70" height="20" uuid="f20eae90-18b1-49db-a91b-7770fea429b2"/>
+				<reportElement x="170" y="20" width="60" height="20" uuid="f20eae90-18b1-49db-a91b-7770fea429b2"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$V{CountQty}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="210" y="0" width="100" height="20" uuid="44400c16-dddb-46a7-90c4-dfdf22b8ce68"/>
+				<reportElement x="70" y="0" width="100" height="20" uuid="44400c16-dddb-46a7-90c4-dfdf22b8ce68"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<text><![CDATA[Total Qty]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="210" y="20" width="100" height="20" uuid="aa643be4-80e1-430c-9a69-cf9fcff7078d"/>
+				<reportElement x="70" y="20" width="100" height="20" uuid="aa643be4-80e1-430c-9a69-cf9fcff7078d"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<text><![CDATA[Jumlah Barang]]></text>
 			</staticText>
diff --git a/jasper_reports/custom_reports/sales_without_disc.jrxml b/jasper_reports/custom_reports/sales_without_disc.jrxml
index 9f256e5..d902a12 100755
--- a/jasper_reports/custom_reports/sales_without_disc.jrxml
+++ b/jasper_reports/custom_reports/sales_without_disc.jrxml
@@ -1,12 +1,12 @@
 <?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="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.sql.SQLQueryDesigner.sash.w1" value="261"/>
 	<property name="com.jaspersoft.studio.data.sql.SQLQueryDesigner.sash.w2" value="733"/>
 	<property name="ODOO_RELATIONS">
 		<![CDATA[['order_line']]]>
 	</property>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="Sales Order"/>
 	<queryString language="XPath">
 		<![CDATA[/data/record]]>
 	</queryString>
@@ -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="Terms_and_conditions-note" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="Terms_and_conditions-note"/>
+		<fieldDescription><![CDATA[Terms_and_conditions-note]]></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})
@@ -213,7 +217,7 @@ Indonesia]]></text>
 				<reportElement x="280" y="20" width="275" height="40" uuid="7e7d81ad-fb57-4528-bbd2-88f4d15f3ccc"/>
 				<textFieldExpression><![CDATA[$F{Street-street}]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField isBlankWhenNull="true">
 				<reportElement x="280" y="0" width="275" height="20" uuid="f5c9f6ff-5207-4521-8418-7bb0b0058add"/>
 				<textFieldExpression><![CDATA[$V{customer_name}]]></textFieldExpression>
 			</textField>
@@ -393,20 +397,13 @@ Indonesia]]></text>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$V{Total}]]></textFieldExpression>
 			</textField>
-			<staticText>
-				<reportElement x="0" y="60" width="555" height="99" uuid="f561a33c-50e8-4bfb-b0b3-f4d1628d6bb7"/>
-				<textElement verticalAlignment="Middle">
+			<textField>
+				<reportElement x="0" y="60" width="555" height="99" uuid="9ba61388-f101-473a-89f4-e64b5a767c83"/>
+				<textElement>
 					<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

-Biaya administrasi bank dibebankan ke konsumen]]></text>
-			</staticText>
+				<textFieldExpression><![CDATA[$F{Terms_and_conditions-note}]]></textFieldExpression>
+			</textField>
 		</band>
 	</summary>
 </jasperReport>