Skip to content
Snippets Groups Projects
Commit ec91aa86 authored by S.Listl's avatar S.Listl
Browse files

Reports umbenennen, Offer report verbessert

parent 5ee81e06
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 54 additions and 36 deletions
language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+ 2
− 1
View file @ ec91aa86
......@@ -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>
......
others/db_changes/data_alias/basic/2019.2/AditoBasic/init_AttributeType.xml
+ 7
− 0
View file @ ec91aa86
<?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"/>
......
process/Offer_lib/process.js
+ 10
− 7
View file @ ec91aa86
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"
......
process/Organisation_lib/process.js
+ 1
− 1
View file @ ec91aa86
......@@ -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);
......
report/RPTJ_OFFER/RPTJ_OFFER.aod → report/Offer_report/Offer_report.aod
+ 6
− 6
View file @ ec91aa86
<?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>&amp;lt;null value&amp;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>
......
report/RPTJ_OFFER/myLogo.png → report/Offer_report/myLogo.png
+0 B (+0%)
View file @ ec91aa86
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
report/RPTJ_OFFER/reportData.jrxml → report/Offer_report/reportData.jrxml
+ 15
− 8
View file @ ec91aa86
......@@ -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>
......
report/RPTJ_ORGANISATION/RPTJ_ORGANISATION.aod → report/Organisation_report/Organisation_report.aod
+ 11
− 11
View file @ ec91aa86
<?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>
......
report/RPTJ_ORGANISATION/icon.png → report/Organisation_report/icon.png
+0 B (+0%)
View file @ ec91aa86
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
report/RPTJ_ORGANISATION/iconInactive.png → report/Organisation_report/iconInactive.png
+0 B (+0%)
View file @ ec91aa86
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
report/RPTJ_ORGANISATION/myLogo.png → report/Organisation_report/myLogo.png
+0 B (+0%)
View file @ ec91aa86
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
report/RPTJ_ORGANISATION/reportData.jrxml → report/Organisation_report/reportData.jrxml
+ 2
− 2
View file @ ec91aa86
......@@ -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"/>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment