Index: branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 286)
+++ branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 287)
@@ -14,7 +14,7 @@
         /// <summary>
         /// æœ¬ä½“ãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
         /// </summary>
-        public static int s_SystemVersion = 97;
+        public static int s_SystemVersion = 98;
 
         /// <summary>
         /// ã‚³ãƒ”ãƒ¼ãƒ»ç’°å¢ƒãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
Index: branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOConstructionLedgerDetail.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOConstructionLedgerDetail.cs	(revision 286)
+++ branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOConstructionLedgerDetail.cs	(revision 287)
@@ -629,7 +629,7 @@
         }
         #endregion
 
-        #region ãƒ‘ãƒ–ãƒªãƒƒã‚¯ãƒ¡ã‚½ãƒƒãƒ‰ï¼ˆç‰¹æ®Šå‡¦ç�†ï¼‰
+        #region ä¸»ã‚­ãƒ¼æ¤œç´¢ã�®æ–‡å­—åˆ—ã‚’è¿”ã�™
         /// <summary>
         /// ä¸»ã‚­ãƒ¼æ¤œç´¢ã�®æ–‡å­—åˆ—ã‚’è¿”ã�™
         /// </summary>
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.designer.cs	(revision 286)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.designer.cs	(revision 287)
@@ -48,6 +48,10 @@
             this.btnDataUpDate = new System.Windows.Forms.Button();
             this.btnDataCopy = new System.Windows.Forms.Button();
             this.ProgressBar = new System.Windows.Forms.ProgressBar();
+            this.grpExample1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
+            this.lblEstimateType03 = new System.Windows.Forms.Label();
+            this.lblEstimateType02 = new System.Windows.Forms.Label();
+            this.lblEstimateType01 = new System.Windows.Forms.Label();
             this.groupBox1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
             this.label3 = new System.Windows.Forms.Label();
             this.radioButton2 = new System.Windows.Forms.RadioButton();
@@ -71,14 +75,10 @@
             this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pnlExample1 = new System.Windows.Forms.Panel();
-            this.lblEstimateType03 = new System.Windows.Forms.Label();
-            this.lblEstimateType02 = new System.Windows.Forms.Label();
-            this.lblEstimateType01 = new System.Windows.Forms.Label();
+            this.grpExample1.SuspendLayout();
             this.groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.numUDConstPro)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).BeginInit();
-            this.pnlExample1.SuspendLayout();
             this.SuspendLayout();
             // 
             // btnDataEntry
@@ -168,6 +168,60 @@
             this.ProgressBar.TabIndex = 31;
             this.ProgressBar.Visible = false;
             // 
