From 83a6c4e3b897e663876bb51942890bc4d222d4d9 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 4 Jun 2019 14:14:34 +0200
Subject: [PATCH] offer-report: formatting tweaks
---
process/Offer_lib/process.js | 2 +-
report/Offer_report/reportData.jrxml | 15 +++++++++++++--
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index fd8a73ee28..91417aabca 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -229,7 +229,7 @@ OfferUtils.openOfferReport = function (pOfferID)
"DeliveryConditions" : translate.text("Deliveryspecification", language),
"OFFERPers" : (AddressUtils.getLetterSalutation() + ",").toString(), // TODO: AddrObject implementieren (addrobj.formatAddress("{ls},");)
"Articlenumber" : translate.text("Articlenumber", language),
- "OFFERAddr" : translate.text(offerData[0], language),
+ "OFFERAddr" : translate.text(offerData[0].trim(), language),
"PlusSalestax" : translate.text("Plus Salestax", language),
"Unitprice" : translate.text("Unitprice", language),
"directlyResponsible" : translate.text("Directly responsible:", language),
diff --git a/report/Offer_report/reportData.jrxml b/report/Offer_report/reportData.jrxml
index 16a6bc9114..c4ff328081 100644
--- a/report/Offer_report/reportData.jrxml
+++ b/report/Offer_report/reportData.jrxml
@@ -62,19 +62,30 @@
<band height="75">
<textField isStretchWithOverflow="true">
<reportElement x="20" y="0" width="177" height="48" uuid="b3b876cf-b4ce-4569-ae30-04ddc7690f9f"/>
+ <textElement>
+ <font size="8"/>
+ </textElement>
<textFieldExpression><![CDATA[$P{OFFERAddr}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="372" y="0" width="60" height="15" uuid="98f1140c-7c34-47fb-b4e8-cb3af8c29a80"/>
+ <textElement>
+ <font size="8"/>
+ </textElement>
<textFieldExpression><![CDATA[$P{Number}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="372" y="16" width="60" height="15" uuid="acd6017f-fa7c-43fb-9a7b-3a42b63a34cf"/>
+ <textElement>
+ <font size="8"/>
+ </textElement>
<textFieldExpression><![CDATA[$P{Date}]]></textFieldExpression>
</textField>
<textField pattern="dd.MM.yyyy">
<reportElement x="432" y="16" width="64" height="15" uuid="2329be0e-9970-416f-af01-812d1d60676b"/>
- <textElement textAlignment="Right"/>
+ <textElement textAlignment="Right">
+ <font size="8"/>
+ </textElement>
<textFieldExpression><![CDATA[$F{OFFER_OFFERDATE}]]></textFieldExpression>
</textField>
<staticText>
@@ -94,7 +105,7 @@
<textField>
<reportElement x="432" y="0" width="64" height="15" uuid="99c69604-7df6-432e-a492-6c31d8bd67fd"/>
<textElement textAlignment="Right">
- <font size="10"/>
+ <font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{OFFER_OFFERCODE} + "-" + $F{OFFER_VERSNR}]]></textFieldExpression>
</textField>
--
GitLab