#41 changed static text field

metasfresh · Oct 25, 2017 · 6697aae · 6697aae
1 parent de5a8f3
commit 6697aae
Showing 1 changed file with 23 additions and 19 deletions.
diff --git a/base/src/main/jasperreports/de/metas/docs/generics/report_bp_org_block_left_small.jrxml b/base/src/main/jasperreports/de/metas/docs/generics/report_bp_org_block_left_small.jrxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Jaspersoft Studio version 6.3.1.final using JasperReports Library version 6.3.1  -->
-<!-- 2017-09-14T10:17:18 -->
+<!-- 2017-10-24T15:24:05 -->
 <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="report_bpblock" pageWidth="250" pageHeight="150" columnWidth="250" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" resourceBundle="de/metas/docs/generics/report" uuid="6cc02216-72bb-41b0-ae21-d670206ee05e">
 	<property name="ireport.scriptlethandling" value="0"/>
 	<property name="ireport.encoding" value="UTF-8"/>
@@ -10,14 +10,6 @@
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="metasfresh"/>
 	<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
 	<property name="com.jaspersoft.studio.unit." value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.pageHeight" value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.pageWidth" value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.topMargin" value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.bottomMargin" value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.leftMargin" value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.rightMargin" value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.columnWidth" value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.columnSpacing" value="pixel"/>
 	<import value="net.sf.jasperreports.engine.*"/>
 	<import value="java.util.*"/>
 	<import value="net.sf.jasperreports.engine.data.*"/>
@@ -34,17 +26,26 @@
 		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
 	</parameter>
 	<queryString>
-		<![CDATA[SELECT 	*
+		<![CDATA[SELECT 	*, 
+(SELECT 	 loc.postal ||' '|| loc.city as pp_block
+FROM 
+	c_bpartner org_bp
+		JOIN c_bpartner_location org_bpl 	ON org_bp.c_bpartner_id	= org_bpl.c_bpartner_id AND org_bpl.isActive = 'Y'
+		JOIN c_location loc	 		ON org_bpl.c_location_id	= loc.c_location_id AND loc.isActive = 'Y'
+		WHERE
+			org_bp.ad_orgbp_id = $1 AND org_bp.isActive = 'Y'
+			and org_bpl.isbillto = 'Y')
 FROM 	de_metas_endcustomer_fresh_reports.Docs_Generics_BPartner_Report( $P{org_id}, $P{doctype}, $P{bp_loc_id}, $P{RECORD_ID} )
 ;]]>
 	</queryString>
 	<field name="org_addressline" class="java.lang.String"/>
 	<field name="addressblock" class="java.lang.String"/>
+	<field name="pp_block" class="java.lang.String"/>
 	<background>
 		<band height="50" splitType="Stretch"/>
 	</background>
 	<title>
-		<band height="140" splitType="Stretch">
+		<band height="149" splitType="Stretch">
 			<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 			<textField>
 				<reportElement x="0" y="41" width="188" height="96" uuid="6622332f-b31d-40fc-add3-777b8f875905">
@@ -57,11 +58,9 @@ FROM 	de_metas_endcustomer_fresh_reports.Docs_Generics_BPartner_Report( $P{org_i
 				<textFieldExpression><![CDATA[$F{addressblock}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="126" y="14" width="104" height="12" uuid="4b99bcc1-d46f-4b92-ba33-860c86089c6a">
-					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
-				</reportElement>
+				<reportElement x="126" y="14" width="120" height="12" uuid="4b99bcc1-d46f-4b92-ba33-860c86089c6a"/>
 				<textElement textAlignment="Left">
-					<font size="9" isBold="false" isUnderline="false"/>
+					<font fontName="Calibri" size="6" isBold="false" isUnderline="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{org_addressline}]]></textFieldExpression>
 			</textField>
@@ -92,10 +91,15 @@ FROM 	de_metas_endcustomer_fresh_reports.Docs_Generics_BPartner_Report( $P{org_i
 				<reportElement x="192" y="0" width="58" height="21" uuid="d7a41fcd-418e-443f-80fb-7649eca2bfc0"/>
 				<text><![CDATA[Post CH AG]]></text>
 			</staticText>
-			<staticText>
-				<reportElement x="50" y="2" width="60" height="29" uuid="75d89c3c-0729-478e-b480-87194e4cf16d"/>
-				<text><![CDATA[CH-8008 Zürich]]></text>
-			</staticText>
+			<textField>
+				<reportElement x="50" y="2" width="60" height="29" uuid="bf58e45d-cc31-4e96-8798-6a5e39c810fc">
+					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+				</reportElement>
+				<textFieldExpression><![CDATA["CH-"+ $F{pp_block}]]></textFieldExpression>
+			</textField>
 		</band>
 	</title>
 	<pageHeader>