+            // grpExample1
+            // 
+            this.grpExample1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.grpExample1.BackColor = System.Drawing.Color.White;
+            this.grpExample1.BorderColor = System.Drawing.Color.Red;
+            this.grpExample1.Controls.Add(this.lblEstimateType03);
+            this.grpExample1.Controls.Add(this.lblEstimateType02);
+            this.grpExample1.Controls.Add(this.lblEstimateType01);
+            this.grpExample1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.grpExample1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.grpExample1.Location = new System.Drawing.Point(10, 616);
+            this.grpExample1.Name = "grpExample1";
+            this.grpExample1.Size = new System.Drawing.Size(400, 38);
+            this.grpExample1.TabIndex = 33;
+            this.grpExample1.TabStop = false;
+            this.grpExample1.Text = "æ–½å·¥çŠ¶æ…‹å¤‰æ›´ã‚ˆã‚Š1ã‚«æœˆçµŒé�Žæ™‚è‰²";
+            this.grpExample1.Visible = false;
+            // 
+            // lblEstimateType03
+            // 
+            this.lblEstimateType03.BackColor = System.Drawing.Color.OliveDrab;
+            this.lblEstimateType03.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.lblEstimateType03.ForeColor = System.Drawing.Color.DarkRed;
+            this.lblEstimateType03.Location = new System.Drawing.Point(264, 14);
+            this.lblEstimateType03.Name = "lblEstimateType03";
+            this.lblEstimateType03.Size = new System.Drawing.Size(120, 20);
+            this.lblEstimateType03.TabIndex = 0;
+            this.lblEstimateType03.Text = "äºˆç®—å�–ã‚Šæ¡ˆä»¶";
+            this.lblEstimateType03.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // lblEstimateType02
+            // 
+            this.lblEstimateType02.BackColor = System.Drawing.Color.DarkOrange;
+            this.lblEstimateType02.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.lblEstimateType02.ForeColor = System.Drawing.Color.Black;
+            this.lblEstimateType02.Location = new System.Drawing.Point(136, 14);
+            this.lblEstimateType02.Name = "lblEstimateType02";
+            this.lblEstimateType02.Size = new System.Drawing.Size(120, 20);
+            this.lblEstimateType02.TabIndex = 0;
+            this.lblEstimateType02.Text = "å…¥æœ­æ¡ˆä»¶";
+            this.lblEstimateType02.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // lblEstimateType01
+            // 
+            this.lblEstimateType01.BackColor = System.Drawing.Color.OrangeRed;
+            this.lblEstimateType01.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.lblEstimateType01.ForeColor = System.Drawing.Color.DarkBlue;
+            this.lblEstimateType01.Location = new System.Drawing.Point(8, 14);
+            this.lblEstimateType01.Name = "lblEstimateType01";
+            this.lblEstimateType01.Size = new System.Drawing.Size(120, 20);
+            this.lblEstimateType01.TabIndex = 0;
+            this.lblEstimateType01.Text = "å·¥äº‹æ¡ˆä»¶";
+            this.lblEstimateType01.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
             // groupBox1
             // 
             this.groupBox1.Anchor = System.Windows.Forms.AnchorStyles.Top;
@@ -504,55 +558,6 @@
             this.Column11.Visible = false;
             this.Column11.Width = 5;
             // 
-            // pnlExample1
-            // 
-            this.pnlExample1.BackColor = System.Drawing.Color.White;
-            this.pnlExample1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.pnlExample1.Controls.Add(this.lblEstimateType03);
-            this.pnlExample1.Controls.Add(this.lblEstimateType02);
-            this.pnlExample1.Controls.Add(this.lblEstimateType01);
-            this.pnlExample1.Location = new System.Drawing.Point(10, 617);
-            this.pnlExample1.Name = "pnlExample1";
-            this.pnlExample1.Size = new System.Drawing.Size(400, 34);
-            this.pnlExample1.TabIndex = 32;
-            this.pnlExample1.Visible = false;
-            // 
-            // lblEstimateType03
-            // 
-            this.lblEstimateType03.BackColor = System.Drawing.Color.YellowGreen;
-            this.lblEstimateType03.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.lblEstimateType03.ForeColor = System.Drawing.Color.DarkRed;
-            this.lblEstimateType03.Location = new System.Drawing.Point(262, 7);
-            this.lblEstimateType03.Name = "lblEstimateType03";
-            this.lblEstimateType03.Size = new System.Drawing.Size(120, 20);
-            this.lblEstimateType03.TabIndex = 0;
-            this.lblEstimateType03.Text = "äºˆç®—å�–ã‚Šæ¡ˆä»¶";
-            this.lblEstimateType03.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblEstimateType02
-            // 
-            this.lblEstimateType02.BackColor = System.Drawing.Color.DarkOrange;
-            this.lblEstimateType02.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.lblEstimateType02.ForeColor = System.Drawing.Color.Black;
-            this.lblEstimateType02.Location = new System.Drawing.Point(134, 7);
-            this.lblEstimateType02.Name = "lblEstimateType02";
-            this.lblEstimateType02.Size = new System.Drawing.Size(120, 20);
-            this.lblEstimateType02.TabIndex = 0;
-            this.lblEstimateType02.Text = "å…¥æœ­æ¡ˆä»¶";
-            this.lblEstimateType02.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblEstimateType01
-            // 
-            this.lblEstimateType01.BackColor = System.Drawing.Color.OrangeRed;
-            this.lblEstimateType01.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.lblEstimateType01.ForeColor = System.Drawing.Color.DarkBlue;
-            this.lblEstimateType01.Location = new System.Drawing.Point(6, 7);
-            this.lblEstimateType01.Name = "lblEstimateType01";
-            this.lblEstimateType01.Size = new System.Drawing.Size(120, 20);
-            this.lblEstimateType01.TabIndex = 0;
-            this.lblEstimateType01.Text = "å·¥äº‹æ¡ˆä»¶";
-            this.lblEstimateType01.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
             // FrmConstructionList
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -560,7 +565,7 @@
             this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
             this.BackColor = System.Drawing.Color.Black;
             this.ClientSize = new System.Drawing.Size(1280, 657);
