#6938 Add price pattern

metasfresh · Jul 2, 2020 · 9024eb8 · 9024eb8
1 parent 31d607b
commit 9024eb8
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/...e.metas.fresh.base/src/main/jasperreports/de/metas/reports/pricelist/report_details.jrxml b/...e.metas.fresh.base/src/main/jasperreports/de/metas/reports/pricelist/report_details.jrxml
@@ -6,7 +6,7 @@
 	<property name="ireport.zoom" value="1.5"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
-	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="jasperreports\dev.xml"/>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="jasperreports\it.xml"/>
 	<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
 	<import value="net.sf.jasperreports.engine.*"/>
 	<import value="java.util.*"/>
@@ -73,9 +73,15 @@
 	<field name="pricestd" class="java.math.BigDecimal">
 		<property name="com.jaspersoft.studio.field.label" value="pricestd"/>
 	</field>
+	<field name="pricepattern1" class="java.lang.String">
+		<property name="com.jaspersoft.studio.field.label" value="pricepattern1"/>
+	</field>
 	<field name="altpricestd" class="java.math.BigDecimal">
 		<property name="com.jaspersoft.studio.field.label" value="altpricestd"/>
 	</field>
+	<field name="pricepattern2" class="java.lang.String">
+		<property name="com.jaspersoft.studio.field.label" value="pricepattern2"/>
+	</field>
 	<field name="hasaltprice" class="java.lang.Integer">
 		<property name="com.jaspersoft.studio.field.label" value="hasaltprice"/>
 	</field>
@@ -239,7 +245,7 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{itemproductname}]]></textFieldExpression>
 			</textField>
-			<textField pattern="###0.00" isBlankWhenNull="true">
+			<textField isBlankWhenNull="true">
 				<reportElement key="textField-20" x="523" y="0" width="40" height="12" forecolor="#000000" uuid="118a78d4-035b-4396-877b-f4e9c74bf281">
 					<printWhenExpression><![CDATA[new Boolean( $P{Alt_PriceList_Version_ID} != null
     && $F{altpricestd}.floatValue() != 0)]]></printWhenExpression>
@@ -254,6 +260,7 @@
 					<font size="9" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{altpricestd}]]></textFieldExpression>
+				<patternExpression><![CDATA[$F{pricepattern2}]]></patternExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="false">
 				<reportElement key="textField-13" x="259" y="0" width="73" height="12" forecolor="#000000" uuid="59b2ab77-d40e-4f8b-9f58-a1e8ba298a01"/>
@@ -299,7 +306,7 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{pricestd}]]></textFieldExpression>
 			</textField>
-			<textField pattern="###0.00" isBlankWhenNull="false">
+			<textField isBlankWhenNull="false">
 				<reportElement key="textField-20" x="476" y="0" width="47" height="12" forecolor="#000000" uuid="118a78d4-035b-4396-877b-f4e9c74bf281">
 					<printWhenExpression><![CDATA[new Boolean( $F{altpricestd} != null
     && !$F{pricestd}.equals( $F{altpricestd} )
@@ -315,6 +322,7 @@
 					<font fontName="Arial" size="9" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{pricestd}]]></textFieldExpression>
+				<patternExpression><![CDATA[$F{pricepattern1}]]></patternExpression>
 			</textField>
 		</band>
 	</detail>