diff --git a/process/OfferOrder_lib/process.js b/process/OfferOrder_lib/process.js index fbcd3a5466b1598a6692eea499ed7dc7a28eed31..b89d167903fb1214cb039289ac601dba86dcdf04 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 4e84661dad2abf9988e1faa3e2cd03aa0f1bc1ce..f7dec99b0dc03c4c7664f97679dc0053be7a7acc 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() + ")"]]]]);