Index: trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsChangeLedgerData.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsChangeLedgerData.cs	(revision 399)
+++ trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsChangeLedgerData.cs	(revision 400)
@@ -1526,6 +1526,141 @@
             }
         }
         #endregion
+
+        #region 工事詳細台帳：請求金額更新処理
+        /// <summary>
+        /// 工事詳細台帳：請求金額更新処理
+        /// </summary>
+        /// <param name="LedgerDB">工事詳細台帳テーブル</param>
+        /// <param name="ExecDB">工事詳細台帳実行テーブル</param>
+        /// <param name="nConstrCode">工事番号</param>
+        /// <param name="TargetMonth">対象年月</param>
+        /// <param name="lValue">請求金額</param>
+        /// <param name="DspMsg">メッセージ表示フラグ</param>
+        /// <returns></returns>
+        public static bool ModifyReceiveMoney(IOConstructionLedger LedgerDB
+                                                , IOConstructionLedgerExcute ExecDB
+                                                , int nConstrCode
+                                                , string TargetMonth
+                                                , long lValue
+                                                , bool DspMsg = true)
+        {
+            try
+            {
+                // 詳細台帳データを取得する
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append(LedgerDB.CreatePrimarykeyString(nConstrCode));
+                ConstructionLedger LedgerRec = new ConstructionLedger();
+                if (!LedgerDB.SelectAction(strSQL.ToString(), ref LedgerRec, false))
+                {
+                    if (DspMsg)
+                    {
+                        MessageBox.Show("工事詳細台帳データ：台帳データ取得に失敗しました。"
+                                        , "データ取得エラー"
+                                        , MessageBoxButtons.OK
+                                        , MessageBoxIcon.Error);
+                    }
+                    return false;
+                }
+
+                // 現在の処理年月をDateTime型に変換する
+                DateTime NowDates = CommonMotions.cnvDate(string.Format("{0}/01", TargetMonth));
+
+                // 経過月数より列番号取得する
+                int ColCnt = CalcTargetMonthToColumn(LedgerRec.ConstructionStart, NowDates);
+
+                // 工事詳細台帳実行データ読込み
+                int nGroupNo = (int)FrmConstructionLedger.DataGroup.BillingAmount;
+                strSQL.Clear();
+                strSQL.Append("Select");
+                strSQL.Append(" A.ConstructionCode");           // 0
+                strSQL.Append(", A.GroupCount");                // 1
+                strSQL.Append(", A.LineCount");                 // 2
+                strSQL.Append(", ifnull(B.ColumnCount, -1)");   // 3
+                strSQL.Append(", B.PaymentAmount");             // 4
+                strSQL.Append(", B.TargetMonth");               // 5
+                strSQL.Append(", A.FirstString");               // 6
+                strSQL.Append(", A.SecondString");              // 7
+                strSQL.Append(" From constructionledgerdetail As A");
+                strSQL.Append("      Left Join constructionledgerexcute As B");
+                strSQL.Append("            On B.ConstructionCode = A.ConstructionCode");
+                strSQL.Append("            And B.GroupCount = A.GroupCount");
+                strSQL.Append("            And B.LineCount = A.LineCount");
+                strSQL.AppendFormat("      And B.ColumnCount = {0}", ColCnt);
+                strSQL.AppendFormat(" Where A.ConstructionCode = {0}", nConstrCode);
+                strSQL.AppendFormat(" And A.GroupCount = {0}", nGroupNo);
+                ArrayList ExecList = new ArrayList();
+                if (!ExecDB.ExecuteReader(strSQL.ToString(), ref ExecList, false))
+                {
+                    if (DspMsg)
+                    {
+                        MessageBox.Show("工事詳細台帳明細データ：請求金額データ取得に失敗しました。"
+                                        , "データ取得エラー"
+                                        , MessageBoxButtons.OK
+                                        , MessageBoxIcon.Error);
+                    }
+                    return false;
+                }
+                if (ExecList.Count < 1) return false;
+
+                object[] ObjRec = (object[])ExecList[0];
+                int nLineCnt = CommonMotions.cnvInt(ObjRec[2]);
+
+                // カラム番号がマイナス（実行データが無い時）か否かで作成・更新を判定する
+                if (CommonMotions.cnvInt(ObjRec[3]) >= 0)
+                {
+                    strSQL.Clear();
+                    strSQL.Append(ExecDB.CreatePrimarykeyString(nConstrCode
+                                                                , nGroupNo
+                                                                , nLineCnt
+                                                                , ColCnt));
+                    // 金額更新
+                    if (!ExecDB.UpdateFeild(strSQL.ToString()
+                                            , (int)IOConstructionLedgerExcute.TableColumn.PaymentAmount
+                                            , lValue
+                                            , false))
+                    {
+                        if (DspMsg)
+                        {
+                            MessageBox.Show("工事詳細台帳実行データ：請求金額更新に失敗しました。"
+                                            , "更新エラー"
+                                            , MessageBoxButtons.OK
+                                            , MessageBoxIcon.Error);
+                        }
+                        return false;
+                    }
+                }
+                else
+                {   // 請求データがあるのでここには来ないはず
+                    ConstructionLedgerExcute ExecRec = new ConstructionLedgerExcute();
+                    ExecRec.ConstructionCode = nConstrCode;	        // 工事コード
+                    ExecRec.GroupCount = nGroupNo;                  // グループ番号
+                    ExecRec.LineCount = nLineCnt;                   // 行番号
+                    ExecRec.ColumnCount = ColCnt;                   // 列番号
+                    ExecRec.PaymentAmount = (double)lValue;         // 支払金額
+                    ExecRec.TargetMonth = NowDates;                 // 対象年月
+                    if (!ExecDB.InsertAction(ExecRec, false))
+                    {
+                        if (DspMsg)
+                        {
+                            MessageBox.Show("工事詳細台帳実行データ：請求金額登録に失敗しました。"
+                                            , "登録エラー"
+                                            , MessageBoxButtons.OK
+                                            , MessageBoxIcon.Error);
+                        }
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+        }
+        #endregion
         // ↑↑ ** ----- インターフェース ----- **
     }
 }
Index: trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs	(revision 399)
+++ trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs	(revision 400)
@@ -642,7 +642,7 @@
                             ProcessExecuteNo_DepartmentCost(m_ProcControlPara[NowPoint]);
                             break;
 
-                        case (int)ProcessExecuteNo.ReqApprovalStatus:                      // 47:請求承認状況閲覧 add suzuki 2018/08/08
+                        case (int)ProcessExecuteNo.ReqApprovalStatus:                   // 47:請求承認状況閲覧 add suzuki 2018/08/08
                             ProcessExecuteNo_ReqApprovalStatus(m_ProcControlPara[NowPoint]);
                             break;
                         #endregion
Index: trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsSecurityPermission.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsSecurityPermission.cs	(revision 399)
+++ trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsSecurityPermission.cs	(revision 400)
@@ -711,22 +711,22 @@
                     return true;
                 }
 
+                if (CommonMotions.LoginUserProcExe.Count < 1)
+                {
+                    // 読込リストが存在しない場合はテーブル読込
+                    return GetExecutePermission(CommonMotions.LoginUserData.PersonCode, ExecCode, ref Editflg);
+                }
+
+                // 読込リストが存在した場合はリストより検索
                 bool bRet = false;
-                if (CommonMotions.LoginUserProcExe.Count != 0)
+                foreach (ProcessExcute CurRec in CommonMotions.LoginUserProcExe)
                 {
-                    foreach (ProcessExcute CurRec in CommonMotions.LoginUserProcExe)
-                    {
-                        if (ExecCode != CurRec.ExecCode) continue;
+                    if (ExecCode != CurRec.ExecCode) continue;
 
-                        bRet = true;
-                        Editflg = CurRec.EditFlg;
-                        break;
-                    }
+                    bRet = true;
+                    Editflg = CurRec.EditFlg;
+                    break;
                 }
-                else
-                {
-                    bRet = GetExecutePermission(CommonMotions.LoginUserData.PersonCode, ExecCode, ref Editflg);
-                }
 
                 return bRet;
             }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.cs	(revision 399)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.cs	(revision 400)
@@ -654,32 +654,26 @@
         private void btnRePetition_Click(object sender, EventArgs e)
         {
             IOProcessApproval pAppDB = new IOProcessApproval();
+            FrmInputDate frm = new FrmInputDate();
             try
             {
                 if (MessageBox.Show("�H���Č��̍ēx�\�����܂��A��낵���ł����H�B", "�Đ\���m�F"
                                 , MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.No) return;
 
+                if (frm.ShowDialog(this) == DialogResult.Cancel) return;
+
                 pAppDB.connect(); pAppDB.beginTran();
-                
-                // ���F�f�[�^����C�ɍ폜����
-                string strSQL = pAppDB.CreatePrimarykeyString(m_ConstructionCode, m_ApprovalCode, m_OrderNo);
-                strSQL += " AND SeqNo != 1";
-                if (!pAppDB.DeleteAction(strSQL, false))
+
+                // �Đ\���̂��߃f�[�^���쐬����
+                if(!RePetitionExec(pAppDB, m_ApprovalCode, frm.ExcuteDate))
                 {
                     pAppDB.rollback();
-                    MessageBox.Show("�Đ\���Ɏ��s���܂����B", "�Đ\���G���[", MessageBoxButtons.OK, MessageBoxIcon.Error);
                     return;
                 }
-                // �\���f�[�^��\�����ɖ߂�
-                if(!pAppDB.UpdateFeild(m_ConstructionCode,
-                                    (int)IOProcessApproval.ColumnName.ApprovalStatus,
-                                    (int)CommonDefine.ApprovalStatus.Petition,
-                                    false,
-                                    m_ApprovalCode,
-                                    m_OrderNo,
-                                    1))
+
+                // �ώZ���ρE�ώZ�\�Z�𓯎��ɍĐ\������
+                if(!RePetitionRequestEstimate(pAppDB, m_ApprovalCode, frm.ExcuteDate))
                 {
-                    MessageBox.Show("�Đ\���f�[�^���Z�b�g�Ɏ��s���܂����B", "�Đ\���G���[", MessageBoxButtons.OK, MessageBoxIcon.Error);
                     pAppDB.rollback();
                     return;
                 }
@@ -699,6 +693,7 @@
             {
                 pAppDB.commit();
                 pAppDB.close(); pAppDB = null;
+                frm.Dispose(); frm = null;
             }
         }
         #endregion
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs	(revision 399)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs	(revision 400)
@@ -564,11 +564,11 @@
                 // 申請・承認以外は申請ボタンを表示する
                 switch (ApprovalStatus)
                 {
-                    case (int)CommonDefine.ApprovalStatus.Petition:     // 申請
-                    case (int)CommonDefine.ApprovalStatus.Pending:      // 保留
-                    case (int)CommonDefine.ApprovalStatus.Approval:     // 承認
-                    case (int)CommonDefine.ApprovalStatus.NotApproval:  // 不承認
-                        btnPetition.Visible = false;                // 申請ボタン
+                    case (int)CommonDefine.ApprovalStatus.Petition:         // 申請
+                    case (int)CommonDefine.ApprovalStatus.Pending:          // 保留
+                    case (int)CommonDefine.ApprovalStatus.Approval:         // 承認
+                    case (int)CommonDefine.ApprovalStatus.NotApproval:      // 不承認
+                        btnPetition.Visible = false;                        // 申請ボタン
 
                         // 注文書承認は承認取り消しがある
                         switch (m_ApprovalCode)
@@ -589,26 +589,26 @@
                                 break;
                         }
 
-                        txtHoppesDate.Enabled = false;              // 承認希望日
+                        txtHoppesDate.Enabled = false;                      // 承認希望日
 
-                        btnApproval.Visible = true;                 // 承認ボタン
-                        btnNotApproval.Visible = true;              // 不承認ボタン
-                        btnOnHold.Visible = true;                   // 保留ボタン
+                        btnApproval.Visible = true;                         // 承認ボタン
+                        btnNotApproval.Visible = true;                      // 不承認ボタン
+                        btnOnHold.Visible = true;                           // 保留ボタン
                         break;
-                    case (int)CommonDefine.ApprovalStatus.Undecided:    // 未定
-                    case (int)CommonDefine.ApprovalStatus.Unclaimed:    // 未申請
-                        btnPetition.Visible = true;                 // 申請ボタン
+                    case (int)CommonDefine.ApprovalStatus.Undecided:        // 未定
+                    case (int)CommonDefine.ApprovalStatus.Unclaimed:        // 未申請
+                        btnPetition.Visible = true;                         // 申請ボタン
                         btnPetition.Left = s_ButtonPosition[2].X;
                         btnPetition.Top = s_ButtonPosition[2].Y;
                         
-                        btnRePetition.Visible = false;              // 再申請ボタン
-                        btnNotPetition.Visible = false;             // 申請取消ボタン
+                        btnRePetition.Visible = false;                      // 再申請ボタン
+                        btnNotPetition.Visible = false;                     // 申請取消ボタン
 
-                        txtHoppesDate.Enabled = true;               // 承認希望日
+                        txtHoppesDate.Enabled = true;                       // 承認希望日
 
-                        btnApproval.Visible = false;                // 承認ボタン
-                        btnNotApproval.Visible = false;             // 不承認ボタン
-                        btnOnHold.Visible = false;                  // 保留ボタン
+                        btnApproval.Visible = false;                        // 承認ボタン
+                        btnNotApproval.Visible = false;                     // 不承認ボタン
+                        btnOnHold.Visible = false;                          // 保留ボタン
                         break;
                 }
             }
