diff --git a/include/Webservices/LineItem/VtigerInventoryOperation.php b/include/Webservices/LineItem/VtigerInventoryOperation.php
index 99c4e23714bc32d3b671c1a27bd4c020c51e8b0a..ab54f145e5cd211236053d814fa538d8459495cf 100644
--- a/include/Webservices/LineItem/VtigerInventoryOperation.php
+++ b/include/Webservices/LineItem/VtigerInventoryOperation.php
@@ -184,6 +184,7 @@ class VtigerInventoryOperation extends VtigerModuleOperation {
 		$element['LineItems'] = $lineItems;
 		$recordCompoundTaxesElement = $this->getCompoundTaxesElement($element, $lineItems);
 		$element = array_merge($element, $recordCompoundTaxesElement);
+		$element['productid'] = $lineItems[0]['productid'];
         $element['LineItems_FinalDetails'] = $this->getLineItemFinalDetails($idComponents[1]);
 		return $element;
 	}
diff --git a/include/Webservices/LineItem/VtigerLineItemOperation.php b/include/Webservices/LineItem/VtigerLineItemOperation.php
index cb3e12b0ddf916468246ee110220a920abc953c5..98a5d226173f70224c8deb9ce9ad24964617b4d4 100644
--- a/include/Webservices/LineItem/VtigerLineItemOperation.php
+++ b/include/Webservices/LineItem/VtigerLineItemOperation.php
@@ -78,16 +78,15 @@ class VtigerLineItemOperation  extends VtigerActorOperation {
 	 */
 	public function getAllLineItemForParent($parentId){
 		$result = null;
-		if(is_array($parentId)){
-			$query = "select vtiger_crmentity.label as productname,vtiger_crmentity.setype as entitytype,vtiger_crmentity.deleted as deleted, {$this->entityTableName}.*
+
+		if (!is_array($parentId)) {
+			$parentId = array($parentId);
+		}
+		
+		$query = "SELECT vtiger_crmentity.label AS productname,vtiger_crmentity.setype AS entitytype,vtiger_crmentity.deleted AS deleted, {$this->entityTableName}.*
 						FROM {$this->entityTableName}
 						LEFT JOIN vtiger_crmentity ON vtiger_crmentity.crmid=vtiger_inventoryproductrel.productid
 						WHERE id IN (". generateQuestionMarks($parentId) .")";
-		}else {
-			$query = "select vtiger_crmentity.label as productname,vtiger_crmentity.setype as entitytype,vtiger_crmentity.deleted as deleted, {$this->entityTableName}.*
-						FROM {$this->entityTableName}
-						LEFT JOIN vtiger_crmentity ON vtiger_crmentity.crmid=vtiger_inventoryproductrel.productid where id=?";
-		}
 
 		$transactionSuccessful = vtws_runQueryAsTransaction($query,array($parentId),$result);
 		if(!$transactionSuccessful){