diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 6260932d6206cc0b6cc5407f53044cfcc920d2c7..de6345e76caa242193d7dee1d7f140b6e6384c88 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -1622,7 +1622,8 @@
<value>keine</value>
</entry>
<entry>
- <key>Ihr zuständiger Betreuer:</key>
+ <key>Directly responsible:</key>
+ <value>Ihr zuständiger Betreuer:</value>
</entry>
<entry>
<key>Termin</key>
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_AttributeType.xml b/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_AttributeType.xml
index 3dc7188a6debc18f36c7cf02eb0e8630782a7137..99852b24f7249d850ec0f6f8a32fd7503de7a471 100644
--- a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_AttributeType.xml
+++ b/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_AttributeType.xml
@@ -1,6 +1,13 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="s.listl" id="14dc77c2-067f-4b45-a6ad-f2f973091d64">
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="ISACTIVE" valueNumeric="0"/>
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="75a67526-6b7c-400d-b958-e1f8f45466aa"/>
+ </whereParams>
+ </update>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="9d2f9605-1a5e-47d3-8920-168f5637e37f"/>
<column name="KEYID" value="KEYWORD"/>
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index 4b7cebcfdd94b0aae3708ad9857b161ca4a4dd34..6391d3f2cfe235d549861b3ac7d0675b0a1a038b 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.vars");
import("system.util");
import("system.datetime");
@@ -82,7 +83,7 @@ OfferUtils.createNewOffer = function(pSalesprojectId, pRelationId)
/*
- * Open Offer report
+ * Open Offer report, the report is translated to the language of the offer
*
* @param {String} pOfferID
*
@@ -90,7 +91,7 @@ OfferUtils.createNewOffer = function(pSalesprojectId, pRelationId)
*/
OfferUtils.openOfferReport = function (pOfferID)
{
- var offerReport = new Report("RPTJ_OFFER");
+ var offerReport = new Report("Offer_report");
var sqlUtil = new SqlMaskingUtils();
@@ -117,8 +118,9 @@ OfferUtils.openOfferReport = function (pOfferID)
offerData[7] = datetime.toDate(offerData[7], translate.text("dd.MM.yyyy", language));
- //TODO: use new keyword logic for language when possible
- var language = "DE";
+ var language = db.cell(SqlCondition.begin()
+ .andPrepare("AB_LANGUAGE.ISO3", offerData[2])
+ .buildSql("select ISO2 from AB_LANGUAGE", "1=0"));
var contactId = offerData[1];
@@ -228,12 +230,13 @@ OfferUtils.openOfferReport = function (pOfferID)
"OFFERAddr" : AddressUtils.getAddress(contactId).toString(), // TODO: OFFER.ADDRESS
"PlusSalestax" : translate.text("Plus Salestax", language),
"Unitprice" : translate.text("Unitprice", language),
+ "directlyResponsible" : translate.text("Directly responsible:", language),
"Number" : translate.text("Number", language),
- "Discount" : translate.text("Rabatt", language),
+ "Discount" : translate.text("Discount", language),
"Amount" : translate.text("Amount", language),
"Total" : translate.text("Total", language),
"Date" : translate.text("Date", language),
- "VAT" : translate.text("UMSt", language),
+ "VAT" : translate.text("VAT", language),
"Sum" : translate.text("Sum", language),
"Pos" : translate.text("Pos.", language),
"myAddr" : imgData[0],
@@ -241,7 +244,7 @@ OfferUtils.openOfferReport = function (pOfferID)
"OfferPaymentTerm" : KeywordUtils.getViewValue($KeywordRegistry.paymentTerm(), offerData[3]),
"OfferDeliveryTerm" : KeywordUtils.getViewValue($KeywordRegistry.deliveryTerm(), offerData[4]),
- "AD_Name" : adma,
+ "responsible" : adma,
"SUMITEMSUM" : sumItemSum,
"TOTAL" : text.formatDouble(total, translate.text("#,##0.00"), true),
"printDiscount" : printDiscount ? "1" : "0"
diff --git a/process/Organisation_lib/process.js b/process/Organisation_lib/process.js
index 78565ea988c6a42ebea90bbed1b9420d8947f642..86ed286bbfc82516c1cd2ee11a7ee66166b62c58 100644
--- a/process/Organisation_lib/process.js
+++ b/process/Organisation_lib/process.js
@@ -145,7 +145,7 @@ OrgUtils.openOrgReport = function(pOrgId)
"INFO" : info
};
- var orgReport = new Report("RPTJ_ORGANISATION", params);
+ var orgReport = new Report("Organisation_report", params);
//add subreport data
orgReport.addSubReportData("subdataComm", commData);
diff --git a/report/RPTJ_OFFER/RPTJ_OFFER.aod b/report/Offer_report/Offer_report.aod
similarity index 70%
rename from report/RPTJ_OFFER/RPTJ_OFFER.aod
rename to report/Offer_report/Offer_report.aod
index 54fabe62ad9afe333c6b50514fd5f0e252c1b52d..49b5d3fc88d79f4e73eb66897feb1e815c8e23a8 100644
--- a/report/RPTJ_OFFER/RPTJ_OFFER.aod
+++ b/report/Offer_report/Offer_report.aod
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<report xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/report/1.1.5">
- <name>RPTJ_OFFER</name>
+ <name>Offer_report</name>
<title>Angebot</title>
<description></description>
<comment>&lt;null value&gt;</comment>
<majorModelMode>DISTRIBUTED</majorModelMode>
<alias>Data_alias</alias>
- <reportData>%aditoprj%/report/RPTJ_OFFER/reportData.jrxml</reportData>
+ <reportData>%aditoprj%/report/Offer_report/reportData.jrxml</reportData>
<reportType>JASPER</reportType>
<subReports>
<subreport>
<name>reportData_subreport1</name>
- <reportData>%aditoprj%/report/RPTJ_OFFER/reportData_subreport1.jrxml</reportData>
+ <reportData>%aditoprj%/report/Offer_report/reportData_subreport1.jrxml</reportData>
</subreport>
</subReports>
<images>
<image>
<name>myLogo</name>
<fileName>myLogo.png</fileName>
- <imageData>%aditoprj%/report/RPTJ_OFFER/myLogo.png</imageData>
+ <imageData>%aditoprj%/report/Offer_report/myLogo.png</imageData>
</image>
</images>
<ribbon>
@@ -36,9 +36,9 @@
<customComponents>
<rcCommandButton>
<name>Button</name>
- <onClick>%aditoprj%/report/RPTJ_OFFER/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js</onClick>
+ <onClick>%aditoprj%/report/Offer_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js</onClick>
<title>Senden per E-Mail</title>
- <imageData>%aditoprj%/report/RPTJ_OFFER/ribbon/ribbontasks/task_report/customcomponents/button/imageData.png</imageData>
+ <imageData>%aditoprj%/report/Offer_report/ribbon/ribbontasks/task_report/customcomponents/button/imageData.png</imageData>
</rcCommandButton>
</customComponents>
</ribbonTask>
diff --git a/report/RPTJ_OFFER/myLogo.png b/report/Offer_report/myLogo.png
similarity index 100%
rename from report/RPTJ_OFFER/myLogo.png
rename to report/Offer_report/myLogo.png
diff --git a/report/RPTJ_OFFER/reportData.jrxml b/report/Offer_report/reportData.jrxml
similarity index 96%
rename from report/RPTJ_OFFER/reportData.jrxml
rename to report/Offer_report/reportData.jrxml
index bf876e3e50f88babc6a86f603ab91b39e08eaac4..a1352b4ee0b60ddd1d50598f567090e3626b8a24 100644
--- a/report/RPTJ_OFFER/reportData.jrxml
+++ b/report/Offer_report/reportData.jrxml
@@ -2,7 +2,7 @@
<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="2.1435888100000016"/>
<property name="ireport.x" value="0"/>
- <property name="ireport.y" value="46"/>
+ <property name="ireport.y" value="94"/>
<parameter name="myAddr" class="java.lang.String"/>
<parameter name="Pos" class="java.lang.String"/>
<parameter name="Articledescription" class="java.lang.String"/>
@@ -22,15 +22,16 @@
<parameter name="OFFERPers" class="java.lang.String"/>
<parameter name="OfferPaymentTerm" class="java.lang.String"/>
<parameter name="OfferDeliveryTerm" class="java.lang.String"/>
- <parameter name="AD_Name" class="java.lang.String"/>
+ <parameter name="responsible" class="java.lang.String"/>
<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
- <defaultValueExpression><![CDATA["C:\\entwicklungszweige\\0.0\\project\\xRM-Basic2019\\report\\RPTJ_OFFER\\"]]></defaultValueExpression>
+ <defaultValueExpression><![CDATA["C:\\entwicklungszweige\\0.0\\project\\xRM-Basic2019\\report\\Offer_report\\"]]></defaultValueExpression>
</parameter>
<parameter name="adito.datasource.subdata" class="java.lang.Object"/>
<parameter name="SUMITEMSUM" class="java.lang.Double"/>
<parameter name="TOTAL" class="java.lang.String"/>
<parameter name="adito.image.myLogo" class="java.lang.String"/>
<parameter name="printDiscount" class="java.lang.String"/>
+ <parameter name="directlyResponsible" class="java.lang.String"/>
<queryString>
<![CDATA[]]>
</queryString>
@@ -98,7 +99,7 @@
<textElement>
<font fontName="Segoe UI" size="8"/>
</textElement>
- <textFieldExpression><![CDATA[$P{AD_Name}]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{responsible}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="432" y="0" width="64" height="15" uuid="99c69604-7df6-432e-a492-6c31d8bd67fd"/>
@@ -108,11 +109,13 @@
<textFieldExpression><![CDATA[$F{OFFER_OFFERCODE} + "-" + $F{OFFER_VERSNR}]]></textFieldExpression>
</textField>
<textField>
- <reportElement x="372" y="35" width="183" height="15" uuid="9f7aeac2-3844-43ee-bc8b-b11f8701b83e"/>
+ <reportElement x="372" y="35" width="183" height="15" uuid="9f7aeac2-3844-43ee-bc8b-b11f8701b83e">
+ <printWhenExpression><![CDATA[!$P{responsible}.equals("")]]></printWhenExpression>
+ </reportElement>
<textElement>
<font fontName="Segoe UI" size="8"/>
</textElement>
- <textFieldExpression><![CDATA[$R{Ihr zuständiger Betreuer:}]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{directlyResponsible}]]></textFieldExpression>
</textField>
</band>
<band height="20">
@@ -255,7 +258,9 @@
</band>
<band height="33">
<textField>
- <reportElement x="20" y="13" width="100" height="20" uuid="112f15db-0989-430e-b2c4-61f975f7b8a4"/>
+ <reportElement x="20" y="13" width="100" height="20" uuid="112f15db-0989-430e-b2c4-61f975f7b8a4">
+ <printWhenExpression><![CDATA[!$P{OfferPaymentTerm}.equals("")]]></printWhenExpression>
+ </reportElement>
<textElement>
<font fontName="Segoe UI" size="8"/>
</textElement>
@@ -294,7 +299,9 @@
</band>
<band height="41">
<textField>
- <reportElement x="20" y="0" width="100" height="20" uuid="75b328c0-4ab1-478d-afb8-0ed8974da1af"/>
+ <reportElement x="20" y="0" width="100" height="20" uuid="75b328c0-4ab1-478d-afb8-0ed8974da1af">
+ <printWhenExpression><![CDATA[!$P{OfferDeliveryTerm}.equals("")]]></printWhenExpression>
+ </reportElement>
<textElement>
<font fontName="Segoe UI" size="8"/>
</textElement>
diff --git a/report/RPTJ_OFFER/reportData_subreport1.jrxml b/report/Offer_report/reportData_subreport1.jrxml
similarity index 100%
rename from report/RPTJ_OFFER/reportData_subreport1.jrxml
rename to report/Offer_report/reportData_subreport1.jrxml
diff --git a/report/RPTJ_OFFER/ribbon/ribbontasks/task_report/customcomponents/button/imageData.png b/report/Offer_report/ribbon/ribbontasks/task_report/customcomponents/button/imageData.png
similarity index 100%
rename from report/RPTJ_OFFER/ribbon/ribbontasks/task_report/customcomponents/button/imageData.png
rename to report/Offer_report/ribbon/ribbontasks/task_report/customcomponents/button/imageData.png
diff --git a/report/RPTJ_OFFER/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js b/report/Offer_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js
similarity index 100%
rename from report/RPTJ_OFFER/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js
rename to report/Offer_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js
diff --git a/report/RPTJ_ORGANISATION/Aufgaben.jrxml b/report/Organisation_report/Aufgaben.jrxml
similarity index 100%
rename from report/RPTJ_ORGANISATION/Aufgaben.jrxml
rename to report/Organisation_report/Aufgaben.jrxml
diff --git a/report/RPTJ_ORGANISATION/Historien.jrxml b/report/Organisation_report/Historien.jrxml
similarity index 100%
rename from report/RPTJ_ORGANISATION/Historien.jrxml
rename to report/Organisation_report/Historien.jrxml
diff --git a/report/RPTJ_ORGANISATION/Kommunikationsdaten.jrxml b/report/Organisation_report/Kommunikationsdaten.jrxml
similarity index 100%
rename from report/RPTJ_ORGANISATION/Kommunikationsdaten.jrxml
rename to report/Organisation_report/Kommunikationsdaten.jrxml
diff --git a/report/RPTJ_ORGANISATION/Kontaktpersonen.jrxml b/report/Organisation_report/Kontaktpersonen.jrxml
similarity index 100%
rename from report/RPTJ_ORGANISATION/Kontaktpersonen.jrxml
rename to report/Organisation_report/Kontaktpersonen.jrxml
diff --git a/report/RPTJ_ORGANISATION/RPTJ_ORGANISATION.aod b/report/Organisation_report/Organisation_report.aod
similarity index 63%
rename from report/RPTJ_ORGANISATION/RPTJ_ORGANISATION.aod
rename to report/Organisation_report/Organisation_report.aod
index 5bb351fd24b94e1c4a1fad7027290ba7b865e4a5..07dc53009589b114f1982f787d0408764ba12193 100644
--- a/report/RPTJ_ORGANISATION/RPTJ_ORGANISATION.aod
+++ b/report/Organisation_report/Organisation_report.aod
@@ -1,46 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<report xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/report/1.1.5">
- <name>RPTJ_ORGANISATION</name>
+ <name>Organisation_report</name>
<title>Kundenstammblatt</title>
<description></description>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <icon>%aditoprj%/report/RPTJ_ORGANISATION/icon.png</icon>
- <iconInactive>%aditoprj%/report/RPTJ_ORGANISATION/iconInactive.png</iconInactive>
- <reportData>%aditoprj%/report/RPTJ_ORGANISATION/reportData.jrxml</reportData>
+ <icon>%aditoprj%/report/Organisation_report/icon.png</icon>
+ <iconInactive>%aditoprj%/report/Organisation_report/iconInactive.png</iconInactive>
+ <reportData>%aditoprj%/report/Organisation_report/reportData.jrxml</reportData>
<reportType>JASPER</reportType>
<subReports>
<subreport>
<name>Kontaktpersonen</name>
- <reportData>%aditoprj%/report/RPTJ_ORGANISATION/Kontaktpersonen.jrxml</reportData>
+ <reportData>%aditoprj%/report/Organisation_report/Kontaktpersonen.jrxml</reportData>
</subreport>
<subreport>
<name>Historien</name>
- <reportData>%aditoprj%/report/RPTJ_ORGANISATION/Historien.jrxml</reportData>
+ <reportData>%aditoprj%/report/Organisation_report/Historien.jrxml</reportData>
</subreport>
<subreport>
<name>Aufgaben</name>
- <reportData>%aditoprj%/report/RPTJ_ORGANISATION/Aufgaben.jrxml</reportData>
+ <reportData>%aditoprj%/report/Organisation_report/Aufgaben.jrxml</reportData>
</subreport>
<subreport>
<name>Kommunikationsdaten</name>
- <reportData>%aditoprj%/report/RPTJ_ORGANISATION/Kommunikationsdaten.jrxml</reportData>
+ <reportData>%aditoprj%/report/Organisation_report/Kommunikationsdaten.jrxml</reportData>
</subreport>
</subReports>
<images>
<image>
<name>myLogo</name>
<fileName>myLogo.png</fileName>
- <imageData>%aditoprj%/report/RPTJ_ORGANISATION/myLogo.png</imageData>
+ <imageData>%aditoprj%/report/Organisation_report/myLogo.png</imageData>
</image>
<image>
<name>icon</name>
<fileName>icon.png</fileName>
- <imageData>%aditoprj%/report/RPTJ_ORGANISATION/icon.png</imageData>
+ <imageData>%aditoprj%/report/Organisation_report/icon.png</imageData>
</image>
<image>
<name>iconInactive</name>
<fileName>iconInactive.png</fileName>
- <imageData>%aditoprj%/report/RPTJ_ORGANISATION/iconInactive.png</imageData>
+ <imageData>%aditoprj%/report/Organisation_report/iconInactive.png</imageData>
</image>
</images>
<ribbon>
diff --git a/report/RPTJ_ORGANISATION/icon.png b/report/Organisation_report/icon.png
similarity index 100%
rename from report/RPTJ_ORGANISATION/icon.png
rename to report/Organisation_report/icon.png
diff --git a/report/RPTJ_ORGANISATION/iconInactive.png b/report/Organisation_report/iconInactive.png
similarity index 100%
rename from report/RPTJ_ORGANISATION/iconInactive.png
rename to report/Organisation_report/iconInactive.png
diff --git a/report/RPTJ_ORGANISATION/myLogo.png b/report/Organisation_report/myLogo.png
similarity index 100%
rename from report/RPTJ_ORGANISATION/myLogo.png
rename to report/Organisation_report/myLogo.png
diff --git a/report/RPTJ_ORGANISATION/reportData.jrxml b/report/Organisation_report/reportData.jrxml
similarity index 99%
rename from report/RPTJ_ORGANISATION/reportData.jrxml
rename to report/Organisation_report/reportData.jrxml
index d6b03f139812d03da7d024c38933b209d0d6c101..77d145f5a1945d085d9029f0efad16e510ef0207 100644
--- a/report/RPTJ_ORGANISATION/reportData.jrxml
+++ b/report/Organisation_report/reportData.jrxml
@@ -2,7 +2,7 @@
<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="Kundenstammblatt" 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.9487171000000014"/>
<property name="ireport.x" value="0"/>
- <property name="ireport.y" value="0"/>
+ <property name="ireport.y" value="311"/>
<parameter name="myAddr" class="java.lang.String"/>
<parameter name="ORGAddr" class="java.lang.String"/>
<parameter name="ORGAttr" class="java.lang.String"/>
@@ -14,7 +14,7 @@
<parameter name="adito.datasource.subdataComm" class="java.lang.Object"/>
<parameter name="adito.datasource.subdataPers" class="java.lang.Object"/>
<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
- <defaultValueExpression><![CDATA["C:\\entwicklungszweige\\0.0\\project\\xRM-Basic2019\\report\\RPTJ_ORGANISATION\\"]]></defaultValueExpression>
+ <defaultValueExpression><![CDATA["C:\\entwicklungszweige\\0.0\\project\\xRM-Basic2019\\report\\Organisation_report\\"]]></defaultValueExpression>
</parameter>
<parameter name="adito.image.myLogo" class="java.lang.String"/>
<parameter name="adito.datasource.subdataHist" class="java.lang.Object"/>