@@ -1146,6 +1146,104 @@
         }
         #endregion
 
+        #region 再申請処理
+        /// <summary>
+        /// 再申請処理
+        /// </summary>
+        /// <returns></returns>
+        private bool RePetitionExec(IOProcessApproval pAppDB, int CurApprovalCode, DateTime dtPetitionDate)
+        {
+            try
+            {
+                // 承認データを一気に削除する
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append("DELETE FROM ProcessApproval");
+                strSQL.Append(pAppDB.CreatePrimarykeyString(m_ConstructionCode, CurApprovalCode, m_OrderNo));
+                strSQL.AppendFormat(" AND (SeqNo > 1 And PersonCode != {0})", CommonMotions.LoginUserData.PersonCode);
+                pAppDB.ExecuteNonQuery(strSQL.ToString(), false);
+
+                // 申請データを申請中に戻す
+                if (!pAppDB.UpdateFeild(m_ConstructionCode,
+                                    (int)IOProcessApproval.ColumnName.ApprovalStatus,
+                                    (int)CommonDefine.ApprovalStatus.Petition,
+                                    false,
+                                    CurApprovalCode,
+                                    m_OrderNo,
+                                    1))
+                {
+                    MessageBox.Show("再申請データリセットに失敗しました。", "再申請エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
+                // 承認希望日をセットする
+                if (!pAppDB.UpdateFeild(m_ConstructionCode,
+                                    (int)IOProcessApproval.ColumnName.ApprovalLimitDates,
+                                    dtPetitionDate,
+                                    false,
+                                    CurApprovalCode,
+                                    m_OrderNo,
+                                    1))
+                {
+                    MessageBox.Show("再申請データリセットに失敗しました。", "再申請エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return false;
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+        }
+        #endregion
+
+        #region 積算見積・積算予算を同時に再申請する
+        /// <summary>
+        /// 積算見積・積算予算を同時に再申請する
+        /// </summary>
+        private bool RePetitionRequestEstimate(IOProcessApproval pAppDB, int CurApprovalCode, DateTime dtPetitionDate)
+        {
+            try
+            {
+                // ----- 積算見積・積算予算は同時に申請を行う
+                int Code1 = ClsExcute.AppovalList.First(x => x.Value.Equals("積算見積書承認")).Key;
+                int Code2 = ClsExcute.AppovalList.First(x => x.Value.Equals("積算予算書承認")).Key;
+                int NextApprovalCode = -1;
+                if (CurApprovalCode == Code1)
+                {
+                    // ----- 積算見積書の申請時は積算予算書も申請する
+                    
+                    // 積算予算データが存在しなかった場合は申請しない
+                    if (!ExistEstimateBudget()) return true;
+
+                    // コードのセット
+                    NextApprovalCode = Code2;
+                }
+                else if (CurApprovalCode == Code2)
+                {
+                    // ----- 積算予算書の申請時は積算見積書は必ずあるので申請する
+                    
+                    // コードのセット
+                    NextApprovalCode = Code1;
+                }
+                else
+                {
+                    return true;
+                }
+
+                // 再申請のためデータを作成する
+                if (!RePetitionExec(pAppDB, NextApprovalCode, dtPetitionDate)) return false;
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+        }
+        #endregion
+
         #region 次呼出処理パラメータセット(対象データを見る)
         /// <summary>
         /// 次呼出処理パラメータセット(対象データを見る)
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmInputDate.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmInputDate.Designer.cs	(nonexistent)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmInputDate.Designer.cs	(revision 400)
@@ -0,0 +1,142 @@
+﻿namespace ProcessManagement.Forms.DataEntry
+{
+    partial class FrmInputDate
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.btnExecProc = new System.Windows.Forms.Button();
+            this.btnCancel = new System.Windows.Forms.Button();
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.dtInput = new System.Windows.Forms.DateTimePicker();
+            this.label1 = new System.Windows.Forms.Label();
+            this.panel1.SuspendLayout();
+            this.panel2.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // btnExecProc
+            // 
+            this.btnExecProc.BackColor = System.Drawing.Color.Green;
+            this.btnExecProc.ForeColor = System.Drawing.Color.White;
+            this.btnExecProc.Location = new System.Drawing.Point(98, 1);
+            this.btnExecProc.Name = "btnExecProc";
+            this.btnExecProc.Size = new System.Drawing.Size(140, 40);
+            this.btnExecProc.TabIndex = 0;
+            this.btnExecProc.Text = "変　更";
+            this.btnExecProc.UseVisualStyleBackColor = false;
+            this.btnExecProc.Click += new System.EventHandler(this.btnExecProc_Click);
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.BackColor = System.Drawing.Color.Red;
+            this.btnCancel.ForeColor = System.Drawing.Color.White;
+            this.btnCancel.Location = new System.Drawing.Point(238, 1);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Size = new System.Drawing.Size(140, 40);
+            this.btnCancel.TabIndex = 3;
+            this.btnCancel.Text = "キャンセル";
+            this.btnCancel.UseVisualStyleBackColor = false;
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // panel1
+            // 
+            this.panel1.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.panel1.Controls.Add(this.btnCancel);
+            this.panel1.Controls.Add(this.btnExecProc);
+            this.panel1.Location = new System.Drawing.Point(0, 116);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(382, 42);
+            this.panel1.TabIndex = 3;
+            // 
+            // panel2
+            // 
+            this.panel2.BackColor = System.Drawing.Color.LightGray;
+            this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.panel2.Controls.Add(this.label1);
+            this.panel2.Controls.Add(this.dtInput);
+            this.panel2.Location = new System.Drawing.Point(2, 4);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(376, 107);
+            this.panel2.TabIndex = 16;
+            // 
+            // dtInput
+            // 
+            this.dtInput.DropDownAlign = System.Windows.Forms.LeftRightAlignment.Right;
+            this.dtInput.Font = new System.Drawing.Font("Century", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.dtInput.Format = System.Windows.Forms.DateTimePickerFormat.Short;
+            this.dtInput.ImeMode = System.Windows.Forms.ImeMode.Off;
+            this.dtInput.Location = new System.Drawing.Point(101, 50);
+            this.dtInput.Name = "dtInput";
+            this.dtInput.Size = new System.Drawing.Size(170, 33);
+            this.dtInput.TabIndex = 17;
+            // 
+            // label1
+            // 
+            this.label1.BackColor = System.Drawing.Color.White;
+            this.label1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label1.Location = new System.Drawing.Point(66, 10);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(240, 28);
+            this.label1.TabIndex = 18;
+            this.label1.Text = "再 承 認 希 望 日";
+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // FrmInputDate
+            // 
+            this.AcceptButton = this.btnExecProc;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+            this.BackColor = System.Drawing.Color.White;
+            this.ClientSize = new System.Drawing.Size(380, 157);
+            this.Controls.Add(this.panel2);
+            this.Controls.Add(this.panel1);
+            this.Font = new System.Drawing.Font("ＭＳ 明朝", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
+            this.KeyPreview = true;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "FrmInputDate";
+            this.ShowIcon = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmInputDate_FormClosing);
+            this.Load += new System.EventHandler(this.FrmInputDate_Load);
+            this.panel1.ResumeLayout(false);
+            this.panel2.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button btnExecProc;
+        private System.Windows.Forms.Button btnCancel;
+        private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.Panel panel2;
+        private System.Windows.Forms.DateTimePicker dtInput;
+        private System.Windows.Forms.Label label1;
+    }
+}
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmInputDate.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmInputDate.cs	(nonexistent)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmInputDate.cs	(revision 400)
@@ -0,0 +1,141 @@
+﻿using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+using ProcessManagement.Common;
+using ProcessManagement.DB.IOAccess;
+using ProcessManagement.DataModel;
+using ProcessManagement.Forms.CustomControls;
+using ProcessManagement.Forms.ControlsAction;
+
+namespace ProcessManagement.Forms.DataEntry
+{
+    public partial class FrmInputDate : Form
+    {
+        #region ログ使用定義
+        //log4netログを使用する
+        private static readonly log4net.ILog logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        #endregion
+
+        #region 定数
+        private enum Dispcount
+        {
+            ExeCuteDate = 0,
+            ProgressStatusA,
+            ProgressStatusB,
+            radioButtonA1,
+            radioButtonA2,
+            radioButtonA3,
+        }
+        #endregion
+
+        #region 変数
+
+        /// <summary>
+        /// 実行時日付
+        /// </summary>
+        private DateTime m_ExcuteDate = DateTime.Now;
+
+        #endregion
+
+        #region プロパティ
+        /// <summary>
+        /// 実行時時間
+        /// </summary>
+        public DateTime ExcuteDate
+        {
+            get { return m_ExcuteDate; }
+            set { m_ExcuteDate = value; }
+        }
+        #endregion
+
+        #region コンストラクタ
+        /// <summary>
+        /// フォーム初期化
+        /// </summary>
+        public FrmInputDate()
+        {
+            InitializeComponent();
+        }
+        #endregion
+
+        #region フォームロード
+        /// <summary>
+        /// フォームロード
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmInputDate_Load(object sender, EventArgs e)
+        {
+            // フォームサイズ固定
+            this.MaximizedBounds = new Rectangle(this.Left, this.Top, this.Width, this.Height);
+            dtInput.Value = m_ExcuteDate;
+        }
+        #endregion
+
+        #region フォームクロージング
+        /// <summary>
+        /// フォームクロージング
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmInputDate_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            try
+            {
+                if (this.DialogResult != DialogResult.OK) this.DialogResult = DialogResult.Cancel;
+
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region キャンセルボタン
+        /// <summary>
+        /// キャンセルボタン追加
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnCancel_Click(object sender, EventArgs e)
+        {
+            this.DialogResult = DialogResult.Cancel;
+            this.Close();
+        }
+        #endregion
+
+        #region 変更ボタン
+        /// <summary>
+        /// 変更ボタン押下
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnExecProc_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                if(dtInput.Value.Date < DateTime.Today.Date)
+                {
+                    MessageBox.Show("承認希望日が過去日付になっています。","日付選択エラー",MessageBoxButtons.OK,MessageBoxIcon.Error);
+                    return;
+                }
+
+                m_ExcuteDate = dtInput.Value;
+                this.DialogResult = DialogResult.OK;
+                this.Close();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+    }
+}
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmInputDate.resx
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmInputDate.resx	(nonexistent)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmInputDate.resx	(revision 400)
@@ -0,0 +1,120 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.cs	(revision 399)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.cs	(revision 400)
@@ -1622,6 +1622,7 @@
         /// <param name="e"></param>
         private void button2_Click(object sender, EventArgs e)
         {
+            TestDataTest();
             //RecalcalculationPersonnelExpenses();
             //ReCalculation();
         }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.designer.cs	(revision 399)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.designer.cs	(revision 400)
@@ -87,14 +87,6 @@
             this.btnLineDel = new System.Windows.Forms.Button();
             this.btnLineAdd = new System.Windows.Forms.Button();
             this.panel2 = new System.Windows.Forms.Panel();
-            this.lblCellTotal = new System.Windows.Forms.Label();
-            this.btnDispDown = new System.Windows.Forms.Button();
-            this.btnDispUp = new System.Windows.Forms.Button();
-            this.btnOtherProc = new System.Windows.Forms.Button();
-            this.button1 = new System.Windows.Forms.Button();
-            this.button2 = new System.Windows.Forms.Button();
-            this.btnSelect = new System.Windows.Forms.Button();
-            this.btnCreate = new System.Windows.Forms.Button();
             this.dgvAllDisplay = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
             this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -125,6 +117,14 @@
             this.Column25 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column26 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column28 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.lblCellTotal = new System.Windows.Forms.Label();
+            this.btnDispDown = new System.Windows.Forms.Button();
+            this.btnDispUp = new System.Windows.Forms.Button();
+            this.btnOtherProc = new System.Windows.Forms.Button();
+            this.button1 = new System.Windows.Forms.Button();
+            this.button2 = new System.Windows.Forms.Button();
+            this.btnSelect = new System.Windows.Forms.Button();
+            this.btnCreate = new System.Windows.Forms.Button();
             this.grpExample1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
             this.lblReqSumType03 = new System.Windows.Forms.Label();
             this.lblReqSumType01 = new System.Windows.Forms.Label();
@@ -794,113 +794,6 @@
             this.panel2.Size = new System.Drawing.Size(1290, 450);
             this.panel2.TabIndex = 36;
             // 
-            // lblCellTotal
-            // 
-            this.lblCellTotal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.lblCellTotal.AutoSize = true;
-            this.lblCellTotal.BackColor = System.Drawing.Color.WhiteSmoke;
-            this.lblCellTotal.Font = new System.Drawing.Font("ＭＳ Ｐ明朝", 9.75F, System.Drawing.FontStyle.Bold);
-            this.lblCellTotal.ForeColor = System.Drawing.Color.Black;
-            this.lblCellTotal.Location = new System.Drawing.Point(100, 430);
-            this.lblCellTotal.Name = "lblCellTotal";
-            this.lblCellTotal.Size = new System.Drawing.Size(0, 13);
-            this.lblCellTotal.TabIndex = 36;
-            // 
-            // btnDispDown
-            // 
-            this.btnDispDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnDispDown.Font = new System.Drawing.Font("ＭＳ 明朝", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnDispDown.Location = new System.Drawing.Point(1300, 418);
-            this.btnDispDown.Name = "btnDispDown";
-            this.btnDispDown.Size = new System.Drawing.Size(40, 40);
-            this.btnDispDown.TabIndex = 42;
-            this.btnDispDown.TabStop = false;
-            this.btnDispDown.Text = "▼";
-            this.btnDispDown.UseVisualStyleBackColor = true;
-            this.btnDispDown.Visible = false;
-            this.btnDispDown.Click += new System.EventHandler(this.btnDispDown_Click);
-            // 
-            // btnDispUp
-            // 
-            this.btnDispUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnDispUp.Font = new System.Drawing.Font("ＭＳ 明朝", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnDispUp.Location = new System.Drawing.Point(1300, 354);
-            this.btnDispUp.Name = "btnDispUp";
-            this.btnDispUp.Size = new System.Drawing.Size(40, 40);
-            this.btnDispUp.TabIndex = 41;
-            this.btnDispUp.TabStop = false;
-            this.btnDispUp.Text = "▲";
-            this.btnDispUp.UseVisualStyleBackColor = true;
-            this.btnDispUp.Visible = false;
-            this.btnDispUp.Click += new System.EventHandler(this.btnDispUp_Click);
-            // 
-            // btnOtherProc
-            // 
-            this.btnOtherProc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnOtherProc.BackColor = System.Drawing.Color.SpringGreen;
-            this.btnOtherProc.Location = new System.Drawing.Point(7, 656);
-            this.btnOtherProc.Name = "btnOtherProc";
-            this.btnOtherProc.Size = new System.Drawing.Size(160, 30);
-            this.btnOtherProc.TabIndex = 95;
-            this.btnOtherProc.TabStop = false;
-            this.btnOtherProc.Text = "他の画面へ";
-            this.btnOtherProc.UseVisualStyleBackColor = false;
-            this.btnOtherProc.Click += new System.EventHandler(this.btnOtherProc_Click);
-            // 
-            // button1
-            // 
-            this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.button1.Location = new System.Drawing.Point(1300, 540);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(37, 35);
-            this.button1.TabIndex = 100;
-            this.button1.Text = "○";
-            this.button1.UseVisualStyleBackColor = true;
-            this.button1.Visible = false;
-            this.button1.Click += new System.EventHandler(this.button1_Click);
-            // 
-            // button2
-            // 
-            this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.button2.Location = new System.Drawing.Point(1300, 581);
-            this.button2.Name = "button2";
-            this.button2.Size = new System.Drawing.Size(37, 35);
-            this.button2.TabIndex = 101;
-            this.button2.Text = "１";
-            this.button2.UseVisualStyleBackColor = true;
-            this.button2.Visible = false;
-            this.button2.Click += new System.EventHandler(this.button2_Click);
-            // 
-            // btnSelect
-            // 
-            this.btnSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnSelect.BackColor = System.Drawing.Color.Green;
-            this.btnSelect.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnSelect.ForeColor = System.Drawing.Color.White;
-            this.btnSelect.Location = new System.Drawing.Point(546, 657);
-            this.btnSelect.Name = "btnSelect";
-            this.btnSelect.Size = new System.Drawing.Size(120, 30);
-            this.btnSelect.TabIndex = 102;
-            this.btnSelect.Text = "選　択";
-            this.btnSelect.UseVisualStyleBackColor = false;
-            this.btnSelect.Visible = false;
-            this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click);
-            // 
-            // btnCreate
-            // 
-            this.btnCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnCreate.BackColor = System.Drawing.Color.White;
-            this.btnCreate.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnCreate.ForeColor = System.Drawing.Color.Green;
-            this.btnCreate.Location = new System.Drawing.Point(420, 657);
-            this.btnCreate.Name = "btnCreate";
-            this.btnCreate.Size = new System.Drawing.Size(120, 30);
-            this.btnCreate.TabIndex = 103;
-            this.btnCreate.Text = "新　規";
-            this.btnCreate.UseVisualStyleBackColor = false;
-            this.btnCreate.Visible = false;
-            this.btnCreate.Click += new System.EventHandler(this.btnCreate_Click);
-            // 
             // dgvAllDisplay
             // 
             this.dgvAllDisplay.AllowUserToAddRows = false;
@@ -1243,6 +1136,113 @@
             this.Column28.ReadOnly = true;
             this.Column28.Visible = false;
             // 
+            // lblCellTotal
+            // 
+            this.lblCellTotal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.lblCellTotal.AutoSize = true;
+            this.lblCellTotal.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.lblCellTotal.Font = new System.Drawing.Font("ＭＳ Ｐ明朝", 9.75F, System.Drawing.FontStyle.Bold);
+            this.lblCellTotal.ForeColor = System.Drawing.Color.Black;
+            this.lblCellTotal.Location = new System.Drawing.Point(100, 430);
+            this.lblCellTotal.Name = "lblCellTotal";
+            this.lblCellTotal.Size = new System.Drawing.Size(0, 13);
+            this.lblCellTotal.TabIndex = 36;
+            // 
+            // btnDispDown
+            // 
+            this.btnDispDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnDispDown.Font = new System.Drawing.Font("ＭＳ 明朝", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnDispDown.Location = new System.Drawing.Point(1300, 418);
+            this.btnDispDown.Name = "btnDispDown";
+            this.btnDispDown.Size = new System.Drawing.Size(40, 40);
+            this.btnDispDown.TabIndex = 42;
+            this.btnDispDown.TabStop = false;
+            this.btnDispDown.Text = "▼";
+            this.btnDispDown.UseVisualStyleBackColor = true;
+            this.btnDispDown.Visible = false;
+            this.btnDispDown.Click += new System.EventHandler(this.btnDispDown_Click);
+            // 
+            // btnDispUp
+            // 
+            this.btnDispUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnDispUp.Font = new System.Drawing.Font("ＭＳ 明朝", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnDispUp.Location = new System.Drawing.Point(1300, 354);
+            this.btnDispUp.Name = "btnDispUp";
+            this.btnDispUp.Size = new System.Drawing.Size(40, 40);
+            this.btnDispUp.TabIndex = 41;
+            this.btnDispUp.TabStop = false;
+            this.btnDispUp.Text = "▲";
+            this.btnDispUp.UseVisualStyleBackColor = true;
+            this.btnDispUp.Visible = false;
+            this.btnDispUp.Click += new System.EventHandler(this.btnDispUp_Click);
+            // 
+            // btnOtherProc
+            // 
+            this.btnOtherProc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.btnOtherProc.BackColor = System.Drawing.Color.SpringGreen;
+            this.btnOtherProc.Location = new System.Drawing.Point(7, 656);
+            this.btnOtherProc.Name = "btnOtherProc";
+            this.btnOtherProc.Size = new System.Drawing.Size(160, 30);
+            this.btnOtherProc.TabIndex = 95;
+            this.btnOtherProc.TabStop = false;
+            this.btnOtherProc.Text = "他の画面へ";
+            this.btnOtherProc.UseVisualStyleBackColor = false;
+            this.btnOtherProc.Click += new System.EventHandler(this.btnOtherProc_Click);
+            // 
+            // button1
+            // 
+            this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.button1.Location = new System.Drawing.Point(1300, 540);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(37, 35);
+            this.button1.TabIndex = 100;
+            this.button1.Text = "○";
+            this.button1.UseVisualStyleBackColor = true;
+            this.button1.Visible = false;
+            this.button1.Click += new System.EventHandler(this.button1_Click);
+            // 
+            // button2
+            // 
+            this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.button2.Location = new System.Drawing.Point(1300, 581);
+            this.button2.Name = "button2";
+            this.button2.Size = new System.Drawing.Size(37, 35);
+            this.button2.TabIndex = 101;
+            this.button2.Text = "１";
+            this.button2.UseVisualStyleBackColor = true;
+            this.button2.Visible = false;
+            this.button2.Click += new System.EventHandler(this.button2_Click);
+            // 
+            // btnSelect
+            // 
+            this.btnSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnSelect.BackColor = System.Drawing.Color.Green;
+            this.btnSelect.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnSelect.ForeColor = System.Drawing.Color.White;
+            this.btnSelect.Location = new System.Drawing.Point(546, 657);
+            this.btnSelect.Name = "btnSelect";
+            this.btnSelect.Size = new System.Drawing.Size(120, 30);
+            this.btnSelect.TabIndex = 102;
+            this.btnSelect.Text = "選　択";
+            this.btnSelect.UseVisualStyleBackColor = false;
+            this.btnSelect.Visible = false;
+            this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click);
+            // 
+            // btnCreate
+            // 
+            this.btnCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnCreate.BackColor = System.Drawing.Color.White;
+            this.btnCreate.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnCreate.ForeColor = System.Drawing.Color.Green;
+            this.btnCreate.Location = new System.Drawing.Point(420, 657);
+            this.btnCreate.Name = "btnCreate";
+            this.btnCreate.Size = new System.Drawing.Size(120, 30);
+            this.btnCreate.TabIndex = 103;
+            this.btnCreate.Text = "新　規";
+            this.btnCreate.UseVisualStyleBackColor = false;
+            this.btnCreate.Visible = false;
+            this.btnCreate.Click += new System.EventHandler(this.btnCreate_Click);
+            // 
             // grpExample1
             // 
             this.grpExample1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs	(revision 399)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs	(revision 400)
@@ -9821,5 +9821,45 @@
 
         // ---------- ※．データコンバートロジック↑↑
         #endregion
+
+        #region ※．テストロジック↓↓
+        // ---------- ※．テストロジック↓↓
+
+        private void TestDataTest()
+        {
+            IOConstructionLedger LedgerDB = new IOConstructionLedger();
+            IOConstructionLedgerExcute ExecDB = new IOConstructionLedgerExcute();
+            try
+            {
+                LedgerDB.connect(); LedgerDB.beginTran();
+                ExecDB.connect(); ExecDB.beginTran();
+
+                bool bret = ClsChangeLedgerData.ModifyReceiveMoney(LedgerDB
+                                                , ExecDB
+                                                , m_ConstructionCode
+                                                , "2018/10"
+                                                , 100000);
+
+                if (!bret)
+                {
+                    LedgerDB.rollback();
+                    ExecDB.rollback();
+                }
+
+                LedgerDB.commit();
+                ExecDB.commit();
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                LedgerDB.close(); LedgerDB = null;
+                ExecDB.close(); ExecDB = null;
+            }
+        }
+        // ---------- ※．テストロジック↑↑
+        #endregion
     }
 }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CopyTargetList/FrmNewOrContinueCopy.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CopyTargetList/FrmNewOrContinueCopy.Designer.cs	(revision 399)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CopyTargetList/FrmNewOrContinueCopy.Designer.cs	(revision 400)
@@ -117,7 +117,7 @@
             // 
             // groupBox2
             // 
-            this.groupBox2.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.groupBox2.BackColor = System.Drawing.Color.LightGray;
             this.groupBox2.Controls.Add(this.panel5);
             this.groupBox2.Controls.Add(this.panel4);
             this.groupBox2.Controls.Add(this.panel3);
@@ -132,7 +132,8 @@
             // 
             // panel5
             // 
-            this.panel5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel5.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.panel5.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.panel5.Controls.Add(this.label18);
             this.panel5.Controls.Add(this.label17);
             this.panel5.Controls.Add(this.radioButton4);
@@ -179,7 +180,8 @@
             // 
             // panel4
             // 
-            this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel4.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.panel4.Controls.Add(this.label16);
             this.panel4.Controls.Add(this.radioButton3);
             this.panel4.Controls.Add(this.label15);
@@ -226,7 +228,8 @@
             // 
             // panel3
             // 
-            this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel3.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.panel3.Controls.Add(this.label5);
             this.panel3.Controls.Add(this.label8);
             this.panel3.Controls.Add(this.radioButton2);
@@ -273,7 +276,8 @@
             // 
             // panel2
             // 
-            this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel2.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.panel2.Controls.Add(this.label1);
             this.panel2.Controls.Add(this.label6);
             this.panel2.Controls.Add(this.radioButton1);
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudgetAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudgetAuxiliary.cs	(revision 399)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudgetAuxiliary.cs	(revision 400)
@@ -35,6 +35,9 @@
                 m_WindowWidth = this.Width;
                 m_WindowHeight = this.Height;
 
+                // 製品版は以下を処理しない
+                if (ProductDefine.ProductType != (int)ProductDefine.ProductTypeDef.Originals) return;
+
                 bool bDspFlag = false;
                 // 最高管理者以外は共通費計算画面を表示しない
                 int SRank = (int)CommonDefine.SecurityRankPos.SpecialAuthority;   // 経営者アクセス
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInputAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInputAuxiliary.cs	(revision 399)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInputAuxiliary.cs	(revision 400)
@@ -657,28 +657,7 @@
                     if (CommonMotions.chkObjectIsNull(RowData.Cells[(int)GridItemColumn.ComponentCode].Value)) return false;
                     if (!CommonMotions.chkNumeric(RowData.Cells[(int)GridItemColumn.ComponentCode].Value)) return false;
                 }
-                //// 名前チェック
-                //if (ProcessCommon.chkObjectIsNull(chkFeild[0]) && ProcessCommon.chkObjectIsNull(chkFeild[1])) return false;
-                //if (chkFeild[0].ToString().Trim() == "" && chkFeild[1].ToString().Trim() == "") return false;
 
-                //if (bNumCheck)
-                //{
-                //    // 数量
-                //    if (!ProcessCommon.chkObjectIsNull(chkFeild[4]))
-                //    {
-                //        if (!ProcessCommon.chkNumeric(chkFeild[4].ToString())) return false;
-                //    }
-                //    // 単価
-                //    if (!ProcessCommon.chkObjectIsNull(chkFeild[5]))
-                //    {
-                //        if (!ProcessCommon.chkNumeric(chkFeild[5].ToString())) return false;
-                //    }
-                //    // 金額
-                //    if (!ProcessCommon.chkObjectIsNull(chkFeild[6]))
-                //    {
-                //        if (!ProcessCommon.chkNumeric(chkFeild[6].ToString())) return false;
-                //    }
-                //}
                 return true;
             }
             catch (Exception ex)
@@ -2291,7 +2270,7 @@
                 // チェック有ページでも金額が無ければ処理しない
                 if (lAmount == 0) return bRet;
 
-                if (dCnt > 0 && strUnitName.Length > 0)
+                if (dCnt != 0 && strUnitName.Length > 0)
                 {
                     // 両方とも入っていれば正常
                 }
@@ -5425,15 +5404,17 @@
             try
             {
                 // まず削除する
-                string DelSQL = edDB.CreatePrimarykeyString(CommonMotions.cnvIntFromStringCode(m_dispLabelControl[(int)DispLabel.ConstructionCode].Text, "-"));
+                int nConstrCode = CommonMotions.cnvIntFromStringCode(m_dispLabelControl[(int)DispLabel.ConstructionCode].Text, "-");
+                string DelSQL = edDB.CreatePrimarykeyString(nConstrCode);
                 // データがある場合
                 // データ更新
                 edDB.DeleteAction(DelSQL, false);
 
+                List<EstimateData> workList = new List<EstimateData>();
                 int iLinecount = 0;
                 foreach (DataGridViewRow wrkRows in dgvEntryData.Rows)
                 {
-                    List<EstimateData> workList = new List<EstimateData>();
+
                     EstimateData work = new EstimateData();
 
                     // 無効行は処理しない
@@ -5440,7 +5421,7 @@
                     if (!ChkGridLineEffectiveness(wrkRows)) continue;
 
                     // 工事コード
-                    work.ConstructionCode = CommonMotions.cnvIntFromStringCode(m_dispLabelControl[(int)DispLabel.ConstructionCode].Text, "-");
+                    work.ConstructionCode = nConstrCode;
 
                     // 行番号
                     work.LineCount = ++iLinecount;
@@ -5486,14 +5467,16 @@
                     if (!CommonMotions.chkObjectIsNull(wrkRows.Cells[(int)GridTotalColumn.InputFlg].Value))
                         work.InputFlg = CommonMotions.cnvInt(wrkRows.Cells[(int)GridTotalColumn.InputFlg].Value);
 
-                    // データ登録
-                    if (!edDB.InsertAction(work, false))
-                    {
-                        LogicalErrorMessage("積算見積データ：登録に失敗しました。", "登録エラー", CommonMotions.GetMethodName());
-                        return false;
-                    }
+                    workList.Add(work);
                 }
 
+                // データ登録
+                if (!edDB.InsertAction(workList, false))
+                {
+                    LogicalErrorMessage("積算見積データ：登録に失敗しました。", "登録エラー", CommonMotions.GetMethodName());
+                    return false;
+                }
+
                 return true;
             }
             catch (System.Exception ex)
@@ -5513,21 +5496,21 @@
             try
             {
                 // まず削除する
-                string DelSQL = edbDB.CreatePrimarykeyString(CommonMotions.cnvIntFromStringCode(m_dispLabelControl[(int)DispLabel.ConstructionCode].Text, "-"));
+                int nConstrCode = CommonMotions.cnvIntFromStringCode(m_dispLabelControl[(int)DispLabel.ConstructionCode].Text, "-");
+                string DelSQL = edbDB.CreatePrimarykeyString(nConstrCode);
                 // データがある場合
                 // データ更新
                 edbDB.DeleteAction(DelSQL, false);
 
+                List<EstimateDataBody> workList = new List<EstimateDataBody>();
                 // タブ数分処理を行う
                 for (int iTabs = 1; iTabs < m_EntryPage.Count; iTabs++)
                 {
-
                     // データ定義
-                    List<EstimateDataBody> workList = new List<EstimateDataBody>();
                     EstimateDataBody work = new EstimateDataBody();
 
                     // 工事コード
-                    work.ConstructionCode = CommonMotions.cnvIntFromStringCode(m_dispLabelControl[(int)DispLabel.ConstructionCode].Text, "-");
+                    work.ConstructionCode = nConstrCode;
 
                     // ページ番号
                     work.PageCount = iTabs;
@@ -5549,14 +5532,9 @@
                     string wrkCompornent = m_EntryPage[iTabs].EntryLabel[(int)PageLabelCount.ComponentLabel].Text.ToString();
                     if (m_EntryPage[iTabs].Cotegory == CommonDefine.TabCotegory.Item)
                     {
-                        //work.SelectComponent = CommonMotions.GetArrayStructureName(wrkCompornent.Substring(wrkCompornent.IndexOf(CompornentDelimiter) + 1));
                         work.SelectComponent = m_EntryPage[iTabs].BelongingToComponentCode;
                     }
 
-                    // ページ表示名
-                    //string wrkTitle = m_EntryPage[iTabs].EntryLabel[(int)PageLabelCount.ItemLabel].Text.ToString();
-                    //work.PageTitle = wrkTitle.Substring(wrkTitle.IndexOf(CompornentDelimiter) + 1);
-
                     work.PageTitle = m_EntryPage[iTabs].EntryTab.Text.Trim();
 
                     // 明細行番号
@@ -5572,14 +5550,16 @@
                     }
                     work.DetailLineCount = fromRow;
 
+                    workList.Add(work);
+                } // iTabs
 
-                    // データ登録
-                    if (!edbDB.InsertAction(work, false))
-                    {
-                        LogicalErrorMessage("登録に失敗しました。", "登録エラー", CommonMotions.GetMethodName());
-                        return false;
-                    }
-                } // iTabs
+                // データ登録
+                if (!edbDB.InsertAction(workList, false))
+                {
+                    LogicalErrorMessage("登録に失敗しました。", "登録エラー", CommonMotions.GetMethodName());
+                    return false;
+                }
+
                 return true;
             }
             catch (System.Exception ex)
@@ -5599,30 +5579,34 @@
             try
             {
                 // まず削除する
-                string DelSQL = eddDB.CreatePrimarykeyString(CommonMotions.cnvIntFromStringCode(m_dispLabelControl[(int)DispLabel.ConstructionCode].Text, "-"));
+                int nConstrCode = CommonMotions.cnvIntFromStringCode(m_dispLabelControl[(int)DispLabel.ConstructionCode].Text, "-");
+                string DelSQL = eddDB.CreatePrimarykeyString(nConstrCode);
                 // データがある場合
                 // データ更新
                 eddDB.DeleteAction(DelSQL, false);
 
+                List<EstimateDataDetail> workList = new List<EstimateDataDetail>();
                 // タブ数分処理を行う
                 for (int iTabs = 1; iTabs < m_EntryPage.Count; iTabs++)
                 {
                     DataGridViewEX wrkGrid = m_EntryPage[iTabs].EntryDGV;
-                    for (int iRows = 0; iRows < wrkGrid.RowCount; iRows++)
+                    //for (int iRows = 0; iRows < wrkGrid.RowCount; iRows++)
+                    bool bDataOn = false;
+                    for (int iRows = (wrkGrid.RowCount - 1); iRows >= 0; iRows--)
                     {
                         // 行データ定義
                         DataGridViewRow wrkRows = wrkGrid.Rows[iRows];
 
                         // データ定義
-                        List<EstimateDataDetail> workList = new List<EstimateDataDetail>();
                         EstimateDataDetail work = new EstimateDataDetail();
 
                         // データセット
                         // 無効行は処理しない
-                        if (!ChkGridLineEffectiveness(wrkRows)) continue;
+                        if (!bDataOn && !ChkGridLineEffectiveness(wrkRows)) continue;
 
+                        bDataOn = true;
                         // 工事コード
-                        work.ConstructionCode = CommonMotions.cnvIntFromStringCode(m_dispLabelControl[(int)DispLabel.ConstructionCode].Text, "-");
+                        work.ConstructionCode = nConstrCode;
 
                         // ページ番号
                         work.PageCount = iTabs;
@@ -5696,14 +5680,16 @@
                             if (!CommonMotions.chkObjectIsNull(wrkRows.Cells[(int)GridComponentColumn.InputFlg].Value))
                                 work.InputFlg = CommonMotions.cnvInt(wrkRows.Cells[(int)GridComponentColumn.InputFlg].Value);
                         }
-                        // データ登録
-                        if (!eddDB.InsertAction(work, false))
-                        {
-                            LogicalErrorMessage("登録に失敗しました。", "登録エラー", CommonMotions.GetMethodName());
-                            return false;
-                        }
+                        workList.Add(work);
                     } // iRows
                 } // iTabs
+
+                // データ登録
+                if (!eddDB.InsertAction(workList, false))
+                {
+                    LogicalErrorMessage("登録に失敗しました。", "登録エラー", CommonMotions.GetMethodName());
+                    return false;
+                }
                 return true;
             }
             catch (System.Exception ex)
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInput.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInput.Designer.cs	(revision 399)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInput.Designer.cs	(revision 400)
@@ -28,27 +28,27 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
             this.label3 = new System.Windows.Forms.Label();
             this.btnEntry = new System.Windows.Forms.Button();
             this.btnEnd = new System.Windows.Forms.Button();
@@ -362,6 +362,7 @@
             this.cbReqMonth.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.cbReqMonth.FormattingEnabled = true;
             this.cbReqMonth.Location = new System.Drawing.Point(707, 10);
+            this.cbReqMonth.MaxDropDownItems = 12;
             this.cbReqMonth.Name = "cbReqMonth";
             this.cbReqMonth.Size = new System.Drawing.Size(109, 24);
             this.cbReqMonth.TabIndex = 5;
@@ -479,9 +480,9 @@
             // col004
             // 
             this.col004.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control;
-            this.col004.DefaultCellStyle = dataGridViewCellStyle22;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
+            this.col004.DefaultCellStyle = dataGridViewCellStyle1;
             this.col004.Frozen = true;
             this.col004.HeaderText = "";
             this.col004.Name = "col004";
@@ -492,8 +493,8 @@
             // 
             // col005
             // 
-            dataGridViewCellStyle23.BackColor = System.Drawing.Color.White;
-            this.col005.DefaultCellStyle = dataGridViewCellStyle23;
+            dataGridViewCellStyle2.BackColor = System.Drawing.Color.White;
+            this.col005.DefaultCellStyle = dataGridViewCellStyle2;
             this.col005.Frozen = true;
             this.col005.HeaderText = "";
             this.col005.Name = "col005";
@@ -504,9 +505,9 @@
             // 
             // col006
             // 
-            dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle24.BackColor = System.Drawing.Color.White;
-            this.col006.DefaultCellStyle = dataGridViewCellStyle24;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle3.BackColor = System.Drawing.Color.White;
+            this.col006.DefaultCellStyle = dataGridViewCellStyle3;
             this.col006.Frozen = true;
             this.col006.HeaderText = "受注金額";
             this.col006.Name = "col006";
@@ -516,9 +517,9 @@
             // 
             // col007
             // 
-            dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Control;
-            this.col007.DefaultCellStyle = dataGridViewCellStyle25;
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
+            this.col007.DefaultCellStyle = dataGridViewCellStyle4;
             this.col007.Frozen = true;
             this.col007.HeaderText = "";
             this.col007.Name = "col007";
@@ -528,8 +529,8 @@
             // 
             // col008
             // 
-            dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.col008.DefaultCellStyle = dataGridViewCellStyle26;
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.col008.DefaultCellStyle = dataGridViewCellStyle5;
             this.col008.FillWeight = 120F;
             this.col008.Frozen = true;
             this.col008.HeaderText = "合計";
@@ -540,8 +541,8 @@
             // 
             // col009
             // 
-            dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.col009.DefaultCellStyle = dataGridViewCellStyle27;
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.col009.DefaultCellStyle = dataGridViewCellStyle6;
             this.col009.HeaderText = "1回目";
             this.col009.Name = "col009";
             this.col009.ReadOnly = true;
@@ -550,8 +551,8 @@
             // 
             // col010
             // 
-            dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.col010.DefaultCellStyle = dataGridViewCellStyle28;
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.col010.DefaultCellStyle = dataGridViewCellStyle7;
             this.col010.HeaderText = "2回目";
             this.col010.Name = "col010";
             this.col010.ReadOnly = true;
@@ -560,8 +561,8 @@
             // 
             // col011
             // 
-            dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.col011.DefaultCellStyle = dataGridViewCellStyle29;
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.col011.DefaultCellStyle = dataGridViewCellStyle8;
             this.col011.HeaderText = "3回目";
             this.col011.Name = "col011";
             this.col011.ReadOnly = true;
@@ -570,8 +571,8 @@
             // 
             // col12
             // 
-            dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.col12.DefaultCellStyle = dataGridViewCellStyle30;
+            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.col12.DefaultCellStyle = dataGridViewCellStyle9;
             this.col12.HeaderText = "4回目";
             this.col12.Name = "col12";
             this.col12.ReadOnly = true;
@@ -581,8 +582,8 @@
             // 
             // col13
             // 
-            dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.col13.DefaultCellStyle = dataGridViewCellStyle31;
+            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.col13.DefaultCellStyle = dataGridViewCellStyle10;
             this.col13.HeaderText = "5回目";
             this.col13.Name = "col13";
             this.col13.ReadOnly = true;
@@ -592,8 +593,8 @@
             // 
             // col14
             // 
-            dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.col14.DefaultCellStyle = dataGridViewCellStyle32;
+            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.col14.DefaultCellStyle = dataGridViewCellStyle11;
             this.col14.HeaderText = "6回目";
             this.col14.Name = "col14";
             this.col14.ReadOnly = true;
@@ -603,8 +604,8 @@
             // 
             // col15
             // 
-            dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.col15.DefaultCellStyle = dataGridViewCellStyle33;
+            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.col15.DefaultCellStyle = dataGridViewCellStyle12;
             this.col15.HeaderText = "7回目";
             this.col15.Name = "col15";
             this.col15.ReadOnly = true;
@@ -614,8 +615,8 @@
             // 
             // col16
             // 
-            dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.col16.DefaultCellStyle = dataGridViewCellStyle34;
+            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.col16.DefaultCellStyle = dataGridViewCellStyle13;
             this.col16.HeaderText = "8回目";
             this.col16.Name = "col16";
             this.col16.ReadOnly = true;
@@ -625,8 +626,8 @@
             // 
             // col17
             // 
-            dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.col17.DefaultCellStyle = dataGridViewCellStyle35;
+            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.col17.DefaultCellStyle = dataGridViewCellStyle14;
             this.col17.HeaderText = "9回目";
             this.col17.Name = "col17";
             this.col17.ReadOnly = true;
@@ -636,8 +637,8 @@
             // 
             // col18
             // 
-            dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.col18.DefaultCellStyle = dataGridViewCellStyle36;
+            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.col18.DefaultCellStyle = dataGridViewCellStyle15;
             this.col18.HeaderText = "10回目";
             this.col18.Name = "col18";
             this.col18.ReadOnly = true;
@@ -647,8 +648,8 @@
             // 
             // col19
             // 
-            dataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.col19.DefaultCellStyle = dataGridViewCellStyle37;
+            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.col19.DefaultCellStyle = dataGridViewCellStyle16;
             this.col19.HeaderText = "11回目";
             this.col19.Name = "col19";
             this.col19.ReadOnly = true;
@@ -658,8 +659,8 @@
             // 
             // col20
             // 
-            dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.col20.DefaultCellStyle = dataGridViewCellStyle38;
+            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.col20.DefaultCellStyle = dataGridViewCellStyle17;
             this.col20.HeaderText = "12回目";
             this.col20.Name = "col20";
             this.col20.ReadOnly = true;
@@ -669,8 +670,8 @@
             // 
             // col21
             // 
-            dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.col21.DefaultCellStyle = dataGridViewCellStyle39;
+            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.col21.DefaultCellStyle = dataGridViewCellStyle18;
             this.col21.HeaderText = "13回目";
             this.col21.Name = "col21";
             this.col21.ReadOnly = true;
@@ -680,8 +681,8 @@
             // 
             // col22
             // 
-            dataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.col22.DefaultCellStyle = dataGridViewCellStyle40;
+            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.col22.DefaultCellStyle = dataGridViewCellStyle19;
             this.col22.HeaderText = "14回目";
             this.col22.Name = "col22";
             this.col22.ReadOnly = true;
@@ -691,8 +692,8 @@
             // 
             // col23
             // 
-            dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.col23.DefaultCellStyle = dataGridViewCellStyle41;
+            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.col23.DefaultCellStyle = dataGridViewCellStyle20;
             this.col23.HeaderText = "15回目";
             this.col23.Name = "col23";
             this.col23.ReadOnly = true;
@@ -702,8 +703,8 @@
             // 
             // col098
             // 
-            dataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.col098.DefaultCellStyle = dataGridViewCellStyle42;
+            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.col098.DefaultCellStyle = dataGridViewCellStyle21;
             this.col098.HeaderText = "残り";
             this.col098.Name = "col098";
             this.col098.ReadOnly = true;
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmCancelInvoice.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmCancelInvoice.Designer.cs	(revision 399)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmCancelInvoice.Designer.cs	(revision 400)
@@ -28,13 +28,10 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
-            this.btnExecProc1 = new System.Windows.Forms.Button();
-            this.btnCancel = new System.Windows.Forms.Button();
-            this.panel1 = new System.Windows.Forms.Panel();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
             this.groupBoxEx2 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
             this.textBox1 = new System.Windows.Forms.TextBox();
             this.label6 = new System.Windows.Forms.Label();
@@ -44,6 +41,9 @@
             this.lblValue04 = new System.Windows.Forms.Label();
             this.groupBoxEx1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
             this.dgv1 = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
+            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.col2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.col3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.label1 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
             this.lblValue03 = new System.Windows.Forms.Label();
@@ -50,51 +50,13 @@
             this.lblValue02 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.lblValue01 = new System.Windows.Forms.Label();
-            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.col2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.col3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.panel1.SuspendLayout();
+            this.btnCancel = new System.Windows.Forms.Button();
+            this.btnExecProc1 = new System.Windows.Forms.Button();
             this.groupBoxEx2.SuspendLayout();
             this.groupBoxEx1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgv1)).BeginInit();
             this.SuspendLayout();
             // 
