Index: branches/5.2.x/install/upgrades.sql
===================================================================
diff -u -N -r14923 -r14961
--- branches/5.2.x/install/upgrades.sql	(.../upgrades.sql)	(revision 14923)
+++ branches/5.2.x/install/upgrades.sql	(.../upgrades.sql)	(revision 14961)
@@ -240,4 +240,22 @@
 	(DEFAULT, 'p', 'Price', 'range', 1, 11),
 	(DEFAULT, 'p', 'EditorsPick', 'radio', 1, NULL);
 
-DELETE FROM Phrase WHERE PhraseKey = 'LA_COL_ITEMNAME';
\ No newline at end of file
+DELETE FROM Phrase WHERE PhraseKey = 'LA_COL_ITEMNAME';
+
+DELETE FROM Phrase
+WHERE PhraseKey IN ('LA_ALLOWORDERINGINNONPRIMARYCURRENCY', 'LA_ALLOWORDERDIFFERENTTYPES');
+
+DELETE FROM ConfigurationValues
+WHERE VariableName IN ('Comm_AllowOrderingInNonPrimaryCurrency', 'Comm_Allow_Order_Different_Types');
+
+UPDATE ConfigurationValues
+SET DisplayOrder = 20.01
+WHERE VariableName = 'Comm_ExchangeRateSource';
+
+UPDATE ConfigurationValues
+SET DisplayOrder = DisplayOrder - 0.01
+WHERE VariableName IN (
+	'Comm_Enable_Backordering', 'Comm_Process_Backorders_Auto', 'Comm_Next_Order_Number', 'Comm_Order_Number_Format_P',
+	'Comm_Order_Number_Format_S', 'Comm_RecurringChargeInverval', 'Comm_AutoProcessRecurringOrders', 'MaxAddresses',
+	'Comm_MaskProcessedCreditCards', 'OrderVATIncluded'
+);