diff --git a/process/OfferOrder_lib/process.js b/process/OfferOrder_lib/process.js
index b89d167903fb1214cb039289ac601dba86dcdf04..585076d1d7f15ace72864f542429b98d310e44f2 100644
--- a/process/OfferOrder_lib/process.js
+++ b/process/OfferOrder_lib/process.js
@@ -256,6 +256,13 @@ ItemUtils.prototype.insertPartsList = function(columns, productId, assignedTo, c
                 price = ProductDetails.PriceListToUse.price;
                 vat = ProductDetails.PriceListToUse.vat;
             }
+            if(newSelect("takeprice")
+            .from("prod2prod")  
+            .whereIfSet("PROD2PROD.PROD2PRODID", p2pid)
+            .cell() == 0){
+                price = 0
+            }
+            
             
             var vals =  [newid
                         , self.offerOrderId
@@ -267,7 +274,7 @@ ItemUtils.prototype.insertPartsList = function(columns, productId, assignedTo, c
                         , price
                         , vat
                         , P2pObject.quantity
-                        , (P2pObject.optional) ? "1" : "0"
+                        , P2pObject.optional
                         , pos
                         , itemsort]
                     // add aditional details