-            // btnExecProc1
-            // 
-            this.btnExecProc1.BackColor = System.Drawing.Color.Green;
-            this.btnExecProc1.FlatStyle = System.Windows.Forms.FlatStyle.System;
-            this.btnExecProc1.ForeColor = System.Drawing.Color.White;
-            this.btnExecProc1.Location = new System.Drawing.Point(683, 10);
-            this.btnExecProc1.Name = "btnExecProc1";
-            this.btnExecProc1.Size = new System.Drawing.Size(140, 40);
-            this.btnExecProc1.TabIndex = 0;
-            this.btnExecProc1.Text = "取消実行";
-            this.btnExecProc1.UseVisualStyleBackColor = false;
-            this.btnExecProc1.Click += new System.EventHandler(this.btnExecProc1_Click);
-            // 
-            // btnCancel
-            // 
-            this.btnCancel.BackColor = System.Drawing.Color.Red;
-            this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.System;
-            this.btnCancel.ForeColor = System.Drawing.Color.White;
-            this.btnCancel.Location = new System.Drawing.Point(835, 10);
-            this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Size = new System.Drawing.Size(140, 40);
-            this.btnCancel.TabIndex = 3;
-            this.btnCancel.Text = "キャンセル";
-            this.btnCancel.UseVisualStyleBackColor = false;
-            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
-            // 
-            // panel1
-            // 
-            this.panel1.BackColor = System.Drawing.Color.WhiteSmoke;
-            this.panel1.Controls.Add(this.btnCancel);
-            this.panel1.Controls.Add(this.btnExecProc1);
-            this.panel1.Location = new System.Drawing.Point(-3, 504);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(990, 60);
-            this.panel1.TabIndex = 3;
-            // 
             // groupBoxEx2
             // 
             this.groupBoxEx2.BackColor = System.Drawing.Color.WhiteSmoke;
