From 9e12d5ee71ad01030f5e900c13ed2513baa481ed Mon Sep 17 00:00:00 2001 From: yashodha Date: Wed, 24 Jul 2013 18:59:59 +0530 Subject: [PATCH] CRM-13105 --- CRM/Contribute/BAO/Contribution.php | 3 ++- CRM/Contribute/Form/Task/Batch.php | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php index b41d2c0f0c..87fcaa662c 100644 --- a/CRM/Contribute/BAO/Contribution.php +++ b/CRM/Contribute/BAO/Contribution.php @@ -134,7 +134,8 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution { } // contribution status is missing, choose Completed as default status - if (!CRM_Utils_Array::value('contribution_status_id', $params)) { + // do this for create mode only + if (!CRM_Utils_Array::value('contribution', $ids) && !CRM_Utils_Array::value('contribution_status_id', $params)) { $params['contribution_status_id'] = CRM_Core_OptionGroup::getValue('contribution_status', 'Completed', 'name'); } diff --git a/CRM/Contribute/Form/Task/Batch.php b/CRM/Contribute/Form/Task/Batch.php index 92c90bb9de..241557fa4c 100644 --- a/CRM/Contribute/Form/Task/Batch.php +++ b/CRM/Contribute/Form/Task/Batch.php @@ -65,8 +65,8 @@ class CRM_Contribute_Form_Task_Batch extends CRM_Contribute_Form_Task { */ function preProcess() { /* - * initialize the task and row fields - */ + * initialize the task and row fields + */ parent::preProcess(); //get the contact read only fields to display. @@ -156,7 +156,7 @@ class CRM_Contribute_Form_Task_Batch extends CRM_Contribute_Form_Task { //fix for CRM-2752 $customFields = CRM_Core_BAO_CustomField::getFields('Contribution'); foreach ($this->_contributionIds as $contributionId) { - $typeId = CRM_Core_DAO::getFieldValue( "CRM_Contribute_DAO_Contribution", $contributionId, 'financial_type_id' ); + $typeId = CRM_Core_DAO::getFieldValue("CRM_Contribute_DAO_Contribution", $contributionId, 'financial_type_id'); foreach ($this->_fields as $name => $field) { if ($customFieldID = CRM_Core_BAO_CustomField::getKeyID($name)) { $customValue = CRM_Utils_Array::value($customFieldID, $customFields); @@ -254,7 +254,7 @@ class CRM_Contribute_Form_Task_Batch extends CRM_Contribute_Form_Task { $value['source'] = $value['contribution_source']; } - unset($value['financial_type']); + unset($value['financial_type']); unset($value['contribution_source']); $contribution = CRM_Contribute_BAO_Contribution::add($value, $ids); -- 2.25.1