-            this.Controls.Add(this.pnlExample1);
+            this.Controls.Add(this.grpExample1);
             this.Controls.Add(this.ProgressBar);
             this.Controls.Add(this.btnDataCopy);
             this.Controls.Add(this.lblProcessTitil);
@@ -581,11 +586,11 @@
             this.Load += new System.EventHandler(this.FrmConstructionList_Load);
             this.SizeChanged += new System.EventHandler(this.FrmConstructionList_SizeChanged);
             this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.FrmConstructionBaseInfoList_KeyDown);
+            this.grpExample1.ResumeLayout(false);
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.numUDConstPro)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).EndInit();
-            this.pnlExample1.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -622,9 +627,9 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column11;
-        private System.Windows.Forms.Panel pnlExample1;
         private System.Windows.Forms.Label lblEstimateType03;
         private System.Windows.Forms.Label lblEstimateType02;
         private System.Windows.Forms.Label lblEstimateType01;
+        private CustomControls.GroupBoxEx grpExample1;
     }
 }
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs	(revision 286)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs	(revision 287)
@@ -37,7 +37,8 @@
         /// </summary>
         private static string[] s_SQLPart1 = new string[] { "SELECT A.CONSTRUCTIONCODE, A.CONSTRUCTIONPERIOD, B.DETAILSTRING, A.CONSTRUCTIONSTATUSFLG,",
                                                             " C.PERSONCODE, C.PERSONNAME, C.DEPARTMENTCODE, C.DEPARTMENTNAME, C.MANDISPORDER, C.DEPDISPORDER,",
-                                                            " D.PERSONCODE, D.PERSONNAME, D.DEPARTMENTCODE, D.DEPARTMENTNAME, D.MANDISPORDER, D.DEPDISPORDER" };
+                                                            " D.PERSONCODE, D.PERSONNAME, D.DEPARTMENTCODE, D.DEPARTMENTNAME, D.MANDISPORDER, D.DEPDISPORDER"};
+
         private static string[] s_SQLPart1_1 = new string[] { " FROM CONSTRUCTIONBASEINFO A", 
                                                             " LEFT JOIN CONSTRUCTIONBASEINFODETAIL B",
                                                             " ON A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE",
@@ -95,7 +96,27 @@
         }
         #endregion
 
+        #region ŒŸ�õSQL�ì�¬:�HŽ–Šî–{�î•ñ“ü—Í’Ç‰Á�€–Ú
+        /// <summary>
+        /// ŒŸ�õSQL�ì�¬:�HŽ–Šî–{�î•ñ“ü—Í’Ç‰Á�€–Ú
+        /// </summary>
+        private enum GetDataAddSQL01
+        {
+            /// <summary>
+            /// Œ©�ÏŽí•Ê
+            /// </summary>
+            EstimateType = 0,
+            /// <summary>
+            /// ˆË—ŠŽó‚¯“ú
+            /// </summary>
+            RequestedDate,
+            /// <summary>
+            /// Œ©�Ï’ñ�o“ú
+            /// </summary>
+            EstimatesSubmittedDate,
+        }
         #endregion
+        #endregion
 
         #region •Ï�”
         #endregion
@@ -308,7 +329,11 @@
             {
                 StringBuilder wrkFormat = new StringBuilder();
                 for (int i = 0; i < s_SQLPart1.Length; i++) wrkFormat.Append(s_SQLPart1[i]);
-                wrkFormat.Append(", 0, 0");    // Žæ“¾ƒtƒB�[ƒ‹ƒh‚Ì�ÅŒã‚É’Ç‰Á‚·‚é
+                
+                // Žæ“¾ƒtƒB�[ƒ‹ƒh‚Ì�ÅŒã‚É’Ç‰Á‚·‚é
+                wrkFormat.Append(", 0, 0");
+                wrkFormat.Append(", A.EstimateType, A.RequestedDate, A.EstimatesSubmittedDate");
+                
                 for (int i = 0; i < s_SQLPart1_1.Length; i++) wrkFormat.Append(s_SQLPart1_1[i]);
                 
                 for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]);