@@ -198,14 +160,14 @@
             this.dgv1.AllowUserToResizeColumns = false;
             this.dgv1.AllowUserToResizeRows = false;
             this.dgv1.BackgroundColor = System.Drawing.Color.White;
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle5.Font = new System.Drawing.Font("ＭＳ 明朝", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgv1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("ＭＳ 明朝", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgv1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
             this.dgv1.ColumnHeadersHeight = 24;
             this.dgv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgv1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -223,6 +185,44 @@
             this.dgv1.Size = new System.Drawing.Size(944, 150);
             this.dgv1.TabIndex = 44;
             // 
+            // Column1
+            // 
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.Black;
+            this.Column1.DefaultCellStyle = dataGridViewCellStyle2;
+            this.Column1.Frozen = true;
+            this.Column1.HeaderText = "№";
+            this.Column1.Name = "Column1";
+            this.Column1.ReadOnly = true;
+            this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column1.Width = 60;
+            // 
+            // col2
+            // 
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("ＭＳ 明朝", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.col2.DefaultCellStyle = dataGridViewCellStyle3;
+            this.col2.Frozen = true;
+            this.col2.HeaderText = "請　求　案　件";
+            this.col2.Name = "col2";
+            this.col2.ReadOnly = true;
+            this.col2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.col2.Width = 664;
+            // 
+            // col3
+            // 
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle4.ForeColor = System.Drawing.Color.Black;
+            this.col3.DefaultCellStyle = dataGridViewCellStyle4;
+            this.col3.Frozen = true;
+            this.col3.HeaderText = "請　求　金　額";
+            this.col3.Name = "col3";
+            this.col3.ReadOnly = true;
+            this.col3.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.col3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.col3.Width = 200;
+            // 
             // label1
             // 
             this.label1.AutoSize = true;
@@ -280,54 +280,38 @@
             this.lblValue01.TabIndex = 3;
             this.lblValue01.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // Column1
+            // btnCancel
             // 
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle6.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle6.ForeColor = System.Drawing.Color.Black;
-            this.Column1.DefaultCellStyle = dataGridViewCellStyle6;
-            this.Column1.Frozen = true;
-            this.Column1.HeaderText = "№";
-            this.Column1.Name = "Column1";
-            this.Column1.ReadOnly = true;
-            this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column1.Width = 60;
+            this.btnCancel.BackColor = System.Drawing.Color.Red;
+            this.btnCancel.ForeColor = System.Drawing.Color.White;
+            this.btnCancel.Location = new System.Drawing.Point(832, 509);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Size = new System.Drawing.Size(140, 40);
+            this.btnCancel.TabIndex = 22;
+            this.btnCancel.Text = "キャンセル";
+            this.btnCancel.UseVisualStyleBackColor = false;
             // 
-            // col2
+            // btnExecProc1
             // 
-            dataGridViewCellStyle7.Font = new System.Drawing.Font("ＭＳ 明朝", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.col2.DefaultCellStyle = dataGridViewCellStyle7;
-            this.col2.Frozen = true;
-            this.col2.HeaderText = "請　求　案　件";
-            this.col2.Name = "col2";
-            this.col2.ReadOnly = true;
-            this.col2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.col2.Width = 664;
+            this.btnExecProc1.BackColor = System.Drawing.Color.Green;
+            this.btnExecProc1.ForeColor = System.Drawing.Color.White;
+            this.btnExecProc1.Location = new System.Drawing.Point(680, 509);
+            this.btnExecProc1.Name = "btnExecProc1";
+            this.btnExecProc1.Size = new System.Drawing.Size(140, 40);
+            this.btnExecProc1.TabIndex = 21;
+            this.btnExecProc1.Text = "取消実行";
+            this.btnExecProc1.UseVisualStyleBackColor = false;
             // 
-            // col3
-            // 
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle8.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle8.ForeColor = System.Drawing.Color.Black;
-            this.col3.DefaultCellStyle = dataGridViewCellStyle8;
-            this.col3.Frozen = true;
-            this.col3.HeaderText = "請　求　金　額";
-            this.col3.Name = "col3";
-            this.col3.ReadOnly = true;
-            this.col3.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.col3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.col3.Width = 200;
-            // 
             // FrmCancelInvoice
             // 
-            this.AcceptButton = this.btnExecProc1;
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
-            this.BackColor = System.Drawing.Color.White;
+            this.BackColor = System.Drawing.Color.PaleGoldenrod;
             this.ClientSize = new System.Drawing.Size(984, 561);
+            this.Controls.Add(this.btnCancel);
+            this.Controls.Add(this.btnExecProc1);
             this.Controls.Add(this.groupBoxEx2);
             this.Controls.Add(this.groupBoxEx1);
-            this.Controls.Add(this.panel1);
             this.Font = new System.Drawing.Font("ＭＳ 明朝", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.KeyPreview = true;
@@ -340,7 +324,6 @@
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmStatusAndDate_FormClosed);
             this.Load += new System.EventHandler(this.FrmCostStructureDiag_Load);
             this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.FrmCancelInvoice_KeyDown);
-            this.panel1.ResumeLayout(false);
             this.groupBoxEx2.ResumeLayout(false);
             this.groupBoxEx2.PerformLayout();
             this.groupBoxEx1.ResumeLayout(false);
@@ -351,10 +334,6 @@
         }
 
         #endregion
-
-        private System.Windows.Forms.Button btnExecProc1;
-        private System.Windows.Forms.Button btnCancel;
-        private System.Windows.Forms.Panel panel1;
         private CustomControls.GroupBoxEx groupBoxEx1;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.Label label3;
@@ -373,5 +352,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
         private System.Windows.Forms.DataGridViewTextBoxColumn col2;
         private System.Windows.Forms.DataGridViewTextBoxColumn col3;
+        private System.Windows.Forms.Button btnCancel;
+        private System.Windows.Forms.Button btnExecProc1;
     }
 }
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCosts.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCosts.Designer.cs	(revision 399)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCosts.Designer.cs	(revision 400)
@@ -3066,6 +3066,7 @@
             this.comboBox1.FormattingEnabled = true;
             this.comboBox1.IntegralHeight = false;
             this.comboBox1.Location = new System.Drawing.Point(133, 4);
