From 8495472084732b15c0aac2729c9f8cb9fe5185cb Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@bulrich.aditosoftware.local>
Date: Thu, 20 Feb 2020 13:58:28 +0100
Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.: 1050801][Vertrieb:
Angebot: Reiter "Angebotsposten" - Beschreibung des Produktes ist nicht
stimmig]
---
process/OfferOrder_lib/process.js | 12 +++---------
process/Offer_lib/process.js | 2 +-
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/process/OfferOrder_lib/process.js b/process/OfferOrder_lib/process.js
index fbcd3a5466..b89d167903 100644
--- a/process/OfferOrder_lib/process.js
+++ b/process/OfferOrder_lib/process.js
@@ -257,13 +257,6 @@ ItemUtils.prototype.insertPartsList = function(columns, productId, assignedTo, c
vat = ProductDetails.PriceListToUse.vat;
}
- var descr = newSelect("DESCRIPTION")
- .from("DESCRIPTIONTRANSLATION")
- .where("DESCRIPTIONTRANSLATION.OBJECT_ROWID", prodid)
- .and("DESCRIPTIONTRANSLATION.OBJECT_TYPE = 'Product'")
- .and("DESCRIPTIONTRANSLATION.LANG", "eng")
- .cell()
-
var vals = [newid
, self.offerOrderId
, prodid
@@ -276,8 +269,9 @@ ItemUtils.prototype.insertPartsList = function(columns, productId, assignedTo, c
, P2pObject.quantity
, (P2pObject.optional) ? "1" : "0"
, pos
- , itemsort
- , descr]
+ , itemsort]
+ // add aditional details
+ .concat(additionalProductInfo.map(function(item) {return ProductDetails[item[1][0]]}));
statements.push([table, columns, colTypes, vals]);
insertedItemIds.push(newid);
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index 4e84661dad..f7dec99b0d 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -480,7 +480,7 @@ OfferItemUtils.prototype.insertPartsList = function(pProductId, pAssignedTo, pCu
return ItemUtils.prototype.insertPartsList.apply(this, [cols, pProductId, pAssignedTo, pCurrency, pContactId, [[["info", "INFO"], ["info",
"( " + newSelect("DESCRIPTION")
.from("DESCRIPTIONTRANSLATION")
- .where("DESCRIPTIONTRANSLATION.OBJECT_ROWID", pProductId)
+ .where("DESCRIPTIONTRANSLATION.OBJECT_ROWID = PRODUCT.PRODUCTID")
.and("DESCRIPTIONTRANSLATION.OBJECT_TYPE = 'Product'")
.and("DESCRIPTIONTRANSLATION.LANG", pLanguage)
.toString() + ")"]]]]);
--
GitLab