From: atif-shaikh <shaikh388@gmail.com>
Date: Wed, 7 Jan 2015 10:35:20 +0000 (+0530)
Subject: UpgradeFix
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=29d558c05ce21a0aa9d3326f3a19b9b481ec48ca;p=civicrm-core.git

UpgradeFix
---

diff --git a/CRM/Upgrade/Incremental/sql/4.6.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.alpha1.mysql.tpl
index a02419c489..f7b6b40cb9 100755
--- a/CRM/Upgrade/Incremental/sql/4.6.alpha1.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.6.alpha1.mysql.tpl
@@ -62,9 +62,9 @@ SELECT @option_group_id_udOpt_wt  := MAX(weight) FROM civicrm_option_value WHERE
 SELECT @option_group_id_udOpt_val := MAX(CAST( `value` AS UNSIGNED )) FROM civicrm_option_value WHERE option_group_id = @option_group_id_udOpt;
 
 INSERT INTO
-   `civicrm_option_value` (`option_group_id`, {localize field='label'}`label`{/localize}, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, {localize field='description'}`description`{/localize}, `is_optgroup`, `is_reserved`, `is_active`, `component_id`, `visibility_id`)
+   `civicrm_option_value` (`option_group_id`, {localize field='label'}`label`{/localize}, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, `is_optgroup`, `is_reserved`, `is_active`, `component_id`, `visibility_id`)
 VALUES
-   (@option_group_id_udOpt, {localize}'{ts escape="sql"}Invoices / Credit Notes{/ts}'{/localize}, @option_group_id_udOpt_val+1, 'Invoices / Credit Notes', NULL, 0, NULL, @option_group_id_udOpt_wt+1, NULL, 0, 0, 1, NULL, NULL);
+   (@option_group_id_udOpt, {localize}'{ts escape="sql"}Invoices / Credit Notes{/ts}'{/localize}, @option_group_id_udOpt_val+1, 'Invoices / Credit Notes', NULL, 0, NULL, @option_group_id_udOpt_wt+1, 0, 0, 1, NULL, NULL);
 
 -- Add new column creditnote_id in contribution table
 ALTER TABLE `civicrm_contribution` ADD `creditnote_id` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'unique credit note id, system generated or passed in';