Merge pull request #9337 from eileenmcnaughton/line_item

CRM-19583 show financial type of line items whenbackoffice users view…

diff --cc CRM/Contribute/Form/ContributionView.php
index f21e4d219c778bb41f26fb3dbcea0a26cd25bcc1,78ac04e1dc5f192c52552ad7f153445eb304a97e..0f282c97a3f7ca3b1b6f251be962107a08cc82d6
--- 1/CRM/Contribute/Form/ContributionView.php
--- 2/CRM/Contribute/Form/ContributionView.php
+++ b/CRM/Contribute/Form/ContributionView.php
@@@ -151,16 -151,16 +151,17 @@@ class CRM_Contribute_Form_ContributionV
      }
  
      $lineItems = array();
 +    $displayLineItems = FALSE;
      if ($id) {
 -      $lineItem = CRM_Price_BAO_LineItem::getLineItems($id, 'contribution', 1, TRUE, TRUE);
 -      if (!empty($lineItem)) {
 -        $lineItems[] = $lineItem;
 -      }
 -
 +      $lineItems = array(CRM_Price_BAO_LineItem::getLineItemsByContributionID(($id)));
 +      $firstLineItem = reset($lineItems[0]);
 +      $priceSet = civicrm_api3('PriceSet', 'getsingle', array('id' => $firstLineItem['price_set_id'], 'return' => 'is_quick_config, id'));
 +      $displayLineItems = !$priceSet['is_quick_config'];
      }
 -    $this->assign('lineItem', empty($lineItems) ? FALSE : $lineItems);
 +    $this->assign('lineItem', $lineItems);
 +    $this->assign('displayLineItems', $displayLineItems);
      $values['totalAmount'] = $values['total_amount'];
+     $this->assign('displayLineItemFinancialType', TRUE);
  
      //do check for campaigns
      if ($campaignId = CRM_Utils_Array::value('campaign_id', $values)) {

diff --cc CRM/Price/BAO/LineItem.php
Simple merge