diff --git a/entity/Offer_entity/entityfields/header/valueProcess.js b/entity/Offer_entity/entityfields/header/valueProcess.js index c1dd2bbc6e368ccd25f363f47e8e86f6abceaa55..218011cdd8d2cb0d4ca85e11271a73152622074f 100644 --- a/entity/Offer_entity/entityfields/header/valueProcess.js +++ b/entity/Offer_entity/entityfields/header/valueProcess.js @@ -1,7 +1,13 @@ -import("system.result"); -import("system.vars"); - -if (vars.exists("$param.OfferHeader_param") && vars.get("$param.OfferHeader_param")) -{ - result.string(vars.get("$param.OfferHeader_param")); -} \ No newline at end of file +import("system.logging"); +import("system.result"); +import("system.vars"); +import("system.neon"); + +if(vars.exists("$param.OfferHeader_param") && vars.get("$param.OfferHeader_param")) + result.string(vars.get("$param.OfferHeader_param")); + +else if(vars.get("$this.value")) + result.string(vars.get("$this.value")); + +else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) + result.string("gerne bieten wir Ihnen wie folgt an:") diff --git a/report/RPTJ_OFFER/reportData.jrxml b/report/RPTJ_OFFER/reportData.jrxml index 5ec99598ff792d80e04f6bf6c47bbeaa33708d1a..eb3f94233e15c3ef7e83778cb2158003ea1b2a37 100644 --- a/report/RPTJ_OFFER/reportData.jrxml +++ b/report/RPTJ_OFFER/reportData.jrxml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <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="report1" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="e7a916c8-3f9a-497d-84bb-3909b15271ea"> - <property name="ireport.zoom" value="1.771561000000001"/> + <property name="ireport.zoom" value="1.4641000000000006"/> <property name="ireport.x" value="0"/> - <property name="ireport.y" value="0"/> + <property name="ireport.y" value="75"/> <parameter name="myAddr" class="java.lang.String"/> <parameter name="Pos" class="java.lang.String"/> <parameter name="Artikelbezeichnung" class="java.lang.String"/> @@ -24,7 +24,7 @@ <parameter name="OFFERDel" class="java.lang.String"/> <parameter name="AD_Name" class="java.lang.String"/> <parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false"> - <defaultValueExpression><![CDATA["C:\\Users\\a.voegl\\Documents\\AditoProjects\\xRM-Basic 2019\\report\\RPTJ_OFFER\\"]]></defaultValueExpression> + <defaultValueExpression><![CDATA["C:\\Entwicklungszweige\\0.0\\project\\xRM-Basic2019\\report\\RPTJ_OFFER\\"]]></defaultValueExpression> </parameter> <parameter name="adito.datasource.subdata" class="java.lang.Object"/> <parameter name="SUMITEMSUM" class="java.lang.Double"/> @@ -125,7 +125,7 @@ </textField> </band> <band height="20"> - <textField> + <textField isStretchWithOverflow="true"> <reportElement x="20" y="0" width="535" height="20" uuid="8d10af04-82a4-4344-ae98-de42c82a674e"/> <textElement> <font fontName="Segoe UI" size="8"/>