+            this.comboBox1.MaxDropDownItems = 12;
             this.comboBox1.Name = "comboBox1";
             this.comboBox1.Size = new System.Drawing.Size(160, 29);
             this.comboBox1.TabIndex = 0;
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/Master/PersonInCharge/FrmPersonInChargeAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/Master/PersonInCharge/FrmPersonInChargeAuxiliary.cs	(revision 399)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/Master/PersonInCharge/FrmPersonInChargeAuxiliary.cs	(revision 400)
@@ -282,12 +282,20 @@
                 // 担当者マスタ取得クラス領域
                 List<PersonInChargeMaster> pic = new List<PersonInChargeMaster>();
                 // 担当者マスタ取得SQL
-                int Delflg = 0;
-                if (rdbMode2.Checked) Delflg = 1;
                 StringBuilder strSql = new StringBuilder();
                 strSql.AppendFormat(" Where EmployeeClassFlg = {0}", m_EntryMode);
-                strSql.AppendFormat(" And DeleteFlg = {0}", Delflg);
-                strSql.Append(" Order By DisplayOrder ASC");
+
+                if (rdbMode1.Checked)
+                {
+                    strSql.Append(" And DeleteFlg = 0");
+                    strSql.Append(" Order By DisplayOrder ASC");
+                }
+                else
+                {
+                    strSql.Append(" And DeleteFlg = 1");
+                    strSql.Append(" Order By EndDate Desc, DisplayOrder ASC");
+                }
+
                 // グリッドの行を0に戻す
                 dgvMaster.Rows.Clear();
                 // 担当者マスタ取得
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Security/FrmSecurity.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Security/FrmSecurity.cs	(revision 399)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Security/FrmSecurity.cs	(revision 400)
@@ -86,11 +86,13 @@
         private static int s_TitleRowCnt = 5;
         #endregion
 
