Index: branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 257)
+++ branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 258)
@@ -14,7 +14,7 @@
         /// <summary>
         /// 本体バージョン
         /// </summary>
-        public static int s_SystemVersion = 67;
+        public static int s_SystemVersion = 68;
 
         /// <summary>
         /// コピー・環境バージョン
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs	(revision 257)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs	(revision 258)
@@ -64,7 +64,7 @@
                     break;
                 // 5:請求承認
                 case (int)ClsExcute.ApprovalListNo.OrderBillingApproval:
-                    //if (RecPara.ProcNo == (int)ClsExcute.ProcessExecuteNo.ConstructionBudget) bAns = true;
+                    if (RecPara.ProcNo == (int)ClsExcute.ProcessExecuteNo.ConstructionBudget) bAns = true;
                     break;
                 // 6:工事日報承認
                 case (int)ClsExcute.ApprovalListNo.DRConstructionApproval:
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs	(revision 257)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs	(revision 258)
@@ -4597,7 +4597,7 @@
                 if (m_SubForm) return;
 
                 // �Q�Ǝ��͏������Ȃ�
-                if (m_EditLock) return;
+                //if (m_EditLock) return;
 
                 DataGridView dgv = dgvLink;
                 DataGridViewRow CurRow = dgv.CurrentRow;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/ConstrReqList/FrmConstrReqListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/ConstrReqList/FrmConstrReqListAuxiliary.cs	(revision 257)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/ConstrReqList/FrmConstrReqListAuxiliary.cs	(revision 258)
@@ -336,11 +336,11 @@
                             {
                                 case (int)CommonDefine.BaseInfoBillingSplitFlg.AllOnBilling:
                                     // �����ꊇ����
-                                    strSQL.AppendFormat(" AND (A.CONSTRUCTIONSTATUSFLG = {0}", Status1);
+                                    strSQL.AppendFormat(" AND (A.CONSTRUCTIONSTATUSFLG >= {0}", Status1);
                                     break;
                                 case (int)CommonDefine.BaseInfoBillingSplitFlg.SplitBilling:
                                     // ������������
-                                    strSQL.AppendFormat(" AND (A.CONSTRUCTIONSTATUSFLG > {0}", Status2);
+                                    strSQL.AppendFormat(" AND (A.CONSTRUCTIONSTATUSFLG >= {0}", Status2);
                                     break;
                                 default:
                                     break;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInput.Designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInput.Designer.cs	(revision 257)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInput.Designer.cs	(revision 258)
@@ -156,6 +156,7 @@
             this.dgv1.Size = new System.Drawing.Size(1312, 477);
             this.dgv1.TabIndex = 10;
             this.dgv1.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.dgv1_CellBeginEdit);
+            this.dgv1.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgv1_CellEndEdit);
             this.dgv1.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.dgv1_CellFormatting);
             this.dgv1.CellValidating += new System.Windows.Forms.DataGridViewCellValidatingEventHandler(this.dgv1_CellValidating);
             this.dgv1.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgv1_CellValueChanged);
@@ -597,6 +598,7 @@
             // 
             this.cbReqMonth.BackColor = System.Drawing.Color.White;
             this.cbReqMonth.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cbReqMonth.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.cbReqMonth.FormattingEnabled = true;
             this.cbReqMonth.Location = new System.Drawing.Point(707, 7);
             this.cbReqMonth.Name = "cbReqMonth";
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInput.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInput.cs	(revision 257)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInput.cs	(revision 258)
@@ -174,7 +174,7 @@
                 // 前プロセスに戻る
                 ClsExcute.BackProcess();
 
-                Close();
+                this.Close();
 
                 return;
             }
@@ -416,7 +416,7 @@
                     cbReqMonth.Enabled = true;
                 }
             }
-
+            this.Close();
         }
         #endregion
 
@@ -451,7 +451,7 @@
             CommonMotions.EntryEndMessage("請求データ");
 
             // Formを閉じる
-            Close();
+            this.Close();
         }
         #endregion
 
@@ -478,7 +478,7 @@
             // 前プロセスに戻る
             ClsExcute.BackProcess();
 
-            Close();
+            this.Close();
 
         }
         #endregion
