Index: branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php	(revision 21515)
+++ branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php	(revision 21531)
@@ -305,11 +305,16 @@
         $objErr->arrErr = $objFormParam->checkError();
 
-        if (!isset($objErr->arrErr['name']) && $arrRet['deliv_id'] == '') {
-            // 既存チェック
-            $objDb = new SC_Helper_DB_Ex();
-            $ret = $objDb->sfIsRecord('dtb_deliv', 'service_name', array($arrRet['service_name']));
-            if ($ret) {
-                $objErr->arrErr['name'] = '※ 同じ名称の組み合わせは登録できません。<br>';
-            }
+        if (!isset($objErr->arrErr['name'])) {
+		// 既存チェック
+		$objDb = new SC_Helper_DB_Ex();
+		if($arrRet['deliv_id'] == ''){
+			$ret = $objDb->sfIsRecord('dtb_deliv', 'service_name', array($arrRet['service_name']));
+		}else{
+			$objQuery = new SC_Query_Ex();
+			$ret = (($objQuery->count('dtb_deliv', 'deliv_id != ? AND service_name = ? ', array($arrRet['deliv_id'], $arrRet['service_name'])) > 0 )? true : false );
+		}
+		if ($ret) {
+			$objErr->arrErr['service_name'] = '※ 同じ名称の組み合わせは登録できません。<br>';
+		}
         }