-        #region データ表示定義
+        #region マスタデータ表示定義
+
+        #region オリジナルデータ表示定義
         /// <summary>
-        /// データ表示定義
+        /// オリジナルデータ表示定義
         /// </summary>
-        private KeyValuePair<int, string>[] s_ConfigurationArray = {
+        private KeyValuePair<int, string>[] s_OriginalArray = {
                                                     new KeyValuePair<int, string>(-1, "共　通　処　理"),                                                    // ----- タイトル
                                                     new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.ConstructionList, string.Empty),          //  1:工事情報一覧
                                                     new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.ApprovalDocumentList, string.Empty),      //  7:承認申請一覧
@@ -169,7 +171,6 @@
                                                     new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.Unit, string.Empty),                  // 単位登録
                                                     new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.Calender, string.Empty),              // カレンダー登録
                                                     new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.VehicleMaster, string.Empty),         // 車両登録
-                                                    new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.SaleSalesGraphData, string.Empty),    // 売上グラフデータ入力
                                                     new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.MaterialKind, string.Empty),          // 資材種類登録
                                                     new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.MaterialItem, string.Empty),          // 資材品目登録
                                                     new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.SalesConfirm, string.Empty),          // 売上確認
@@ -178,8 +179,69 @@
                                                     new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.AddressConvert, string.Empty),        // 郵便番号引込
                                                 };
         #endregion
