add payment term in so and proforma, add alamat tempel

3 files changed, 174 insertions, 2 deletions

diff --git a/jasper_reports/custom_reports/AlamatTempel.jrxml b/jasper_reports/custom_reports/AlamatTempel.jrxml
new file mode 100644
index 0000000..90b44e9
--- /dev/null
+++ b/jasper_reports/custom_reports/AlamatTempel.jrxml
@@ -0,0 +1,144 @@
+<?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="AlamatTempel" pageWidth="298" pageHeight="420" columnWidth="258" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="2e0fdfd1-3a8c-4786-9270-fad3a8435726">
+	<property name="com.jaspersoft.studio.unit." value="mm"/>
+	<property name="com.jaspersoft.studio.unit.pageHeight" value="mm"/>
+	<property name="com.jaspersoft.studio.unit.pageWidth" value="mm"/>
+	<property name="com.jaspersoft.studio.unit.topMargin" value="mm"/>
+	<property name="com.jaspersoft.studio.unit.bottomMargin" value="mm"/>
+	<property name="com.jaspersoft.studio.unit.leftMargin" value="mm"/>
+	<property name="com.jaspersoft.studio.unit.rightMargin" value="mm"/>
+	<property name="com.jaspersoft.studio.unit.columnWidth" value="mm"/>
+	<property name="com.jaspersoft.studio.unit.columnSpacing" value="mm"/>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="Stock Picking"/>
+	<property name="ODOO_RELATIONS">
+		<![CDATA[['move_lines']]]>
+	</property>
+	<queryString language="XPath">
+		<![CDATA[]]>
+	</queryString>
+	<field name="Delivery_Method-name" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Carrier-carrier_id/Delivery_Method-name"/>
+		<fieldDescription><![CDATA[/data/record/Carrier-carrier_id/Delivery_Method-name]]></fieldDescription>
+	</field>
+	<field name="salesperson" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Sales_Order-sale_id/Salesperson-user_id/Name-name"/>
+		<fieldDescription><![CDATA[/data/record/Sales_Order-sale_id/Salesperson-user_id/Name-name]]></fieldDescription>
+	</field>
+	<field name="salesphone" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Sales_Order-sale_id/Salesperson-user_id/Phone-phone"/>
+		<fieldDescription><![CDATA[/data/record/Sales_Order-sale_id/Salesperson-user_id/Phone-phone]]></fieldDescription>
+	</field>
+	<field name="Email-email" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Sales_Order-sale_id/Salesperson-user_id/Email-email"/>
+		<fieldDescription><![CDATA[/data/record/Sales_Order-sale_id/Salesperson-user_id/Email-email]]></fieldDescription>
+	</field>
+	<field name="Street-street" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Sales_Order-sale_id/Customer-partner_id/Street-street"/>
+		<fieldDescription><![CDATA[/data/record/Sales_Order-sale_id/Customer-partner_id/Street-street]]></fieldDescription>
+	</field>
+	<field name="Street2-street2" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Sales_Order-sale_id/Customer-partner_id/Street2-street2"/>
+		<fieldDescription><![CDATA[/data/record/Sales_Order-sale_id/Customer-partner_id/Street2-street2]]></fieldDescription>
+	</field>
+	<field name="customername" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Sales_Order-sale_id/Customer-partner_id/Name-name"/>
+		<fieldDescription><![CDATA[/data/record/Sales_Order-sale_id/Customer-partner_id/Name-name]]></fieldDescription>
+	</field>
+	<field name="customerphone" class="java.lang.String">
+		<property name="net.sf.jasperreports.xpath.field.expression" value="/data/record/Sales_Order-sale_id/Customer-partner_id/Phone-phone"/>
+		<fieldDescription><![CDATA[/data/record/Sales_Order-sale_id/Customer-partner_id/Phone-phone]]></fieldDescription>
+	</field>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="50" splitType="Stretch">
+			<image>
+				<reportElement x="0" y="0" width="140" height="50" uuid="7dea8f16-ea36-4ebb-8665-3dd09535901d"/>
+				<imageExpression><![CDATA["/odoo14/images/logo_indoteknik_no_color.jpeg"]]></imageExpression>
+			</image>
+		</band>
+	</title>
+	<pageHeader>
+		<band height="130">
+			<staticText>
+				<reportElement x="0" y="0" width="250" height="10" uuid="9d7f7b14-43ea-4492-803f-6badaaa33c7f"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Ekspedisi]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="0" y="10" width="250" height="10" uuid="a08cdd15-9fab-4743-b1d0-d334986a1201"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{Delivery_Method-name}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="0" y="30" width="250" height="10" uuid="8705000a-f1e7-4efe-a18a-95ffc955921c"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Kepada]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="0" y="40" width="250" height="10" uuid="debdc706-5bc6-4b83-8592-848b6130fbbf"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{customername}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="0" y="50" width="250" height="20" uuid="ce154705-9c04-42d1-b050-16406ad46a1a"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{Street-street}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="0" y="70" width="250" height="20" uuid="2e2981a9-3514-4af3-92ac-99135dbb1831"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{Street2-street2}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="0" y="100" width="250" height="10" uuid="28ec38f8-9383-40e0-9631-b3ab587d1409"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Dari]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="0" y="110" width="80" height="10" uuid="c1d2b7b8-1df7-4920-aafd-3a8defdb5fdc"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<text><![CDATA[INDOTEKNIK.COM]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="80" y="110" width="170" height="10" uuid="d2d66d39-c8a1-4adc-a759-892ebe7df3c4"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{salesperson}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="0" y="120" width="80" height="10" uuid="61f4ad47-fe12-4ccf-af1e-4f5dab099949"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[NO HP]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="80" y="120" width="170" height="10" uuid="6a27d5df-b3af-4824-a036-5c87163a61a2"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{salesphone}]]></textFieldExpression>
+			</textField>
+		</band>
+	</pageHeader>
+</jasperReport>
diff --git a/jasper_reports/custom_reports/proforma_invoice.jrxml b/jasper_reports/custom_reports/proforma_invoice.jrxml
index 5190896..da09732 100755
--- a/jasper_reports/custom_reports/proforma_invoice.jrxml
+++ b/jasper_reports/custom_reports/proforma_invoice.jrxml
@@ -118,6 +118,10 @@
 		<property name="net.sf.jasperreports.xpath.field.expression" value="Order_Lines-order_line/Description-name"/>
 		<fieldDescription><![CDATA[Order_Lines-order_line/Description-name]]></fieldDescription>
 	</field>