@@ -1025,19 +1050,22 @@
                     strConstDepName = CommonMotions.cnvString(objwrk[(int)GetData.CONSTDEPNAME]);
                     strConstName = CommonMotions.cnvString(objwrk[(int)GetData.CONSTNAME]);
 
-                    dgv.Rows.Add((ino++)
-                                        , strSalesDepName
-                                        , strSalesName
-                                        , strConstDepName
-                                        , strConstName
-                                        , strConstrName
-                                        , strStatus
-                                        , FlgString
-                                        , CommonMotions.cnvInt(objwrk[(int)GetData.CONSTRUCTIONPERIOD])
-                                        , CommonMotions.cnvStringCodeFromInt(ConstrCode, "-", 8)
-                                        , OrderNo
-                                        );
+                    int RowCnt = dgv.Rows.Add((ino++)
+                                                , strSalesDepName
+                                                , strSalesName
+                                                , strConstDepName
+                                                , strConstName
+                                                , strConstrName
+                                                , strStatus
+                                                , FlgString
+                                                , CommonMotions.cnvInt(objwrk[(int)GetData.CONSTRUCTIONPERIOD])
+                                                , CommonMotions.cnvStringCodeFromInt(ConstrCode, "-", 8)
+                                                , OrderNo
+                                                );
 
+                    // ƒZƒ‹�F‚ð•Ï‚¦‚é
+                    CellColorChenge(dgv.Rows[RowCnt], objwrk);
+
                     // ProgressBar‚Ì’l‚ð•Ï�X‚·‚é
                     ProgressBar.Value = (ino - 1);
                     ProgressBar.Update();
@@ -1059,6 +1087,101 @@
         }
         #endregion
 
