X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sql%2Falter2.3.php;h=c568245962f3a648890ebd5b1dd9c278f93a2c15;hb=87af4ea9405a74c0e4be19b9076f6d6d64b20e29;hp=3c1a2217bd60ef592d0814a32d4f8215a189db80;hpb=cdea200a3f1f1c3ebb65f9afae864bf8cde43c6a;p=fa-stable.git

diff --git a/sql/alter2.3.php b/sql/alter2.3.php
index 3c1a2217..c5682459 100644
--- a/sql/alter2.3.php
+++ b/sql/alter2.3.php
@@ -138,14 +138,15 @@ class fa2_3 {
 		include_once("$path_to_root/sales/includes/cart_class.inc");
 		include_once("$path_to_root/purchasing/includes/po_class.inc");
 		$cart = new cart(ST_SALESORDER);
-		$sql = "SELECT order_no FROM {$pref}sales_orders";
+		$sql = "SELECT order_no, trans_type FROM {$pref}sales_orders";
 		$orders = db_query($sql);
 		if (!$orders)
 			return false;
-
-		while ($order_no = db_fetch($orders)) {
-			read_sales_order($order_no[0], $cart, ST_SALESORDER);
-			$result = db_query("UPDATE {$pref}sales_orders SET total=".$cart->get_trans_total());
+		while ($order = db_fetch($orders)) {
+			read_sales_order($order['order_no'], $cart, $order['trans_type']);
+			$result = db_query("UPDATE {$pref}sales_orders 
+				SET total=".$cart->get_trans_total()
+				." WHERE order_no=".$order[0]);
 			unset($cart->line_items);
 		}
 		unset($cart);
@@ -356,7 +357,8 @@ class fa2_3 {
 
 		foreach($installed_languages as $n => $lang) {
 			if ($lang['code'] == 'en_GB') {
-				$installed_languages[$n] = 'C';
+				$installed_languages[$n] = array('code'=>'C','name'=>'English',
+					'encoding'=>'iso-8859-1', 'path' => '', 'package' => '');
 				if ($dflt_lang == 'en_GB')
 					$dflt_lang = 'C';
 				write_lang();