@@ -532,6 +532,19 @@
         }
         #endregion
 
+        #region セル編集終了
+        /// <summary>
+        /// セル編集終了
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void dgv1_CellEndEdit(object sender, DataGridViewCellEventArgs e)
+        {
+            // 請求金額から消費税の入力をする
+            setTaxValue(e);
+        }
+        #endregion
+
         #region セルフォーマッティング（セル書式指定）
         /// <summary>
         /// セルフォーマッティング（セル書式指定）
@@ -550,13 +563,14 @@
                 this.dgv1.CellFormatting += dgv1_CellFormatting;
                 return;
             }
+            try
+            {
+                // セルの編集タイプを取得
+                int nType = GetEditType(tcol, trow);
 
-            // セルの編集タイプを取得
-            int nType = GetEditType(tcol, trow);
+                // 金額系セルの場合
+                if (nType != (int)EditType.Amount) return;
 
-            // 金額系セルの場合
-            if (nType == (int)EditType.Amount)
-            {
                 // 金額系セルの終了制御(カンマ区切り、文字色変更等)
                 CellEditEnd(tcol, trow);
 
@@ -582,8 +596,14 @@
                 calcBalance((int)HeaderRowIndex.TaxAmount);
 
             }
-
-            this.dgv1.CellFormatting += dgv1_CellFormatting;
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                this.dgv1.CellFormatting += dgv1_CellFormatting;
+            }
         }
         #endregion
 
@@ -838,9 +858,9 @@
             m_EndButton = DialogResult.Cancel;
 
             // 前プロセスに戻る
-            ClsExcute.BackProcess();
+            ClsExcute.ClearProcess();
 
-            Close();
+            this.Close();
 
         }
         #endregion
@@ -864,9 +884,9 @@
             m_EndButton = DialogResult.Cancel;
 
             // 前プロセスに戻る
-            ClsExcute.BackProcess();
+            ClsExcute.ClearProcess();
 
-            Close();
+            this.Close();
         }
         #endregion
 
@@ -889,9 +909,9 @@
             m_EndButton = DialogResult.Cancel;
 
             // 前プロセスに戻る
-            ClsExcute.BackProcess();
+            ClsExcute.ClearProcess();
 
-            Close();
+            this.Close();
         }
         #endregion
     }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInputAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInputAuxiliary.cs	(revision 257)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInputAuxiliary.cs	(revision 258)
@@ -317,7 +317,7 @@
                     }
                     dgv[(int)ColumnName.No, cnt].Value = cnt.ToString();
 
-                    dgv[(int)ColumnName.Heading, cnt].Style.ForeColor = Color.DarkGray;
+                    //dgv[(int)ColumnName.Heading, cnt].Style.ForeColor = Color.DarkGray;
                     if (j == 0)
                     {
                         dgv[(int)ColumnName.Heading, cnt].Value = "請求金額";
@@ -632,8 +632,32 @@
         }
         #endregion
 
