CRM-19585, added minor changes

---------------------------------------- * CRM-19585: Sales tax issue https://issues.civicrm.org/jira/browse/CRM-19585
civicrm · Dec 19, 2016 · e1e3c3a · e1e3c3a
1 parent c261adb
commit e1e3c3a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
@@ -3601,7 +3601,7 @@ public static function updateFinancialAccounts(&$params, $context = NULL, $skipT
           $params['line_item'][$fieldId][$fieldValueId]['deferred_line_total'] = $amount;
           $params['line_item'][$fieldId][$fieldValueId]['financial_item_id'] = $financialItem->id;
 
-          $taxAmount = $fieldValues['tax_amount'];
+          $taxAmount = CRM_Utils_Array::value('tax_amount', $fieldValues);
           $taxFinancialType = $fieldValues['financial_type_id'];
           if ($context == 'changeFinancialType') {
             $taxAmount = $previousLineItem[$fieldValues['id']]['tax_amount'];

diff --git a/CRM/Financial/BAO/FinancialItem.php b/CRM/Financial/BAO/FinancialItem.php
@@ -316,7 +316,7 @@ public static function getPreviousFinancialItem($entityId, $entityTable = 'civic
           THEN 0
           ELSE 1
         END
-      GROUP BY cfi.id ORDER BY cfi.id DESC LIMIT 1';
+      ORDER BY cfi.id DESC LIMIT 1';
     $prevFinancialItem = CRM_Core_DAO::executeQuery($query, $queryParams);
     $prevFinancialItem->fetch();
     return $prevFinancialItem;