From df1f662a210eb7fadc89c60ae84f27c7be967607 Mon Sep 17 00:00:00 2001
From: Pradeep Nayak <pradeep@pradeep.(none)>
Date: Wed, 13 Mar 2013 13:39:13 +0530
Subject: [PATCH] --fixed for CRM-12061

---
 CRM/Batch/Form/Entry.php                      |  2 +-
 .../Incremental/sql/4.3.beta3.mysql.tpl       | 23 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/CRM/Batch/Form/Entry.php b/CRM/Batch/Form/Entry.php
index 0168618cb9..2bdd049f2a 100644
--- a/CRM/Batch/Form/Entry.php
+++ b/CRM/Batch/Form/Entry.php
@@ -387,7 +387,7 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form {
 
         $value['custom'] = CRM_Core_BAO_CustomField::postProcess($value,
           CRM_Core_DAO::$_nullObject,
-          $key,
+          NULL,
           'Contribution'
         );
 
diff --git a/CRM/Upgrade/Incremental/sql/4.3.beta3.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.3.beta3.mysql.tpl
index 0cb696eb28..71d038b5bb 100644
--- a/CRM/Upgrade/Incremental/sql/4.3.beta3.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.3.beta3.mysql.tpl
@@ -1,4 +1,25 @@
 -- CRM-12077
 DELETE cog, cov FROM `civicrm_option_group` cog
 LEFT JOIN civicrm_option_value cov ON cov.option_group_id = cog.id
-WHERE cog.name = 'account_type';
\ No newline at end of file
+WHERE cog.name = 'account_type';
+
+{if $multilingual}
+  UPDATE civicrm_uf_field
+  SET  field_name = 'financial_type'
+  WHERE field_name LIKE 'contribution_type';
+  {foreach from=$locales item=locale}
+    UPDATE civicrm_uf_field
+    SET label_{$locale} = 'Financial Type'
+    WHERE field_name = 'financial_type' AND label_{$locale} = 'Contribution Type';
+  {/foreach}
+  
+{else}
+  UPDATE civicrm_uf_field
+  SET  field_name = 'financial_type',
+  label = CASE
+  WHEN label = 'Contribution Type'
+  THEN 'Financial Type'
+  ELSE label
+  END
+  WHERE field_name = 'contribution_type';
+{/if}
\ No newline at end of file
-- 
2.25.1