+        #region 請求金額入力時消費税のセット
+        /// <summary>
+        /// 消費税のセット
+        /// </summary>
+        private void setTaxValue(DataGridViewCellEventArgs e)
+        {
+            try
+            {
+                // 請求金額以外は処理しない
+                string wrktitile = CommonMotions.cnvString(dgv1[(int)ColumnName.Heading, e.RowIndex].Value);
+                if (!wrktitile.Equals("請求金額")) return;
+
+                // 消費税セット
+                long wrkInputValue = CommonMotions.cnvLong(dgv1[e.ColumnIndex, e.RowIndex].Value);
+                int nTaxValue = CommonMotions.cnvRound((double)wrkInputValue * (CommonMotions.SystemMasterData.ConsumptionTax / 100.0));
+                dgv1[e.ColumnIndex, (e.RowIndex + 1)].Value = nTaxValue.ToString("#,0");
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
         #endregion
 
+        #endregion
+
         #region チェック関連メソッド
 
         #region 初期起動時チェック
@@ -1473,6 +1497,31 @@
 
         #region 設定系メソッド
 
+        #region 請求先をTooltipに設定する
+        private ToolTip m_ToolTip1;
+        /// <summary>
+        /// 請求先をTooltipに設定する
+        /// </summary>
+        private void SetToolTipOrderersName()
+        {
+            try
+            {
+                // ToolTipを作成する
+                m_ToolTip1 = new ToolTip();
+
+                // ToolTipを表示する時間
+                m_ToolTip1.AutoPopDelay = 10000;
+
+                // 請求先名をToolTipへセット
+                m_ToolTip1.SetToolTip(txtOrderer, txtOrderer.Text);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region 表示データの設定
         /// <summary>
         /// 表示データの設定
@@ -1486,6 +1535,8 @@
 
             // 請求先名
             txtOrderer.Text = ReqHead.OrderersName;
+            // 請求先をTooltipに設定する
+            SetToolTipOrderersName();
 
             // 編集可かつ請求書データに紐づかない場合のみ編集可能
             if ((m_bEdit == true) && (ReqHead.InvoiceNo == 0))
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs	(revision 257)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs	(revision 258)
@@ -3074,6 +3074,7 @@
 
                 iGoukeiCode = CommonMotions.cnvInt(dgv.CurrentRow.Cells[m_GoukeiCode_Column].Value);
 
+                // �s���̌���폜�͂ł��Ȃ�
                 if (CurGenbaCode == 0)
                 {
                     MessageBox.Show("�s���̌���폜�͂ł��܂���B", "�f�[�^�m�F", MessageBoxButtons.OK, MessageBoxIcon.Warning);
@@ -3115,9 +3116,9 @@
                 if ((DataRowState)dgv.CurrentRow.Cells[(int)DispColumn.RowState].Value == DataRowState.Added)
                 {
                     DataGridViewRow[] ExistenceData = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == CurCompanyCode
-                        && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0
-                        && (DataRowState)dgv.CurrentRow.Cells[(int)DispColumn.RowState].Value != DataRowState.Added)
-                        .ToArray();
+                                                                                                && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0
+                                                                                                && (DataRowState)dgv.CurrentRow.Cells[(int)DispColumn.RowState].Value != DataRowState.Added)
+                                                                                        .ToArray();
                     if (ExistenceData.Count() == 0)
                     {
                         bDeleteRow = true;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs	(revision 257)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs	(revision 258)
@@ -4105,6 +4105,11 @@
             try
             {
                 dgv.Rows.Clear();
+                // 金額表示
+                lblTotal01.Text = @"\0-";
+                lblTotal02.Text = @"\0-";
+                lblTotal03.Text = @"\0-";
+
                 long lTotal01 = 0;
                 long lTotal02 = 0;
 
@@ -4197,12 +4202,12 @@
 
                     dgv.Rows[RowCnt].Cells[ColCnt].Value = DepName;
                     dgv.Rows[RowCnt].Cells[ColCnt].Style.BackColor = Color.Aqua;
-                    dgv.Rows[RowCnt].Cells[ColCnt + 1].Value = Price.ToString("#,0") + "-";
+                    dgv.Rows[RowCnt].Cells[ColCnt + 1].Value = string.Format(@"\{0}-", Price.ToString("#,0"));
                 }
                 // 金額表示
-                lblTotal01.Text = @"\" + (lTotal01 - lTotal02).ToString("#,0") + "-";
-                lblTotal02.Text = @"\" + lTotal02.ToString("#,0") + "-";
-                lblTotal03.Text = @"\" + lTotal01.ToString("#,0") + "-";
+                lblTotal01.Text = string.Format(@"\{0}-", (lTotal01 - lTotal02).ToString("#,0"));
+                lblTotal02.Text = string.Format(@"\{0}-", lTotal02.ToString("#,0"));
+                lblTotal03.Text = string.Format(@"\{0}-", lTotal01.ToString("#,0"));
 
             }
             catch (Exception ex)
Index: branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 257)
+++ branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 258)
@@ -32,7 +32,7 @@
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.67")]
-[assembly: AssemblyFileVersion("1.0.0.67")]
+[assembly: AssemblyVersion("1.0.0.68")]
+[assembly: AssemblyFileVersion("1.0.0.68")]
 // Log4netを使用する
 [assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]
\ No newline at end of file
