change date sj

3 files changed, 32 insertions, 8 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
index f41a937..43a14db 100644
--- a/jasper_reports/custom_reports/DeliverySlip_A5_Font_Besar.jrxml
+++ b/jasper_reports/custom_reports/DeliverySlip_A5_Font_Besar.jrxml
@@ -1,10 +1,10 @@
 <?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="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>
@@ -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_Nomor_SO.jrxml b/jasper_reports/custom_reports/DeliverySlip_A5_Nomor_SO.jrxml
index 9f4d167..a7a285e 100644
--- a/jasper_reports/custom_reports/DeliverySlip_A5_Nomor_SO.jrxml
+++ b/jasper_reports/custom_reports/DeliverySlip_A5_Nomor_SO.jrxml
@@ -72,6 +72,14 @@
 		<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>
@@ -197,8 +205,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"/>