+
+        #region 製品版データ定義
+        /// <summary>
+        /// 製品版データ定義
+        /// </summary>
+        private KeyValuePair<int, string>[] s_ProductType1 = {
+                                                    new KeyValuePair<int, string>(-1, "共　通　処　理"),                                                   // ----- タイトル
+                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.ConstructionList, string.Empty),          //  1:工事情報一覧
+                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.ApprovalDocumentList, string.Empty),      //  7:承認申請一覧
+                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.ConstructionCopyList, string.Empty),      //  8:工事案件コピー機能
+                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.RequestInputlList, string.Empty),         // 39:請求作成選択一覧
+                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.RequestPrintList, string.Empty),          // 45:請求書印刷一覧
+
+                                                    new KeyValuePair<int, string>(-1, "受　注　管　理"),                                                   // ----- タイトル
+                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.ConstructionBaseInfo, string.Empty),      //  2:工事情報入力
+                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.EstimateInput, string.Empty),             //  3:積算見積入力
+                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.EstimatePrint, string.Empty),             //  4:積算見積書印刷
+                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.EstimateBudget, string.Empty),            //  5:積算予算書入力
+
+                                                    new KeyValuePair<int, string>(-1, "施　工　管　理"),                                                   // ----- タイトル
+                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.DepartmentExpenssList, string.Empty),     // 11:部署別台帳一覧
+                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.ConstructionLedgerList, string.Empty),    // 13:工事詳細台帳一覧
+                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.PriceOfBudget, string.Empty),             // 37:台帳状況確認画面
+                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.ConstructionLedger, string.Empty),        // 13:工事詳細台帳
+                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.DRList, string.Empty),                    // 15:工事日報－一覧
+                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.DRConstruction, string.Empty),            // 16:工事日報入力
+                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.Proceedings, string.Empty),               // 17:打合せ議事録入力
+                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.ConstructionBudget, string.Empty),        //  6:工事予算書入力
+                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.PurchaseOrderEntry, string.Empty),        //  9:注文書入力
+                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint, string.Empty),        // 10:注文書印刷
+                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.PurchaseOrderStatus, string.Empty),       // 19:注文書発給一覧
+                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.RequestInput, string.Empty),              // 31:請求入力
+                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.RequestPrint, string.Empty),              // 32:請求書印刷
+                                                    
+                                                    new KeyValuePair<int, string>(-1, "マスタメンテナンス"),                                                // ----- タイトル
+                                                    new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.System, string.Empty),                // システム管理登録
+                                                    new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.Security, string.Empty),              // セキュリティ区分登録
+                                                    new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.ApprovalRouteList, string.Empty),     // 承認経路登録
+                                                    new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.TermMaster, string.Empty),            // 期限登録
+                                                    new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.Department, string.Empty),            // 部署登録
+                                                    new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.PersonInCharge, string.Empty),        // 担当者登録
+                                                    new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.Orderers, string.Empty),              // 発注者登録
+                                                    new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.ConstructionType, string.Empty),      // 工事種別登録
+                                                    new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.SubContractor, string.Empty),         // 協力会社登録
+                                                    new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.SubContrItem, string.Empty),          // 協力会社工種登録
+                                                    new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.SubContrJobCat, string.Empty),        // 協力会社職種登録
+                                                    new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.Component, string.Empty),             // 大項目登録（構成登録）
+                                                    new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.ConstructionItem, string.Empty),      // 中項目登録（工種登録）
+                                                    new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.ConstructionWork, string.Empty),      // 小項目登録（作業登録）
+                                                    new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.ComponentLink, string.Empty),         // 大・中項目関連登録
+                                                    new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.BudgetCodeSum, string.Empty),         // 予算書集計コード登録
+                                                    new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.AddressConvert, string.Empty),        // 郵便番号引込
+                                                    new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.BusinessType, string.Empty),          // 法人格登録
+                                                    new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.OrderDivision, string.Empty),         // 発注者区分登録
+                                                    new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.ConstrExpenses, string.Empty),        // 施工経費区分登録
+                                                    new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.Unit, string.Empty),                  // 単位登録
+                                                    new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.SalesConfirm, string.Empty),          // 売上確認
+                                                };
         #endregion
+        #endregion
 
+        #endregion
+
         #region 変数
         /// <summary>
         /// フィールド値変化フラグ
@@ -549,24 +611,23 @@
                 {
                     //// 標準ヘッダーの描画
                     GridCellPainting(sender, e);
+                    return;
                 }
-                else
+
+                DataGridViewEX dgv = dgvProcess;
+                if (e.RowIndex >= 0 && e.ColumnIndex >= 0)
                 {
-                    DataGridViewEX dgv = dgvProcess;
-                    if (e.RowIndex >= 0 && e.ColumnIndex >= 0)
-                    {
-                        //チェックボックス列以外は処理しない
-                        if (!dgv.Columns[e.ColumnIndex].GetType().Equals(typeof(DataGridViewCheckBoxColumn))) return;
-                        // 変更不可行は処理しない
-                        if (!dgv.Rows[e.RowIndex].ReadOnly) return;
-                        
-                        dgv.Rows[e.RowIndex].Cells[e.ColumnIndex].Style.BackColor = s_TitleRowColor;
+                    //チェックボックス列以外は処理しない
+                    if (!dgv.Columns[e.ColumnIndex].GetType().Equals(typeof(DataGridViewCheckBoxColumn))) return;
+                    // 変更不可行は処理しない
+                    if (!dgv.Rows[e.RowIndex].ReadOnly) return;
 
-                        // 描画する領域
-                        e.PaintBackground(e.CellBounds, false);
-                        
-                        e.Handled = true;
-                    }
+                    dgv.Rows[e.RowIndex].Cells[e.ColumnIndex].Style.BackColor = s_TitleRowColor;
+
+                    // 描画する領域
+                    e.PaintBackground(e.CellBounds, false);
+
+                    e.Handled = true;
                 }
             }
             catch (System.Exception ex)
@@ -576,81 +637,6 @@
         }
         #endregion
 