+        #region ƒZƒ‹�F‚ð•Ï‚¦‚é
+        /// <summary>
+        /// ƒZƒ‹�F‚ð•Ï‚¦‚é
+        /// </summary>
+        /// <param name="CurRow"></param>
+        private void CellColorChenge(DataGridViewRow CurRow, object[] objCurRec)
+        {
+            try
+            {
+                switch (m_ExecuteFlg)
+                {
+                    case (int)ClsExcute.ProcessExecuteNo.ConstructionBaseInfo:
+                        // ----- �HŽ–�î•ñˆê——•\Ž¦ŽžƒZƒ‹�F•Ï�X
+                        BaseInfoCellColorChenge(CurRow, objCurRec);
+                        break;
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region �HŽ–�î•ñˆê——•\Ž¦ŽžƒZƒ‹�F•Ï�X
+        /// <summary>
+        /// �HŽ–�î•ñˆê——•\Ž¦ŽžƒZƒ‹�F•Ï�X
+        /// </summary>
+        /// <param name="CurRow"></param>
+        /// <param name="objCurRec"></param>
+        private void BaseInfoCellColorChenge(DataGridViewRow CurRow, object[] objCurRec)
+        {
+            try
+            {
+                int Status = CommonMotions.cnvInt(objCurRec[(int)GetData.CONSTRUCTIONSTATUSFLG]);
+                int nCode1 = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("ˆË—ŠŽó‚¯’†")).Key;
+                int nCode2 = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("Œ©�Ï’ñ�o")).Key;
+
+                // ƒf�[ƒ^Žæ“¾ƒx�[ƒXƒJƒEƒ“ƒg
+                int AddGetDataCnt = Enum.GetNames(typeof(GetData)).Length;
+                // Œ©�ÏŽí•Ê
+                int EstimanteType = EstimanteType = CommonMotions.cnvInt(objCurRec[AddGetDataCnt + (int)GetDataAddSQL01.EstimateType]);
+
+                DateTime TargetDate = DateTime.Now;
+                Color clrBackColor = Color.White;
+                Color clrForeColor = Color.Black;
+                if (Status == nCode1)
+                {
+                    // ----- ˆË—ŠŽó‚¯’†
+                    TargetDate = CommonMotions.cnvDate(objCurRec[AddGetDataCnt + (int)GetDataAddSQL01.RequestedDate]);
+                }
+                else if (Status == nCode2)
+                {
+                    // ----- Œ©�Ï’ñ�o
+                    TargetDate = CommonMotions.cnvDate(objCurRec[AddGetDataCnt + (int)GetDataAddSQL01.EstimatesSubmittedDate]);
+                }
+                else
+                {
+                    // ----- ˆÈŠO‚Í�ˆ—�‚µ‚È‚¢
+                    return;
+                }
+
+                // “ú•t‚æ‚è1ƒJŒŽˆÈ“à‚Í�ˆ—�‚µ‚È‚¢
+                if (TargetDate.AddMonths(1).Date > DateTime.Now.Date) return;
+                
+                // ƒZƒ‹�F‘I‘ð
+                switch (EstimanteType)
+                {
+                    case (int)ConstructionBaseInfo.EstimateTypeDef.Normal:
+                        // �HŽ–ˆÄŒ�
+                        clrBackColor = lblEstimateType01.BackColor;
+                        clrForeColor = lblEstimateType01.ForeColor;
+                        break;
+                    case (int)ConstructionBaseInfo.EstimateTypeDef.Didding:
+                        // “üŽDˆÄŒ�
+                        clrBackColor = lblEstimateType02.BackColor;
+                        clrForeColor = lblEstimateType02.ForeColor;
+                        break;
+                    case (int)ConstructionBaseInfo.EstimateTypeDef.GetBudget:
+                        // —\ŽZŽæ‚èˆÄŒ�
+                        clrBackColor = lblEstimateType03.BackColor;
+                        clrForeColor = lblEstimateType03.ForeColor;
+                        break;
+                }
+
+                CurRow.Cells[(int)DispColumn.Status].Style.BackColor = clrBackColor;
+                CurRow.Cells[(int)DispColumn.Status].Style.ForeColor = clrForeColor;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region �ó‘Ô‚Æ�HŽ––¼�Ì‚Ì•Ò�W
         /// <summary>
         /// �ó‘Ô‚Æ�HŽ––¼�Ì‚Ì•Ò�W
@@ -1267,6 +1390,7 @@
                 ProgressBar.Visible = bDisp;
                 ProgressBar.Minimum = 0;
                 ProgressBar.Value = 0;
+                if (m_ExecuteFlg == (int)ClsExcute.ProcessExecuteNo.ConstructionBaseInfo) grpExample1.Visible = !bDisp;
 
                 btnDataEntry.Visible = !bDisp;
                 btnEnd.Visible = !bDisp;
@@ -1542,22 +1666,18 @@
                     // ƒJƒ‰ƒ€‚ÌƒTƒCƒY‚ð‹�‚ß‚é
                     int ColumnCount = 0;
                     int TotalWidth = 0;
-                    int NotVisibleSize = 0;
                     for (int i = 0; i < m_CellSize.Length; i++)
                     {
+                        DataGridViewColumn wrkCol = dgv.Columns[i];
+                        if (!wrkCol.Visible) continue;
+
                         TotalWidth += m_CellSize[i];
-                        if (dgv.Columns[i].Visible)
-                        {
-                            ColumnCount++;
-                        }
-                        else
-                        {
-                            NotVisibleSize += m_CellSize[i];
-                        }
+                        ColumnCount++;
                     }
 
                     // ‘å‚«‚­‚È‚Á‚½ƒTƒCƒY
-                    int formdiff = (dgv.Width - (m_GridWidthSize - NotVisibleSize));
+                    //int formdiff = dgv.Width - m_GridWidthSize;
+                    int formdiff = dgv.Width - TotalWidth;
 
                     idifference = formdiff / ColumnCount;
                 }
@@ -1565,6 +1685,7 @@
                 for (int i = 0; i < dgv.ColumnCount; i++)
                 {
                     DataGridViewColumn wrkCol = dgv.Columns[i];
+                    if (!wrkCol.Visible) continue;
                     wrkCol.Width = m_CellSize[i] + idifference;
                 }
             }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReserveEntry/FrmMateResEntAux.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReserveEntry/FrmMateResEntAux.cs	(revision 286)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReserveEntry/FrmMateResEntAux.cs	(revision 287)
@@ -817,15 +817,8 @@
                     CommonMotions.chgBackColor(r.Cells[(int)DispColumn.RepayPlanDate], true);
                     CommonMotions.chgBackColor(r.Cells[(int)DispColumn.CommentText], true);
 
-                    // ç©ºç™½è¡Œã�¯å‡¦ç�†ã�—ã�ªã�„
-                    if (CommonMotions.cnvInt(r.Cells[(int)DispColumn.MaterialCount].Value) == 0
-                        || CommonMotions.cnvInt(r.Cells[(int)DispColumn.RentCount].Value) == 0)
-                    {
-                        continue;
-                    }
-
                     bAns = true;
-                    if (CommonMotions.cnvInt(r.Cells[(int)DispColumn.MaterialCount].Value) == 0)
+                    if (CommonMotions.cnvInt(r.Cells[(int)DispColumn.MaterialCount].Value) < 1)
                     {
                         bAns = false;
                         sErrmsg = "è²¸å‡ºæ•°ã�Œå…¥åŠ›ã�•ã‚Œã�¦ã�„ã�¾ã�›ã‚“ã€‚";
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInputAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInputAuxiliary.cs	(revision 286)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInputAuxiliary.cs	(revision 287)
@@ -2109,7 +2109,7 @@
                 if (pap.ApprovalStatus == 2)
                 {
                     // æœ€çµ‚æ¨©é™�è€…ã�®å ´å�ˆ
-                    if (apm != null && apm.ApprovalAuthority == 1)
+                    if (apm != null && apm.ApprovalAuthority == (int)ApprovalMaster.ApprovalAuthorityDef.LastApproval)
                     {
                         // æ‰¿èª�æ¸ˆç¢ºå®š
                         nState = (int)ApprovalState.End;
Index: branches/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj	(revision 286)
+++ branches/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj	(revision 287)
@@ -210,6 +210,7 @@
     <Compile Include="DataModel\SubContractorJobILink.cs" />
     <Compile Include="DataModel\SuppliersMaster.cs" />
     <Compile Include="DataModel\SecurityMaster.cs" />
+    <Compile Include="DataModel\TermMasterList.cs" />
     <Compile Include="DataModel\TranceportDailyData.cs" />
     <Compile Include="DataModel\TypeExpensesMaster.cs" />
     <Compile Include="DB\IOAccess\IOAttendanceDailyData.cs" />
@@ -433,7 +434,6 @@
     <Compile Include="DataModel\ApprovalMaster.cs" />
     <Compile Include="DataModel\SalesGraphData.cs" />
     <Compile Include="DataModel\PreserveSubFormHandle.cs" />
-    <Compile Include="DataModel\TermMasterList.cs" />
     <Compile Include="DataModel\TermMaster.cs" />
     <Compile Include="DataModel\SystemExecute.cs" />
     <Compile Include="DataModel\VehicleScheduleData.cs" />
Index: branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 286)
+++ branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 287)
@@ -32,7 +32,7 @@
 // ã�™ã�¹ã�¦ã�®å€¤ã‚’æŒ‡å®šã�™ã‚‹ã�‹ã€�ä¸‹ã�®ã‚ˆã�†ã�« '*' ã‚’ä½¿ã�£ã�¦ãƒ“ãƒ«ãƒ‰ã�Šã‚ˆã�³ãƒªãƒ“ã‚¸ãƒ§ãƒ³ç•ªå�·ã‚’ 
 // æ—¢å®šå€¤ã�«ã�™ã‚‹ã�“ã�¨ã�Œã�§ã��ã�¾ã�™:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.97")]
-[assembly: AssemblyFileVersion("1.0.0.97")]
+[assembly: AssemblyVersion("1.0.0.98")]
+[assembly: AssemblyFileVersion("1.0.0.98")]
 // Log4netã‚’ä½¿ç”¨ã�™ã‚‹
 [assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]
\ No newline at end of file
