From 83be674012961b019c6d87c0a9bd9363cda2aa5f Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Thu, 10 Jan 2019 10:39:47 +0100
Subject: [PATCH] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][TicketNr.:?=
=?UTF-8?q?=201030772][Angebotsposten=20-=20Bemerkung=20hinzuf=C3=BCgen]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Offeritem_context/Offeritem_context.aod | 4 --
neonView/OfferEdit_view/OfferEdit_view.aod | 4 +-
.../OfferitemMultiEdit_view0.aod | 51 -------------------
process/Offer_lib/process.js | 8 +--
process/PostalAddress_lib/process.js | 1 +
report/RPTJ_OFFER/reportData.jrxml | 4 +-
6 files changed, 9 insertions(+), 63 deletions(-)
delete mode 100644 neonView/OfferitemMultiEdit_view0/OfferitemMultiEdit_view0.aod
diff --git a/neonContext/Offeritem_context/Offeritem_context.aod b/neonContext/Offeritem_context/Offeritem_context.aod
index 36bbe1e0038..e36d0a25aa3 100644
--- a/neonContext/Offeritem_context/Offeritem_context.aod
+++ b/neonContext/Offeritem_context/Offeritem_context.aod
@@ -19,9 +19,5 @@
<name>440a19f2-4893-47b9-b10c-864540b6287f</name>
<view>OfferitemMultiEdit_view</view>
</neonViewReference>
- <neonViewReference>
- <name>683c6607-69ab-43d7-907b-eb7054f2f257</name>
- <view>OfferitemMultiEdit_view0</view>
- </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/OfferEdit_view/OfferEdit_view.aod b/neonView/OfferEdit_view/OfferEdit_view.aod
index 26f9c81d3b5..e8f8de7cf5a 100644
--- a/neonView/OfferEdit_view/OfferEdit_view.aod
+++ b/neonView/OfferEdit_view/OfferEdit_view.aod
@@ -59,9 +59,9 @@
</fields>
</genericViewTemplate>
<neonViewReference>
- <name>dcf79bac-b890-4875-9ab9-4a743972a215</name>
+ <name>f84b65ca-f1dd-4dda-8321-1eef10ad0ecc</name>
<entityField>OfferOfferitem_dfo</entityField>
- <view>OfferitemMultiEdit_view0</view>
+ <view>OfferitemMultiEdit_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/OfferitemMultiEdit_view0/OfferitemMultiEdit_view0.aod b/neonView/OfferitemMultiEdit_view0/OfferitemMultiEdit_view0.aod
deleted file mode 100644
index 2387449448b..00000000000
--- a/neonView/OfferitemMultiEdit_view0/OfferitemMultiEdit_view0.aod
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>OfferitemMultiEdit_view0</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>ItemData</name>
- <autoNewRow v="true" />
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>155119de-99a4-4b1b-8f32-91df05f2271a</name>
- <entityField>ITEMPOSITION</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>f7b11d3a-bb01-4a3b-8aff-0e6da27e9e89</name>
- <entityField>PRODUCT_ID</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>2e55205a-15ab-488f-bae6-b7d1da57e5b7</name>
- <entityField>QUANTITY</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>db040e35-98e5-4103-865b-1654ac93894b</name>
- <entityField>UNIT</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>e2bbeee1-8644-436d-b220-73b9fff8e87e</name>
- <entityField>DISCOUNT</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>1c9dfee8-e838-44be-9c44-00ca5493ceb5</name>
- <entityField>VAT</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>7b99c8b2-af93-4bf3-968c-0a0e9afc916e</name>
- <entityField>OPTIONAL</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>55e4f6a6-6acb-46ff-8848-d42e6e5942a7</name>
- <entityField>INFO</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index ec78bc02a4e..262fa6e2427 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -94,7 +94,7 @@ OfferUtils.openOfferReport = function(pOfferID)
// TODO: OFFER.ADDRESS
var fields = [/*"OFFER.ADDRESS"*/ "''", "OFFER.RELATION_ID", "OFFER.LANGUAGE", /*"OFFER.PAYMENTTERMS"*/ "'DUMMY_OFFER.PAYMENTTERMS'", //0 - 3
/*"OFFER.DELIVERYTERMS"*/ "'DUMMY_OFFER.DELIVERYTERMS'", "OFFER.OFFERCODE", "OFFER.CURRENCY", "OFFER.OFFERDATE", // 4 - 7
- "OFFER.OFFERID", "OFFERITEM.OFFER_ID", "OFFERITEM.DESCRIPTION", "OFFERITEM.ASSIGNEDTO", // 11
+ "OFFER.OFFERID", "OFFERITEM.OFFER_ID", "OFFERITEM.INFO", "OFFERITEM.ASSIGNEDTO", // 11
"OFFERITEM.PRODUCT_ID","OFFERITEM.ITEMNAME" , // 13
"OFFERITEM.OPTIONAL", "OFFERITEM.ITEMPOSITION", // 15
"PRODUCT.PRODUCTCODE", "PRODUCT.PRODUCTID", "OFFER.FOOTER", "OFFER.HEADER", "OFFERITEM.UNIT", "OFFER.VAT", // 21
@@ -186,9 +186,9 @@ OfferUtils.openOfferReport = function(pOfferID)
params["zzglUMST"] = translate.text("zzgl. Summe UmSt", language);
// TODO: OFFER.ADDRESS
- params["OFFERAddr"] = AddressUtils.getAddress(relid).toString() + ","; //rptdata[0][0];
+ params["OFFERAddr"] = AddressUtils.getAddress(relid).toString(); //rptdata[0][0];
// TODO: AddrObject implementieren
- params["OFFERPers"] = AddressUtils.getLetterSalutation().toString(); //addrobj.formatAddress("{ls},");
+ params["OFFERPers"] = (AddressUtils.getLetterSalutation() + ",").toString(); //addrobj.formatAddress("{ls},");
// TODO: payment / delivery-Terms implement (if needed)
params["OFFERPay"] = ""//getKeyName(rptdata[0][3] , "PAYMENTTERMS", "KEYNAME1", language);
@@ -222,7 +222,7 @@ OfferUtils.openOfferReport = function(pOfferID)
rptdata[i][24], rptdata[i][25], rptdata[i][26], rptdata[i][27], rptdata[i][28], rptdata[i][29]];
}
// 0 1 2 3 4
- offerReport.setReportData(ReportData.begin(["OFFER_CURRENCY", "OFFER_OFFERDATE", "OFFER_OFFERID", "OFFERITEM_DESCRIPTION", "OFFERITEM_ASSIGNEDTO",
+ offerReport.setReportData(ReportData.begin(["OFFER_CURRENCY", "OFFER_OFFERDATE", "OFFER_OFFERID", "OFFERITEM_INFO", "OFFERITEM_ASSIGNEDTO",
"OFFERITEM_ITEMNAME" , "OFFERITEM_OPTIONAL", "OFFERITEM_ITEMPOSITION", "PRODUCT_PRODUCTCODE", "OFFER_FOOTER", "OFFER_HEADER", // 10
"OFFERITEM_QUANTITY", "OFFERITEM_PRICE", "OFFERITEM_DISCOUNT", "OFFER_VERSNR", "OFFER_OFFERCODE", "OFFERITEM_VAT", "ITEMSUM", // 17
"OFFERITEM_UNITTEXT"]) // 18
diff --git a/process/PostalAddress_lib/process.js b/process/PostalAddress_lib/process.js
index b1d113eace0..d3e6ed3ff18 100644
--- a/process/PostalAddress_lib/process.js
+++ b/process/PostalAddress_lib/process.js
@@ -1,5 +1,6 @@
import("system.db");
import("Sql_lib");
+import("Relation_lib");
/**
* Methods for addresses.
diff --git a/report/RPTJ_OFFER/reportData.jrxml b/report/RPTJ_OFFER/reportData.jrxml
index 2b578c6935f..89e47eafda4 100644
--- a/report/RPTJ_OFFER/reportData.jrxml
+++ b/report/RPTJ_OFFER/reportData.jrxml
@@ -41,7 +41,7 @@
<field name="OFFER_CURRENCY" class="java.lang.String"/>
<field name="OFFER_OFFERDATE" class="java.lang.String"/>
<field name="OFFER_OFFERID" class="java.lang.String"/>
- <field name="OFFERITEM_DESCRIPTION" class="java.lang.String"/>
+ <field name="OFFERITEM_INFO" class="java.lang.String"/>
<field name="OFFERITEM_ASSIGNEDTO" class="java.lang.String"/>
<field name="OFFERITEM_VAT" class="java.lang.String"/>
<field name="OFFERITEM_ITEMNAME" class="java.lang.String"/>
@@ -447,7 +447,7 @@
<textElement>
<font fontName="Segoe UI" size="8"/>
</textElement>
- <textFieldExpression><![CDATA[$F{OFFERITEM_DESCRIPTION}]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$F{OFFERITEM_INFO}]]></textFieldExpression>
</textField>
</band>
</detail>
--
GitLab