+	<field name="Payment_Terms-name" class="java.lang.String">
+		<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>
 	<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})
@@ -184,7 +188,7 @@ Indonesia]]></text>
 				<textFieldExpression><![CDATA[$F{salesname}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="0" y="0" width="280" height="60" forecolor="#990000" uuid="2438177a-77fc-4cc7-aa10-9141c88f0ab5"/>
+				<reportElement x="0" y="20" width="280" height="40" forecolor="#990000" uuid="2438177a-77fc-4cc7-aa10-9141c88f0ab5"/>
 				<textElement verticalAlignment="Bottom" markup="none">
 					<font size="14" isBold="false"/>
 				</textElement>
@@ -213,6 +217,16 @@ Indonesia]]></text>
 				<reportElement x="280" y="0" width="275" height="20" uuid="85b92ba9-a425-421e-bf69-6bc6b1018099"/>
 				<textFieldExpression><![CDATA[$V{customer_name}]]></textFieldExpression>
 			</textField>
+			<staticText>
+				<reportElement x="0" y="0" width="90" height="20" forecolor="#000066" uuid="29d2b6e7-f7bc-41f6-bce3-c8d1e4c97d57"/>
+				<textElement verticalAlignment="Middle"/>
+				<text><![CDATA[Payment Term :]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="90" y="0" width="190" height="20" uuid="99ad62ba-1f0a-494d-9108-beebeb7f1c15"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{Payment_Terms-name}]]></textFieldExpression>
+			</textField>
 		</band>
 	</pageHeader>
 	<columnHeader>
diff --git a/jasper_reports/custom_reports/sales_without_disc.jrxml b/jasper_reports/custom_reports/sales_without_disc.jrxml
index 2e99453..e71a443 100755
--- a/jasper_reports/custom_reports/sales_without_disc.jrxml
+++ b/jasper_reports/custom_reports/sales_without_disc.jrxml
@@ -118,6 +118,10 @@
 		<property name="net.sf.jasperreports.xpath.field.expression" value="Order_Lines-order_line/Description-name"/>
 		<fieldDescription><![CDATA[Order_Lines-order_line/Description-name]]></fieldDescription>
 	</field>
+	<field name="Payment_Terms-name" class="java.lang.String">
+		<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>
 	<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})
@@ -184,7 +188,7 @@ Indonesia]]></text>
 				<textFieldExpression><![CDATA[$F{salesname}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="0" y="0" width="280" height="60" forecolor="#990000" uuid="2438177a-77fc-4cc7-aa10-9141c88f0ab5"/>
+				<reportElement x="0" y="20" width="280" height="40" forecolor="#990000" uuid="2438177a-77fc-4cc7-aa10-9141c88f0ab5"/>
 				<textElement verticalAlignment="Bottom" markup="none">
 					<font size="14" isBold="false"/>
 				</textElement>
@@ -213,6 +217,16 @@ Indonesia]]></text>
 				<reportElement x="280" y="0" width="275" height="20" uuid="f5c9f6ff-5207-4521-8418-7bb0b0058add"/>
 				<textFieldExpression><![CDATA[$V{customer_name}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement x="90" y="0" width="190" height="20" uuid="f848ac05-e9cc-488a-ba6c-21622c64d8f3"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{Payment_Terms-name}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="0" y="0" width="90" height="20" forecolor="#000066" uuid="19aef843-3dad-460e-94c2-bfb84ad74227"/>
+				<textElement verticalAlignment="Middle"/>
+				<text><![CDATA[Payment Term :]]></text>
+			</staticText>
 		</band>
 	</pageHeader>
 	<columnHeader>