Index: branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	(revision 20430)
+++ branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	(revision 20442)
@@ -279,5 +279,6 @@
         $objFormParam->addParam("顧客ID", "customer_id", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"), '0');
         $objFormParam->addParam("顧客ID", "edit_customer_id", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"), '0');
-        $objFormParam->addParam("現在のポイント", "point");
+        $objFormParam->addParam("現在のポイント", "customer_point");
+        $objFormParam->addParam("受注前ポイント", "point");
         $objFormParam->addParam("注文番号", "order_id");
         $objFormParam->addParam("受注日", "create_date");
@@ -473,4 +474,9 @@
         $objFormParam->setValue('total_point', $db_point);
         $objFormParam->setValue('point', $rollback_point);
+
+        if (!SC_Utils_Ex::isBlank($objFormParam->getValue('customer_id'))) {
+            $this->setCustomerTo($objFormParam->getValue('customer_id'),
+                                 $objFormParam);
+        }
     }
 
@@ -780,4 +786,5 @@
         }
         $objFormParam->setValue('customer_id', $customer_id);
+        $objFormParam->setValue('customer_point', $arrCustomer['point']);
     }
 
Index: branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php	(revision 20435)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php	(revision 20442)
@@ -636,10 +636,4 @@
         }
 
-        // ポイントは別登録
-        $addPoint = $orderParams['add_point'];
-        $usePoint = $orderParams['use_point'];
-        $orderParams['add_point'] = 0;
-        $orderParams['use_point'] = 0;
-
         // 注文ステータスの指定が無い場合は新規受付
         if(SC_Utils_Ex::isBlank($orderParams['status'])) {