From 4ca5dcc70921f6d82091367d704b031651e71bd3 Mon Sep 17 00:00:00 2001
From: "f.maier" <f.maier@adito.de>
Date: Thu, 21 Oct 2021 11:52:07 +0200
Subject: [PATCH] =?UTF-8?q?[Projekt:=20xRM-ContactManagement][TicketNr.:?=
=?UTF-8?q?=201084447][Firma=20-=20Kundenstammblatt=20-=20Name=20der=20Fir?=
=?UTF-8?q?ma=20wird=20nicht=20korrekt=20angedruckt,=20Webseite=20ist=20ab?=
=?UTF-8?q?geschnitten]=20[Projekt:=20xRM-ContactManagement][TicketNr.:=20?=
=?UTF-8?q?2000952][Kundenstammblatt=20nicht=20Datenbankunabh=C3=A4ngig]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
process/Organisation_lib/process.js | 2 +-
process/PostalAddress_lib/process.js | 2 +-
report/Organisation_report/Kommunikationsdaten.jrxml | 2 +-
report/Organisation_report/reportData.jrxml | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/process/Organisation_lib/process.js b/process/Organisation_lib/process.js
index 6984d27758..0fe9f10f56 100644
--- a/process/Organisation_lib/process.js
+++ b/process/Organisation_lib/process.js
@@ -199,7 +199,7 @@ var activityData = activityQuery.table()
.leftJoin("PERSON", "c.PERSON_ID = PERSONID")
.leftJoin("AB_ATTRIBUTE", "AB_ATTRIBUTE.AB_ATTRIBUTEID = TASKATTENDEES.DEPARTMENT_ID")
.where("CONTACT.ORGANISATION_ID", pOrgId)
- .groupBy("TASK.TASKID")
+ .groupBy("TASK.TASKID, TASK.SUBJECT, TASK.DESCRIPTION, TASK.STATUS")
.table();
diff --git a/process/PostalAddress_lib/process.js b/process/PostalAddress_lib/process.js
index 996991dd07..fa87decdc4 100644
--- a/process/PostalAddress_lib/process.js
+++ b/process/PostalAddress_lib/process.js
@@ -80,7 +80,7 @@ AddressUtils.getFormattedOnlineAddressById = function(pAddressId)
* @return {String}
*/
AddressUtils.getAddress = function(pContactId) {
- var address = newSelect("CONTACTID, ADDRESS, BUILDINGNO, ZIP, CITY, \"NAME\", FIRSTNAME, LASTNAME, TITLE")
+ var address = newSelect("CONTACTID, ADDRESS, BUILDINGNO, ZIP, CITY, ORGANISATION.NAME, FIRSTNAME, LASTNAME, TITLE")
.from(ContactUtils.getFullContactString())
.whereIfSet("CONTACT.CONTACTID", pContactId)
.arrayRow(true);
diff --git a/report/Organisation_report/Kommunikationsdaten.jrxml b/report/Organisation_report/Kommunikationsdaten.jrxml
index a69e571707..6cfef4ca4b 100644
--- a/report/Organisation_report/Kommunikationsdaten.jrxml
+++ b/report/Organisation_report/Kommunikationsdaten.jrxml
@@ -22,7 +22,7 @@
<textFieldExpression><![CDATA[$F{KINDOFCOMM}]]></textFieldExpression>
</textField>
<textField>
- <reportElement x="103" y="1" width="100" height="15" uuid="48bf1f6b-953a-44b6-9ebf-504203afa70d"/>
+ <reportElement x="103" y="1" width="255" height="15" uuid="48bf1f6b-953a-44b6-9ebf-504203afa70d"/>
<textElement>
<font size="8"/>
</textElement>
diff --git a/report/Organisation_report/reportData.jrxml b/report/Organisation_report/reportData.jrxml
index 04d3aaa066..8bc8634994 100644
--- a/report/Organisation_report/reportData.jrxml
+++ b/report/Organisation_report/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="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.2100000000000002"/>
+ <property name="ireport.zoom" value="1.771561000000001"/>
<property name="ireport.x" value="0"/>
- <property name="ireport.y" value="0"/>
+ <property name="ireport.y" value="150"/>
<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:\\Entwicklung\\stable2019\\project\\basic\\report\\Organisation_report\\"]]></defaultValueExpression>
+ <defaultValueExpression><![CDATA["C:\\Users\\f.maier\\Documents\\AditoProjects\\UltimateBasic\\report\\Organisation_report\\"]]></defaultValueExpression>
</parameter>
<parameter name="adito.image.myLogo" class="java.lang.String"/>
<parameter name="adito.datasource.subdataHist" class="java.lang.Object"/>
--
GitLab