-        #region ヘッダセル結合処理
-        /// <summary>
-        /// ヘッダセル結合処理
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        /// <param name="columns"></param>
-        /// <param name="headerText"></param>
-        //private void JoinGridHeader(object sender, DataGridViewCellPaintingEventArgs e, List<DataGridViewColumn> columns, string headerText)
-        //{
-        //    try
-        //    {
-        //        //指定した列を結合する
-        //        // セルの矩形を取得
-        //        Rectangle rect = e.CellBounds;
-        //        //rect.X += 1;
-        //        //rect.Y += 1;
-        //        rect.Height -= 1;
-
-        //        DataGridViewEX dgv = (DataGridViewEX)sender;
-
-        //        rect.Width = 0;
-
-        //        // 結合する列の幅を取得して、足す
-        //        foreach (DataGridViewColumn col in columns)
-        //        {
-        //            rect.Width += col.Width;
-
-        //            if (e.ColumnIndex > col.Index)
-        //            {
-        //                // 矩形の位置を補正
-        //                rect.X -= col.Width;
-        //            }
-        //        }
-
-        //        // 背景、枠線、セルの値を描画
-        //        using (SolidBrush brush = new SolidBrush(this.dgvProcess.ColumnHeadersDefaultCellStyle.BackColor))
-        //        using (Brush gridBrush = new SolidBrush(this.dgvProcess.GridColor))
-        //        using (Pen pen = new Pen(dgv.GridColor))
-        //        {
-        //            // Erase the cell.
-        //            e.Graphics.FillRectangle(brush, e.CellBounds);
-
-        //            // 背景の描画
-        //            e.Graphics.FillRectangle(brush, rect);
-
-        //            // 枠線の描画
-        //            e.Graphics.DrawRectangle(pen, rect);
-
-        //            //// Draw the grid lines (only the right and bottom lines;
-        //            //// DataGridViewEX takes care of the others).
-        //            //e.Graphics.DrawLine(pen, e.CellBounds.Left,
-        //            //    e.CellBounds.Bottom - 1, e.CellBounds.Right - 1,
-        //            //    e.CellBounds.Bottom - 1);
-        //            //e.Graphics.DrawLine(pen, e.CellBounds.Right - 1,
-        //            //    e.CellBounds.Top, e.CellBounds.Right - 1,
-        //            //    e.CellBounds.Bottom);
-
-        //        }
-
-        //        // セルに表示するテキストを描画
-        //        TextRenderer.DrawText(e.Graphics,
-        //                        headerText,
-        //                        e.CellStyle.Font,
-        //                        rect,
-        //                        e.CellStyle.ForeColor,
-        //                        TextFormatFlags.HorizontalCenter | TextFormatFlags.VerticalCenter);
-        //    }
-        //    catch (System.Exception ex)
-        //    {
-        //        logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
-        //    }
-        //}
-        #endregion
-
         #region ヘッダーダブルクリック
         /// <summary>
         /// ヘッダーダブルクリック
@@ -889,8 +875,11 @@
         /// <param name="e"></param>
         private void FrmSecurity_SizeChanged(object sender, EventArgs e)
         {
-            // Normalサイズ設定
-            OrignalSizeSet();
+            //if (this.WindowState == FormWindowState.Normal)
+            //{
+            //    // Normalサイズ設定
+            //    OrignalSizeSet();
+            //}
         }
         #endregion
     }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Security/FrmSecurityAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Security/FrmSecurityAuxiliary.cs	(revision 399)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Security/FrmSecurityAuxiliary.cs	(revision 400)
@@ -476,8 +476,21 @@
                 int rcnt = 0;
                 string strProcName = string.Empty;
                 string DspCnt = string.Empty;
+
+                KeyValuePair<int, string>[] LoopList = null;
+                switch (ProductDefine.ProductType)
+                {
+                    case (int)ProductDefine.ProductTypeDef.Originals:
+                        LoopList = s_OriginalArray;
+                        break;
+                    case (int)ProductDefine.ProductTypeDef.MassProductionType1:
+                        LoopList = s_ProductType1;
+                        break;
+                }
+                if (LoopList == null) return;
+
                 // 表示機能名称をセットする
-                foreach (KeyValuePair<int, string> wrkValue in s_ConfigurationArray)
+                foreach (KeyValuePair<int, string> wrkValue in LoopList)
                 {
                     DspCnt = string.Empty;
                     if (wrkValue.Key < 0)
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs	(revision 399)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs	(revision 400)
@@ -510,8 +510,31 @@
 
                 //背景の描画
                 e.Graphics.FillRectangle(TabBackBrush, TabRect);
+
                 //Textの描画
-                e.Graphics.DrawString(CurPage.Text, CurPage.Font, TabForeBrush, TabRect, sf);
+                if (nMenuIndex == (int)TabNameEnum.StaffAssignment)
+                {
+                    string strTab = string.Empty;
+                    string strTitle = string.Empty;
+                    // タブ名称変更
+                    switch (ProductDefine.ProductType)
+                    {
+                        case (int)ProductDefine.ProductTypeDef.Originals:
+                            strTab = "人員配置";
+                            strTitle = "人　　員　　配　　置　　一　　覧";
+                            break;
+                        case (int)ProductDefine.ProductTypeDef.MassProductionType1:
+                            strTab = "工事一覧";
+                            strTitle = "工　　事　　予　　定　　一　　覧";
+                            break;
+                    }
+                    label15.Text = strTitle;
+                    e.Graphics.DrawString(strTab, CurPage.Font, TabForeBrush, TabRect, sf);
+                }
+                else
+                {
+                    e.Graphics.DrawString(CurPage.Text, CurPage.Font, TabForeBrush, TabRect, sf);
+                }
             }
             catch (Exception ex)
             {
@@ -1723,7 +1746,7 @@
                         // tabPage12:行動一覧
                         m_tabManager.PageArray[(int)MenuTabAssign.ActionSchedule].Visible = false;
                         // tabPage13:人員配置
-                        m_tabManager.PageArray[(int)MenuTabAssign.StaffAssignment].Visible = false;
+                        //m_tabManager.PageArray[(int)MenuTabAssign.StaffAssignment].Visible = false;
                         // tabPage14:売上グラフ
                         m_tabManager.PageArray[(int)MenuTabAssign.SalesGraph].Visible = false;
                         // tabPage17:総務管理
@@ -2390,7 +2413,6 @@
                 strSQL.Append(" F.PERSONNAME,");
                 strSQL.AppendFormat(" IFNULL(G.APPROVALSTATUS, {0})", (int)CommonDefine.ApprovalStatus.Undecided);
 
-
                 strSQL.Append(" FROM PROCESSAPPROVAL A");
                 strSQL.Append(" INNER JOIN PERSONINCHARGEMASTER C");
                 strSQL.Append("        ON C.PERSONCODE = A.PERSONCODE");
Index: trunk/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj	(revision 399)
+++ trunk/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj	(revision 400)
@@ -304,6 +304,12 @@
     <Compile Include="Forms\DataEntry\ApprovalScreen\FrmAppScrnAux.cs">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="Forms\DataEntry\ApprovalScreen\FrmInputDate.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\DataEntry\ApprovalScreen\FrmInputDate.Designer.cs">
+      <DependentUpon>FrmInputDate.cs</DependentUpon>
+    </Compile>
     <Compile Include="Forms\DataEntry\ConstructionBaseInfo\DataChange.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -678,6 +684,18 @@
     <Compile Include="Forms\DataEntry\ReqBillingStatus\FrmReqBillingStatusAuxiliary.cs">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="Forms\DataEntry\Request\RequestEntry\FrmEntryReqSelOrderer.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\DataEntry\Request\RequestEntry\FrmEntryReqSelOrderer.Designer.cs">
+      <DependentUpon>FrmEntryReqSelOrderer.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Forms\DataEntry\Request\RequestEntry\FrmEntryReqSelRequest.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\DataEntry\Request\RequestEntry\FrmEntryReqSelRequest.Designer.cs">
+      <DependentUpon>FrmEntryReqSelRequest.cs</DependentUpon>
+    </Compile>
     <Compile Include="Forms\DataEntry\Request\RequestPrintList\FrmReqPrintList.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -726,18 +744,6 @@
     <Compile Include="Forms\DataEntry\Request\ReqSumTotalList\FrmReqSumTotalList.designer.cs">
       <DependentUpon>FrmReqSumTotalList.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\DataEntry\Request\RequestEntry\FrmEntryReqSelOrderer.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\DataEntry\Request\RequestEntry\FrmEntryReqSelOrderer.Designer.cs">
-      <DependentUpon>FrmEntryReqSelOrderer.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\DataEntry\Request\RequestEntry\FrmEntryReqSelRequest.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\DataEntry\Request\RequestEntry\FrmEntryReqSelRequest.Designer.cs">
-      <DependentUpon>FrmEntryReqSelRequest.cs</DependentUpon>
-    </Compile>
     <Compile Include="Forms\DataEntry\Request\RequestInput\FrmRequestInput.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1493,6 +1499,9 @@
     <EmbeddedResource Include="Forms\DataEntry\ApprovalPerson\FrmApprovalPerson.resx">
       <DependentUpon>FrmApprovalPerson.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\DataEntry\ApprovalScreen\FrmInputDate.resx">
+      <DependentUpon>FrmInputDate.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Forms\DataEntry\ConstructionJoin\FrmConstructionJoin.resx">
       <DependentUpon>FrmConstructionJoin.cs</DependentUpon>
     </EmbeddedResource>
@@ -1571,6 +1580,12 @@
     <EmbeddedResource Include="Forms\DataEntry\ReqBillingStatus\FrmReqBillingStatus.resx">
       <DependentUpon>FrmReqBillingStatus.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\DataEntry\Request\RequestEntry\FrmEntryReqSelOrderer.resx">
+      <DependentUpon>FrmEntryReqSelOrderer.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\DataEntry\Request\RequestEntry\FrmEntryReqSelRequest.resx">
+      <DependentUpon>FrmEntryReqSelRequest.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Forms\DataEntry\Request\RequestPrintList\FrmReqPrintList.resx">
       <DependentUpon>FrmReqPrintList.cs</DependentUpon>
     </EmbeddedResource>
@@ -1589,12 +1604,6 @@
     <EmbeddedResource Include="Forms\DataEntry\Request\ReqSumTotalList\FrmReqSumTotalList.resx">
       <DependentUpon>FrmReqSumTotalList.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\DataEntry\Request\RequestEntry\FrmEntryReqSelOrderer.resx">
-      <DependentUpon>FrmEntryReqSelOrderer.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\DataEntry\Request\RequestEntry\FrmEntryReqSelRequest.resx">
-      <DependentUpon>FrmEntryReqSelRequest.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Forms\DataEntry\Request\RequestInput\FrmRequestInput.resx">
       <DependentUpon>FrmRequestInput.cs</DependentUpon>
     </EmbeddedResource>
