Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqApprovalStatus/FrmReqApprovalStatus.designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqApprovalStatus/FrmReqApprovalStatus.designer.cs	(revision 394)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqApprovalStatus/FrmReqApprovalStatus.designer.cs	(revision 395)
@@ -89,7 +89,7 @@
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(400, 20);
             this.label1.TabIndex = 6;
-            this.label1.Text = "è«‹ã€€æ±‚ã€€æ‰¿ã€€èª�ã€€çŠ¶ã€€æ³�";
+            this.label1.Text = "è«‹ã€€æ±‚ã€€çŠ¶ã€€æ³�ã€€ç¢ºã€€èª�";
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // btnDataUpDate
@@ -348,7 +348,8 @@
             this.Column7.HeaderText = "å·¥ã€€äº‹ã€€å��ã€€ç§°";
             this.Column7.Name = "Column7";
             this.Column7.ReadOnly = true;
-            this.Column7.Width = 550;
+            this.Column7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column7.Width = 500;
             // 
             // Column3
             // 
@@ -391,12 +392,11 @@
             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)));
             this.Column5.DefaultCellStyle = dataGridViewCellStyle8;
-            this.Column5.HeaderText = "ç”³è«‹";
+            this.Column5.HeaderText = "è«‹æ±‚å›žæ•°";
             this.Column5.Name = "Column5";
             this.Column5.ReadOnly = true;
             this.Column5.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column5.Width = 50;
             // 
             // FrmReqApprovalStatus
             // 
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqApprovalStatus/FrmReqApprovalStatusAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqApprovalStatus/FrmReqApprovalStatusAuxiliary.cs	(revision 394)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqApprovalStatus/FrmReqApprovalStatusAuxiliary.cs	(revision 395)
@@ -348,7 +348,7 @@
                 strSQL.Append(", J.DetailString");
                 strSQL.Append(", B.OrdersDecisionPrice");
                 strSQL.Append(", A.REQUESTAMOUNT");
-                strSQL.Append(", (B.OrdersDecisionPrice - A.REQUESTAMOUNT)");
+                strSQL.Append(", (B.OrdersDecisionPrice - ifnull(A.REQUESTAMOUNT,0))");
                 strSQL.Append(", A.REQUESTCNT");
                 strSQL.Append(", A.MAINCONSTRUCTIONCODE");
                 strSQL.Append(" From");
@@ -369,7 +369,10 @@
                 strSQL.Append("  , MIN(ConstructionStatusFlg) AS ConstructionStatusFlg");
                 strSQL.Append("  , SUM(OrdersDecisionPrice) AS OrdersDecisionPrice");
                 strSQL.Append("  FROM");
-                strSQL.Append("  constructionbaseinfo AS B");
+                strSQL.Append("  constructionbaseinfo");
+                strSQL.Append(" WHERE");
+                strSQL.AppendFormat(" (ConstructionPeriod = {0}", numUDConstPro.Value);
+                strSQL.AppendFormat(" AND (ConstructionStatusFlg != {0}))", nNotStatus);
                 strSQL.Append("  GROUP BY");
                 strSQL.Append("  TRUNCATE(ConstructionCode / 100, 0)");
                 strSQL.Append("  ) AS B");
@@ -433,9 +436,7 @@
                 strSQL.Append(" ON B.CONSTRUCTIONCODE = E.CONSTRUCTIONCODE");
 
                 strSQL.Append(" WHERE");
-                strSQL.Append(" (B.ConstructionCode = A.MAINCONSTRUCTIONCODE");
-                strSQL.AppendFormat(" AND B.ConstructionPeriod = {0}", numUDConstPro.Value);
-                strSQL.AppendFormat(" AND (B.ConstructionStatusFlg != {0}))", nNotStatus);
+                strSQL.Append(" (B.ConstructionCode = A.MAINCONSTRUCTIONCODE)");
 
                 // •”��‚ª‘I‘ð‚³‚ê‚Ä‚¢‚é�ê�‡
                 strSQL.Append(GetDepartmentString());
@@ -527,18 +528,6 @@
                     SetToGridData(arData);
                 }
 
-                // ƒf�[ƒ^‚ª‘½‚­‚È‚ê‚Îƒ\�[ƒg‚Å‚«‚é
-                if (CommonDefine.s_MaxInitLineCount < dgvMaster.RowCount)
-                {
-                    foreach (DataGridViewColumn wrkCol in dgvMaster.Columns)
-                        wrkCol.SortMode = DataGridViewColumnSortMode.Automatic;
-                }
-                else
-                {
-                    // Žb’è‚Åƒ\�[ƒg‚ð“ü‚ê‚é
-                    foreach (DataGridViewColumn wrkCol in dgvMaster.Columns)
-                        wrkCol.SortMode = DataGridViewColumnSortMode.Automatic;
-                }
             }
             catch (Exception ex)
             {
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqbillingStatus/FrmReqBillingStatus.designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqbillingStatus/FrmReqBillingStatus.designer.cs	(revision 394)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqbillingStatus/FrmReqBillingStatus.designer.cs	(revision 395)
@@ -30,7 +30,7 @@
         {
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = 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 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();
@@ -40,6 +40,7 @@
             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();
             this.btnEnd = new System.Windows.Forms.Button();
             this.label1 = new System.Windows.Forms.Label();
             this.btnDataUpDate = new System.Windows.Forms.Button();
@@ -58,6 +59,7 @@
             this.dgvMaster = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
             this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -65,7 +67,6 @@
             this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -300,6 +301,7 @@
             this.dgvMaster.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.Column1,
             this.Column12,
+            this.Column8,
             this.Column10,
             this.Column6,
             this.Column4,
@@ -307,22 +309,22 @@
             this.Column3,
             this.Column2,
             this.Column9,
-            this.Column8,
             this.Column5,
             this.Column13,
             this.Column11});
-            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle12.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.LightSeaGreen;
-            dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvMaster.DefaultCellStyle = dataGridViewCellStyle12;
+            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle13.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle13.SelectionBackColor = System.Drawing.Color.LightSeaGreen;
+            dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvMaster.DefaultCellStyle = dataGridViewCellStyle13;
             this.dgvMaster.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
             this.dgvMaster.EnableHeadersVisualStyles = false;
             this.dgvMaster.Location = new System.Drawing.Point(8, 101);
             this.dgvMaster.Name = "dgvMaster";
+            this.dgvMaster.ReadOnly = true;
             this.dgvMaster.RowHeadersVisible = false;
             this.dgvMaster.RowHeadersWidth = 20;
             this.dgvMaster.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
@@ -347,14 +349,31 @@
             // 
             // Column12
             // 
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column12.DefaultCellStyle = dataGridViewCellStyle4;
             this.Column12.HeaderText = "è«‹æ±‚æœˆ";
             this.Column12.Name = "Column12";
+            this.Column12.ReadOnly = true;
+            this.Column12.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column12.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             this.Column12.Width = 120;
             // 
+            // Column8
+            // 
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column8.DefaultCellStyle = dataGridViewCellStyle5;
+            this.Column8.HeaderText = "ç™ºã€€çµ¦ã€€æ—¥";
+            this.Column8.Name = "Column8";
+            this.Column8.ReadOnly = true;
+            this.Column8.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Column8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Column8.Width = 115;
+            // 
             // Column10
             // 
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column10.DefaultCellStyle = dataGridViewCellStyle4;
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column10.DefaultCellStyle = dataGridViewCellStyle6;
             this.Column10.HeaderText = "éƒ¨ã€€ã€€ç½²";
             this.Column10.Name = "Column10";
             this.Column10.ReadOnly = true;
@@ -364,8 +383,8 @@
             // 
             // Column6
             // 
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column6.DefaultCellStyle = dataGridViewCellStyle5;
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column6.DefaultCellStyle = dataGridViewCellStyle7;
             this.Column6.HeaderText = "æ‹…ã€€å½“ã€€è€…";
             this.Column6.Name = "Column6";
             this.Column6.ReadOnly = true;
@@ -376,14 +395,14 @@
             // 
             // Column4
             // 
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.Column4.DefaultCellStyle = dataGridViewCellStyle6;
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.Column4.DefaultCellStyle = dataGridViewCellStyle8;
             this.Column4.HeaderText = "å®›ã€€å��";
             this.Column4.Name = "Column4";
             this.Column4.ReadOnly = true;
             this.Column4.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column4.Width = 720;
+            this.Column4.Width = 640;
             // 
             // Column7
             // 
@@ -390,25 +409,26 @@
             this.Column7.HeaderText = "å·¥ã€€äº‹ã€€å��";
             this.Column7.Name = "Column7";
             this.Column7.ReadOnly = true;
+            this.Column7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             this.Column7.Visible = false;
             this.Column7.Width = 390;
             // 
             // Column3
             // 
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle7.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column3.DefaultCellStyle = dataGridViewCellStyle7;
+            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle9.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column3.DefaultCellStyle = dataGridViewCellStyle9;
             this.Column3.HeaderText = "è«‹æ±‚é‡‘é¡�";
             this.Column3.Name = "Column3";
             this.Column3.ReadOnly = true;
             this.Column3.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column3.Width = 120;
+            this.Column3.Width = 200;
             // 
             // Column2
             // 
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column2.DefaultCellStyle = dataGridViewCellStyle8;
+            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column2.DefaultCellStyle = dataGridViewCellStyle10;
             this.Column2.HeaderText = "å·¥äº‹ã‚³ãƒ¼ãƒ‰";
             this.Column2.Name = "Column2";
             this.Column2.ReadOnly = true;
@@ -419,9 +439,9 @@
             // 
             // Column9
             // 
-            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle9.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column9.DefaultCellStyle = dataGridViewCellStyle9;
+            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle11.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column9.DefaultCellStyle = dataGridViewCellStyle11;
             this.Column9.HeaderText = "è«‹æ±‚æ‰¿èª�æ—¥";
             this.Column9.Name = "Column9";
             this.Column9.ReadOnly = true;
@@ -430,23 +450,11 @@
             this.Column9.Visible = false;
             this.Column9.Width = 140;
             // 
-            // Column8
-            // 
-            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle10.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column8.DefaultCellStyle = dataGridViewCellStyle10;
-            this.Column8.HeaderText = "ç™ºã€€çµ¦ã€€æ—¥";
-            this.Column8.Name = "Column8";
-            this.Column8.ReadOnly = true;
-            this.Column8.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column8.Width = 115;
-            // 
             // Column5
             // 
-            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle11.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column5.DefaultCellStyle = dataGridViewCellStyle11;
+            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle12.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column5.DefaultCellStyle = dataGridViewCellStyle12;
             this.Column5.HeaderText = "éƒµã€€é€�ã€€æ—¥";
             this.Column5.Name = "Column5";
             this.Column5.ReadOnly = true;
@@ -469,6 +477,7 @@
             this.Column11.HeaderText = "è«‹æ±‚æ›¸ç•ªå�·";
             this.Column11.Name = "Column11";
             this.Column11.ReadOnly = true;
+            this.Column11.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             this.Column11.Visible = false;
             this.Column11.Width = 160;
             // 
@@ -525,6 +534,7 @@
         private System.Windows.Forms.Label lblCellTotal;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column12;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column8;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column10;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column6;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
@@ -532,7 +542,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column9;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column8;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column13;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column11;
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqbillingStatus/FrmReqBillingStatus.resx
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqbillingStatus/FrmReqBillingStatus.resx	(revision 394)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqbillingStatus/FrmReqBillingStatus.resx	(revision 395)
@@ -123,6 +123,9 @@
   <metadata name="Column12.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Column8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="Column10.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -144,9 +147,6 @@
   <metadata name="Column9.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqbillingStatus/FrmReqBillingStatusAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqbillingStatus/FrmReqBillingStatusAuxiliary.cs	(revision 394)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqbillingStatus/FrmReqBillingStatusAuxiliary.cs	(revision 395)
@@ -458,12 +458,13 @@
                 strSQL.Append(wrkBuff.ToString());
 
                 // ORDER BY ’Ç‰Á
-                strSQL.Append(" ORDER BY C.OrderCotegory ASC");
-                strSQL.Append(", C.OrderersCode ASC");
+                strSQL.Append(" ORDER BY 1=1");
+                strSQL.Append(", H.REQUESTMONTH DESC");
+                strSQL.Append(", ApprovalDate DESC");
                 strSQL.Append(", H.INVOICENO DESC");
-                strSQL.Append(", A.REQUESTNO DESC");
-                strSQL.Append(", ApprovalDate DESC");
-                strSQL.Append(", SendDate DESC");
+                //strSQL.Append(", A.REQUESTNO DESC");
+                //strSQL.Append(",C.OrderCotegory ASC");
+                //strSQL.Append(", SendData DESC");
             }
             catch (Exception ex)
             {
@@ -490,9 +491,8 @@
                 string strDspNo = string.Empty;
                 string strOrderMonth = string.Empty;
                 string strRequestAmount = string.Empty;
-                int BreakOrdererCotegory = 0;
-                int BreakOrdererCode = 0;
-                int BreakInvoiceNo = 0;
+                string BreakOrderMonth = string.Empty;
+                int NowInvoiceNo = 0;
                 int BreakConstrCode = 0;
                 int OrderNo = 1;
                 int RequestAmount = 0;
@@ -504,20 +504,20 @@
                     objwrk = (object[])arData[iy];
                     strOrderName = CommonMotions.cnvString(objwrk[(int)GetData.REQUESTNAME]);
 
-                    // ”­’��æƒuƒŒƒCƒN�ˆ—�
-                    if (BreakOrdererCode == CommonMotions.cnvInt(objwrk[(int)GetData.ORDERERSCODE]) 
-                        && BreakOrdererCotegory == CommonMotions.cnvInt(objwrk[(int)GetData.ORDERERCOTEGORY]))�@
+                    //�sƒiƒ“ƒo�[
+                    strDspNo = (ino++).ToString();
+
+                    //�¿‹�ŒŽ‚ªˆê‚Â‘O‚Ì�s‚Æ“¯‚¶‚¾‚Á‚½�ê�‡‚Íˆê�sŠJ‚¯‚é
+                    if (BreakOrderMonth != CommonMotions.cnvString(objwrk[(int)GetData.REQUESTMONTH]))
                     {
-                        //“¯‚¶�ê�‡‚Í�¿‹��æ–¼‚ð‹ó—“‚É‚µ‚Ä‚¨‚­�i“¯‚¶�¿‹��æ‚Í•¡�”‰ñ�‘‚©‚È‚¢�j
-                        strOrderName = string.Empty;
+                        if (BreakOrderMonth != string.Empty) dgv.Rows.Add(1);
+                        BreakOrderMonth = CommonMotions.cnvString(objwrk[(int)GetData.REQUESTMONTH]);
                     }
-                    else
-                    {   // ˆá‚¤Žž‚Í1�s‹ó‚¯‚é
-                        if (BreakOrdererCode != 0) dgv.Rows.Add(1);
-                        BreakOrdererCode = CommonMotions.cnvInt(objwrk[(int)GetData.ORDERERSCODE]);
-                        BreakOrdererCotegory = CommonMotions.cnvInt(objwrk[(int)GetData.ORDERERCOTEGORY]);
-                    }
 
+                    //�¿‹�ŒŽƒZƒbƒg
+                    strOrderMonth = CommonMotions.cnvString(objwrk[(int)GetData.REQUESTMONTH]);
+                    strOrderMonth = strOrderMonth.Insert(4, "”N") + "ŒŽ";
+
                     // �HŽ––¼�ÌƒZƒbƒg
                     strConstrName = string.Empty;
                     strConstrName = CommonMotions.cnvString(objwrk[(int)GetData.CONSTRUCTIONNAME]);
@@ -528,9 +528,6 @@
                     // Žó•t”Ô�†ƒZƒbƒg
                     OrderNo = CommonMotions.cnvInt(objwrk[(int)GetData.ORDERNO]);
                     if (OrderNo != 1) strConstrName = string.Format("{0} [{1}‰ñ–Ú]", strConstrName, OrderNo);
-                    //�¿‹�ŒŽƒZƒbƒg
-                    strOrderMonth = CommonMotions.cnvString(objwrk[(int)GetData.REQUESTMONTH]);
-                    strOrderMonth = strOrderMonth.Insert(4, "”N")�@+"ŒŽ";
 
                     Array.Clear(DspDate, 0, DspDate.Length);
                     if (CommonMotions.cnvDate(objwrk[(int)GetData.APPROVALDATE]).Date != DateTime.MinValue.Date)
@@ -541,18 +538,8 @@
                         DspDate[2] = CommonMotions.cnvDate(objwrk[(int)GetData.SENDDATE]).ToShortDateString();
 
                     // �¿‹��‘ƒuƒŒƒCƒN
-                    if (BreakInvoiceNo == CommonMotions.cnvInt(objwrk[(int)GetData.INVOICENO]))
-                    {
-                        strDspNo = string.Empty;
-                        strOrderName = string.Empty;
-                        DspDate[1] = string.Empty;
-                        DspDate[2] = string.Empty;
-                    }
-                    else
-                    {
-                        strDspNo = (ino++).ToString();
-                        if (BreakOrdererCode != 0)
-                        BreakInvoiceNo = CommonMotions.cnvInt(objwrk[(int)GetData.INVOICENO]);
+                        if (BreakOrderMonth != string.Empty)
+                            NowInvoiceNo = CommonMotions.cnvInt(objwrk[(int)GetData.INVOICENO]);
 
                         //�¿‹�‹àŠzƒZƒbƒg
                         RequestAmount = CommonMotions.cnvInt(objwrk[(int)GetData.REQUESTAMOUNT]);
@@ -561,8 +548,8 @@
                      for(int i=1; iy + i < arData.Count;i++)
                             {
                                 objNext = (object[])arData[(iy + i)];
-                                if (CommonMotions.cnvInt(objNext[(int)GetData.INVOICENO]) == BreakInvoiceNo)
-                                {
+                            if (CommonMotions.cnvInt(objNext[(int)GetData.INVOICENO]) == NowInvoiceNo)
+                            {
 �@�@�@�@�@�@�@�@       RequestAmount += CommonMotions.cnvInt(((object[])arData[(iy + i)])[(int)GetData.REQUESTAMOUNT]);
                             }
                             else
@@ -573,10 +560,10 @@
                             }
                         }
                            strRequestAmount = RequestAmount.ToString("#,0");
-                     }
 
                     dgv.Rows.Add(strDspNo
-                                        ,  strOrderMonth
+                                        , strOrderMonth
+                                        , DspDate[1]
                                         , CommonMotions.cnvString(objwrk[(int)GetData.DEPARTMENTSTRING])
                                         , CommonMotions.cnvString(objwrk[(int)GetData.PERSONNAME])
                                         , strOrderName
@@ -584,7 +571,6 @@
                                         , strRequestAmount
                                         , CommonMotions.cnvInt(objwrk[(int)GetData.MAINCONSTRUCTIONCODE])
                                         , DspDate[0]
-                                        , DspDate[1]
                                         , DspDate[2]
                                         , CommonMotions.cnvInt(objwrk[(int)GetData.ORDERNO])
                                         , CommonMotions.cnvInt(objwrk[(int)GetData.INVOICENO])
@@ -599,7 +585,7 @@
         }
         #endregion
 
-        #region ƒwƒbƒ_�s•\Ž¦
+        #region ƒwƒbƒ_�s•\Ž¦�i�í�œ—\’è�j
         /// <summary>
         /// ƒwƒbƒ_�s•\Ž¦
         /// �í�œ—\’è‚Ì‚½‚ßƒRƒ�ƒ“ƒgƒAƒEƒg�A‚È‚­‚Ä‚à“®‚­‚±‚Æ‚ªŠm’è‚µ‚½�ê�‡‚Í�í�œ
@@ -676,19 +662,6 @@
                     // ƒOƒŠƒbƒh‚ÖƒZƒbƒg‚Æ‚·‚é
                     SetToGridData(arData);
                 }
-
-                // ƒf�[ƒ^‚ª‘½‚­‚È‚ê‚Îƒ\�[ƒg‚Å‚«‚é
-                if (CommonDefine.s_MaxInitLineCount < dgvMaster.RowCount)
-                {
-                    foreach (DataGridViewColumn wrkCol in dgvMaster.Columns)
-                        wrkCol.SortMode = DataGridViewColumnSortMode.Automatic;
-                }
-                else
-                {
-                    // Žb’è‚Åƒ\�[ƒg‚ð“ü‚ê‚é
-                    foreach (DataGridViewColumn wrkCol in dgvMaster.Columns)
-                        wrkCol.SortMode = DataGridViewColumnSortMode.Automatic;
-                }
             }
             catch (Exception ex)
             {
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmEntryDeposit.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmEntryDeposit.Designer.cs	(revision 394)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmEntryDeposit.Designer.cs	(revision 395)
@@ -35,6 +35,12 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
             this.dgv1 = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
+            this.btnAccept = new System.Windows.Forms.Button();
+            this.btnEnd = new System.Windows.Forms.Button();
+            this.label1 = new System.Windows.Forms.Label();
+            this.OrderersName = new System.Windows.Forms.Label();
+            this.button1 = new System.Windows.Forms.Button();
+            this.btnDelete = new System.Windows.Forms.Button();
             this.OrderersDivision = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.OrderersCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.TargetDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -47,12 +53,6 @@
             this.DepositPersonCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.DepositPersonName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Note = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.btnAccept = new System.Windows.Forms.Button();
-            this.btnEnd = new System.Windows.Forms.Button();
-            this.label1 = new System.Windows.Forms.Label();
-            this.OrderersName = new System.Windows.Forms.Label();
-            this.button1 = new System.Windows.Forms.Button();
-            this.btnDelete = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.dgv1)).BeginInit();
             this.SuspendLayout();
             // 
@@ -85,7 +85,7 @@
             this.DepositPersonName,
             this.Note});
             this.dgv1.EnableHeadersVisualStyles = false;
-            this.dgv1.Location = new System.Drawing.Point(12, 63);
+            this.dgv1.Location = new System.Drawing.Point(8, 53);
             this.dgv1.Name = "dgv1";
             dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control;
@@ -98,7 +98,7 @@
             this.dgv1.RowHeadersVisible = false;
             this.dgv1.RowTemplate.Height = 21;
             this.dgv1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
-            this.dgv1.Size = new System.Drawing.Size(652, 172);
+            this.dgv1.Size = new System.Drawing.Size(706, 172);
             this.dgv1.TabIndex = 9;
             this.dgv1.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.dgv1_CellBeginEdit);
             this.dgv1.CellEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgv1_CellEnter);
@@ -106,6 +106,75 @@
             this.dgv1.CellValidating += new System.Windows.Forms.DataGridViewCellValidatingEventHandler(this.dgv1_CellValidating);
             this.dgv1.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgv1_CellValueChanged);
             // 
+            // btnAccept
+            // 
+            this.btnAccept.BackColor = System.Drawing.Color.Lime;
+            this.btnAccept.ForeColor = System.Drawing.Color.Black;
+            this.btnAccept.Location = new System.Drawing.Point(468, 239);
+            this.btnAccept.Name = "btnAccept";
+            this.btnAccept.Size = new System.Drawing.Size(120, 32);
+            this.btnAccept.TabIndex = 12;
+            this.btnAccept.Text = "ç™»ã€€éŒ²";
+            this.btnAccept.UseVisualStyleBackColor = false;
+            this.btnAccept.Click += new System.EventHandler(this.btnAccept_Click);
+            // 
+            // btnEnd
+            // 
+            this.btnEnd.BackColor = System.Drawing.Color.Blue;
+            this.btnEnd.ForeColor = System.Drawing.Color.Transparent;
+            this.btnEnd.Location = new System.Drawing.Point(594, 239);
+            this.btnEnd.Name = "btnEnd";
+            this.btnEnd.Size = new System.Drawing.Size(120, 32);
+            this.btnEnd.TabIndex = 11;
+            this.btnEnd.Text = "é–‰ã�˜ã‚‹";
+            this.btnEnd.UseVisualStyleBackColor = false;
+            this.btnEnd.Click += new System.EventHandler(this.btnEnd_Click);
+            // 
+            // label1
+            // 
+            this.label1.BackColor = System.Drawing.Color.LightGoldenrodYellow;
+            this.label1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label1.Location = new System.Drawing.Point(8, 12);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(140, 25);
+            this.label1.TabIndex = 15;
+            this.label1.Text = "ç™ºã€€æ³¨ã€€è€…";
+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // OrderersName
+            // 
+            this.OrderersName.BackColor = System.Drawing.Color.White;
+            this.OrderersName.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.OrderersName.Location = new System.Drawing.Point(154, 12);
+            this.OrderersName.Name = "OrderersName";
+            this.OrderersName.Size = new System.Drawing.Size(560, 25);
+            this.OrderersName.TabIndex = 16;
+            this.OrderersName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // button1
+            // 
+            this.button1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.button1.Location = new System.Drawing.Point(154, 248);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(60, 23);
+            this.button1.TabIndex = 15;
+            this.button1.Text = "ãƒ»ãƒ»ãƒ»";
+            this.button1.UseVisualStyleBackColor = true;
+            this.button1.Visible = false;
+            this.button1.Click += new System.EventHandler(this.button1_Click);
+            // 
+            // btnDelete
+            // 
+            this.btnDelete.BackColor = System.Drawing.Color.Magenta;
+            this.btnDelete.ForeColor = System.Drawing.Color.Black;
+            this.btnDelete.Location = new System.Drawing.Point(8, 239);
+            this.btnDelete.Name = "btnDelete";
+            this.btnDelete.Size = new System.Drawing.Size(120, 32);
+            this.btnDelete.TabIndex = 16;
+            this.btnDelete.Text = "å…¥é‡‘å‰Šé™¤";
+            this.btnDelete.UseVisualStyleBackColor = false;
+            this.btnDelete.Click += new System.EventHandler(this.btnDelete_Click);
+            // 
             // OrderersDivision
             // 
             this.OrderersDivision.HeaderText = "â– ç™ºæ³¨è€…åŒºåˆ†";
@@ -216,78 +285,11 @@
             this.Note.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             this.Note.Width = 200;
             // 
-            // btnAccept
-            // 
-            this.btnAccept.BackColor = System.Drawing.Color.Lime;
-            this.btnAccept.ForeColor = System.Drawing.Color.Black;
-            this.btnAccept.Location = new System.Drawing.Point(418, 241);
-            this.btnAccept.Name = "btnAccept";
-            this.btnAccept.Size = new System.Drawing.Size(120, 32);
-            this.btnAccept.TabIndex = 12;
-            this.btnAccept.Text = "ç™»ã€€éŒ²";
-            this.btnAccept.UseVisualStyleBackColor = false;
-            this.btnAccept.Click += new System.EventHandler(this.btnAccept_Click);
-            // 
-            // btnEnd
-            // 
-            this.btnEnd.BackColor = System.Drawing.Color.Blue;
-            this.btnEnd.ForeColor = System.Drawing.Color.Transparent;
-            this.btnEnd.Location = new System.Drawing.Point(544, 241);
-            this.btnEnd.Name = "btnEnd";
-            this.btnEnd.Size = new System.Drawing.Size(120, 32);
-            this.btnEnd.TabIndex = 11;
-            this.btnEnd.Text = "é–‰ã�˜ã‚‹";
-            this.btnEnd.UseVisualStyleBackColor = false;
-            this.btnEnd.Click += new System.EventHandler(this.btnEnd_Click);
-            // 
-            // label1
-            // 
-            this.label1.BackColor = System.Drawing.Color.Yellow;
-            this.label1.Location = new System.Drawing.Point(12, 18);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(106, 25);
-            this.label1.TabIndex = 13;
-            this.label1.Text = "ç™ºæ³¨è€…";
-            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // OrderersName
-            // 
-            this.OrderersName.BackColor = System.Drawing.Color.White;
-            this.OrderersName.Location = new System.Drawing.Point(124, 18);
-            this.OrderersName.Name = "OrderersName";
-            this.OrderersName.Size = new System.Drawing.Size(414, 25);
-            this.OrderersName.TabIndex = 14;
-            this.OrderersName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // button1
-            // 
-            this.button1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.button1.Location = new System.Drawing.Point(604, 18);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(60, 23);
-            this.button1.TabIndex = 15;
-            this.button1.Text = "ãƒ»ãƒ»ãƒ»";
-            this.button1.UseVisualStyleBackColor = true;
-            this.button1.Visible = false;
-            this.button1.Click += new System.EventHandler(this.button1_Click);
-            // 
-            // btnDelete
-            // 
-            this.btnDelete.BackColor = System.Drawing.Color.Magenta;
-            this.btnDelete.ForeColor = System.Drawing.Color.Black;
-            this.btnDelete.Location = new System.Drawing.Point(12, 242);
-            this.btnDelete.Name = "btnDelete";
-            this.btnDelete.Size = new System.Drawing.Size(120, 32);
-            this.btnDelete.TabIndex = 16;
-            this.btnDelete.Text = "å…¥é‡‘å‰Šé™¤";
-            this.btnDelete.UseVisualStyleBackColor = false;
-            this.btnDelete.Click += new System.EventHandler(this.btnDelete_Click);
-            // 
             // FrmEntryDeposit
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.BackColor = System.Drawing.Color.Black;
-            this.ClientSize = new System.Drawing.Size(676, 286);
+            this.ClientSize = new System.Drawing.Size(723, 286);
             this.Controls.Add(this.btnDelete);
             this.Controls.Add(this.button1);
             this.Controls.Add(this.OrderersName);
@@ -317,6 +319,7 @@
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.Label OrderersName;
         private System.Windows.Forms.Button button1;
+        private System.Windows.Forms.Button btnDelete;
         private System.Windows.Forms.DataGridViewTextBoxColumn OrderersDivision;
         private System.Windows.Forms.DataGridViewTextBoxColumn OrderersCode;
         private System.Windows.Forms.DataGridViewTextBoxColumn TargetDate;
@@ -329,6 +332,5 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn DepositPersonCode;
         private System.Windows.Forms.DataGridViewTextBoxColumn DepositPersonName;
         private System.Windows.Forms.DataGridViewTextBoxColumn Note;
-        private System.Windows.Forms.Button btnDelete;
     }
 }
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmEntryDeposit.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmEntryDeposit.cs	(revision 394)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmEntryDeposit.cs	(revision 395)
@@ -307,7 +307,6 @@
                         dgv1.Rows[i].Cells[(int)DispColumn.seqNo].Value = Dlist[i].seqNo;
                         dgv1.Rows[i].Cells[(int)DispColumn.depositPersonCode].Value = Dlist[i].depositPersonCode;
                         dgv1.Rows[i].Cells[(int)DispColumn.personName].Value = Dlist[i].personName;
-                        dgv1.Rows[i].Cells[(int)DispColumn.personName].Style.ForeColor = Color.Red;
                     }
                     else
                     {
@@ -316,7 +315,6 @@
                         dgv1.Rows[i].Cells[(int)DispColumn.seqNo].Value = maxSeqNo + 1;
                         dgv1.Rows[i].Cells[(int)DispColumn.depositPersonCode].Value = CommonMotions.LoginUserData.PersonCode;
                         dgv1.Rows[i].Cells[(int)DispColumn.personName].Value = CommonMotions.LoginUserData.SealPrintName;
-                        dgv1.Rows[i].Cells[(int)DispColumn.personName].Style.ForeColor = Color.Gray;
                     }
                     dgv1.Rows[i].Cells[(int)DispColumn.note].Value = Dlist[i].note;
                 }
@@ -423,6 +421,16 @@
         {
             try
             {
+
+                // ãƒ‡ãƒ¼ã‚¿ã‚°ãƒªãƒƒãƒ‰ã�ŒActiveã�§ã�ªã�‘ã‚Œã�°å‡¦ç�†ã�—ã�ªã�„
+                if (ActiveControl == null) return;
+                if (!ActiveControl.GetType().Equals(typeof(DataGridViewEX))) return;
+
+                DataGridViewEX dgv = (DataGridViewEX)sender;
+
+                // èª­è¾¼å°‚ç”¨ã‚»ãƒ«ã�¯å‡¦ç�†ã�—ã�ªã�„
+                if (dgv.CurrentCell.ReadOnly) return;
+
                 if (dgv1.RowCount == 0)
                 {
                     return;
@@ -429,8 +437,20 @@
                 }
                 oldCellValue = CommonMotions.cnvString(dgv1[e.ColumnIndex, e.RowIndex].Value);
 
+                //IMEã�®ãƒ¢ãƒ¼ãƒ‰ã‚’å¤‰æ›´ã�™ã‚‹
+                switch (e.ColumnIndex)
+                {
+                    case (int)DispColumn.note:    // å‚™è€ƒ
+                        dgv.ImeMode = ImeMode.On;
+                        break;
+                    default:
+                        dgv.ImeMode = ImeMode.Disable;
+                        break;
+                }
+                // ã‚»ãƒ«å†…å®¹é�¸æŠž
+                dgv.BeginEdit(true);
             }
-            catch (Exception ex)
+            catch (System.Exception ex)
             {
                 logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
             }
@@ -776,7 +796,8 @@
                         DepositAmount = Dlist[i].depositAmountCash + Dlist[i].depositAmountBill,
                         DepositAmountCash = Dlist[i].depositAmountCash,
                         DepositAmountBill = Dlist[i].depositAmountBill,
-                        DepositPersonCode = (int)dgv1.Rows[i].Cells[(int)DispColumn.depositPersonCode].Value,
+                        DepositPersonCode = CommonMotions.LoginUserData.PersonCode,
+                        //DepositPersonCode = (int)dgv1.Rows[i].Cells[(int)DispColumn.depositPersonCode].Value,
                         Note = m_note
                     };
 
@@ -816,6 +837,7 @@
                     #endregion
                 }
                 CommonMotions.EntryEndMessage("å…¥é‡‘å…¥åŠ›");
+                this.Close();
             }
             catch (Exception ex)
             {
@@ -828,14 +850,6 @@
                 dgv1.CellValueChanged += dgv1_CellValueChanged;
                 ioDepositData.close();
                 ioDepositData = null;
-                try
-                {
-                    this.Close();
-                }
-                catch (Exception ex)
-                {
-                    logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
-                }
             }
         }
         #endregion
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmSelectPayment.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmSelectPayment.Designer.cs	(revision 394)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmSelectPayment.Designer.cs	(revision 395)
@@ -209,6 +209,7 @@
             this.cbTargetMonth.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.cbTargetMonth.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.cbTargetMonth.FormattingEnabled = true;
+            this.cbTargetMonth.IntegralHeight = false;
             this.cbTargetMonth.Location = new System.Drawing.Point(164, 8);
             this.cbTargetMonth.Name = "cbTargetMonth";
             this.cbTargetMonth.Size = new System.Drawing.Size(100, 24);
@@ -429,6 +430,7 @@
             // 
             this.OrderersName.HeaderText = "è«‹æ±‚å…ˆå��/è«‹æ±‚æ—¥";
             this.OrderersName.Name = "OrderersName";
+            this.OrderersName.ReadOnly = true;
             this.OrderersName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             this.OrderersName.Width = 200;
             // 
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmSelectPayment.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmSelectPayment.cs	(revision 394)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmSelectPayment.cs	(revision 395)
@@ -385,6 +385,7 @@
 
                 cbTargetMonth.Items.AddRange(lstDate.ToArray());
                 cbTargetMonth.SelectedIndex = lstDate.IndexOf(strNow);
+                cbTargetMonth.MaxDropDownItems = 10;
 
                 // ãƒ¦ãƒ¼ã‚¶æ¨©é™�è¨­å®š
                 ClsSecurityPermission.SetUserType(m_UserInfo);
@@ -874,10 +875,32 @@
         {
             try
             {
-                if (dgvMaster.RowCount == 0)
-                    return;
+                // ãƒ‡ãƒ¼ã‚¿ã‚°ãƒªãƒƒãƒ‰ã�ŒActiveã�§ã�ªã�‘ã‚Œã�°å‡¦ç�†ã�—ã�ªã�„
+                if (ActiveControl == null) return;
+                if (!ActiveControl.GetType().Equals(typeof(DataGridViewEX))) return;
+
+                DataGridViewEX dgv = (DataGridViewEX)sender;
+
+                // èª­è¾¼å°‚ç”¨ã‚»ãƒ«ã�¯å‡¦ç�†ã�—ã�ªã�„
+                if (dgv.CurrentCell.ReadOnly) return;
+
+
+                if (dgvMaster.RowCount == 0)return;
                 oldCellValue = CommonMotions.cnvString(dgvMaster[e.ColumnIndex, e.RowIndex].Value);
 
+                //IMEã�®ãƒ¢ãƒ¼ãƒ‰ã‚’å¤‰æ›´ã�™ã‚‹
+                switch (e.ColumnIndex)
+                {
+                    case (int)DispColumn.NoteDD:    // å‚™è€ƒ
+                        dgv.ImeMode = ImeMode.On;
+                        break;
+                    default:
+                        dgv.ImeMode = ImeMode.Disable;
+                        break;
+                }
+                // ã‚»ãƒ«å†…å®¹é�¸æŠž
+                dgv.BeginEdit(true);
+
             }
             catch (Exception ex)
             {
@@ -1001,6 +1024,8 @@
                     {
                         case (int)DispColumn.DepositAmount:
                             depositDetail.DepositAmount = amount;
+                            // æ¶ˆè²»ç¨Žé¡�è¨ˆç®—
+                            depositDetail.TaxAmount = CommonMotions.cnvRound(amount * (CommonMotions.SystemMasterData.ConsumptionTax / 100.0));
                             bUpdateCarryAmount = true;
                             sumDataCheck = true;
                             break;
@@ -1682,6 +1707,23 @@
                     SetPrice(ordererRow.Cells, (int)DispColumn.DepositAmountCash, (long)SumDepositAmountCash);
                     SetPrice(ordererRow.Cells, (int)DispColumn.DepositAmountBill, (long)SumDepositAmountBill);
 
+                    // å…¥é‡‘å�ˆè¨ˆã�¨è«‹æ±‚å�ˆè¨ˆã�®å·®ç•°ã�Œã�‚ã�£ã�Ÿå ´å�ˆã�¯è‰²ã‚’å¤‰æ›´ã�™ã‚‹
+                    long depositAmount = SumDepositAmountCash + SumDepositAmountBill;
+                    long requestAmount = SumRequestBill + SumRequestTax;
+                    if (requestAmount != depositAmount)
+                    {
+                        ordererRow.Cells[(int)DispColumn.DepositAmountCash].Style.BackColor = Color.Yellow;
+                        ordererRow.Cells[(int)DispColumn.DepositAmountCash].Style.ForeColor = Color.Red;
+
+                        ordererRow.Cells[(int)DispColumn.DepositAmountBill].Style.BackColor = Color.Yellow;
+                        ordererRow.Cells[(int)DispColumn.DepositAmountBill].Style.ForeColor = Color.Red;
+                    }
+                    else
+                    {
+                        ordererRow.Cells[(int)DispColumn.DepositAmountCash].Style.BackColor = Color.LightGoldenrodYellow;
+                        ordererRow.Cells[(int)DispColumn.DepositAmountBill].Style.BackColor = Color.LightGoldenrodYellow;
+                    }
+
                     // å…¥é‡‘æ˜Žç´°é‡‘é¡�ã�®å�ˆè¨ˆã‚’ç®—å‡º
                     var DepositDetailSum = DepositDetailSumCalc(depositOrderer.OrderersDivision, depositOrderer.OrderersCode, depositOrderer.RequestMonth).OfType<object[]>();
                     int DepositAmountSum = 0;
@@ -1712,8 +1754,6 @@
                     ordererRow.Cells[(int)DispColumn.No].Style.BackColor = Color.LightGoldenrodYellow;
                     ordererRow.Cells[(int)DispColumn.RequestMonth].Style.BackColor = Color.LightGoldenrodYellow;
                     ordererRow.Cells[(int)DispColumn.OrderersName].Style.BackColor = Color.LightGoldenrodYellow;
-                    ordererRow.Cells[(int)DispColumn.DepositAmountCash].Style.BackColor = Color.LightGoldenrodYellow;
-                    ordererRow.Cells[(int)DispColumn.DepositAmountBill].Style.BackColor = Color.LightGoldenrodYellow;
 
                     ordererRow.Cells[(int)DispColumn.ConstructionCode].Style.BackColor = Color.LightGoldenrodYellow;
                     ordererRow.Cells[(int)DispColumn.RequestNo].Style.BackColor = Color.LightGoldenrodYellow;
@@ -1731,14 +1771,6 @@
                     ordererRow.Cells[(int)DispColumn.CnstrPrice].Style.BackColor = Color.LightGoldenrodYellow;
                     ordererRow.Cells[(int)DispColumn.Fees].Style.BackColor = Color.LightGoldenrodYellow;
                     ordererRow.Cells[(int)DispColumn.OtherAdjustments].Style.BackColor = Color.LightGoldenrodYellow;
-                    if (DifferenceAmountSum < 0)
-                    {
-                        ordererRow.Cells[(int)DispColumn.DifferentAmount].Style.BackColor = Color.Yellow;
-                    }
-                    else
-                    {
-                        ordererRow.Cells[(int)DispColumn.DifferentAmount].Style.BackColor = Color.LightGoldenrodYellow;
-                    }
 
                     SetPrice(ordererRow.Cells, (int)DispColumn.DepositAmount, DepositAmountSum);
                     SetPrice(ordererRow.Cells, (int)DispColumn.TaxAmount, TaxAmountSum);
@@ -1748,6 +1780,17 @@
                     SetPrice(ordererRow.Cells, (int)DispColumn.OtherAdjustments, OtherAdjustmentsSum);
                     SetPrice(ordererRow.Cells, (int)DispColumn.DifferentAmount, DifferenceAmountSum);
 
+                    //å·®ç•°ã�Œ0ä»¥å¤–ã�®å ´å�ˆã�¯è¡¨ç¤ºè‰²ã‚’å¤‰æ›´ã�™ã‚‹
+                    if (DifferenceAmountSum != 0)
+                    {
+                        ordererRow.Cells[(int)DispColumn.DifferentAmount].Style.BackColor = Color.Yellow;
+                        ordererRow.Cells[(int)DispColumn.DifferentAmount].Style.ForeColor = Color.Red;
+                    }
+                    else
+                    {
+                        ordererRow.Cells[(int)DispColumn.DifferentAmount].Style.BackColor = Color.LightGoldenrodYellow;
+                    }
+
                     ordererRow.Cells[(int)DispColumn.DepositAmount].ReadOnly = true;
                     ordererRow.Cells[(int)DispColumn.TaxAmount].ReadOnly = true;
                     ordererRow.Cells[(int)DispColumn.DiscountAmount].ReadOnly = true;
@@ -1868,7 +1911,6 @@
                         row.Cells[(int)DispColumn.CnstrPrice].Style.BackColor = Color.LightCyan;
                         row.Cells[(int)DispColumn.Fees].Style.BackColor = Color.LightCyan;
                         row.Cells[(int)DispColumn.OtherAdjustments].Style.BackColor = Color.LightCyan;
-                        row.Cells[(int)DispColumn.DifferentAmount].Style.BackColor = Color.LightCyan;
 
                         long RequestAmount = depositDetail.BillPrice + depositDetail.TaxPrice;
                         long DepositAmount = depositDetail.DepositAmount + depositDetail.TaxAmount + depositDetail.DiscountAmount
@@ -1877,6 +1919,16 @@
 
                         SetPrice(row.Cells, (int)DispColumn.DifferentAmount, depositDetail.DifferenceAmount);
 
+                        //å·®ç•°ã�Œ0ä»¥å¤–ã�®å ´å�ˆã�¯è¡¨ç¤ºè‰²ã‚’å¤‰æ›´ã�™ã‚‹
+                        if (depositDetail.DifferenceAmount != 0)
+                        {
+                            row.Cells[(int)DispColumn.DifferentAmount].Style.BackColor = Color.Yellow;
+                            row.Cells[(int)DispColumn.DifferentAmount].Style.ForeColor = Color.Red;
+                        }
+                        else
+                        {
+                            row.Cells[(int)DispColumn.DifferentAmount].Style.BackColor = Color.LightCyan;
+                        }
                         row.Cells[(int)DispColumn.ConfirmationPersonCode].Value = depositDetail.ConstructionPersonCode;
                         row.Cells[(int)DispColumn.ConfirmationDate].Value = depositDetail.ConfirmationDate;
                         row.Cells[(int)DispColumn.ConfirmationEndFlg].Value = depositDetail.ConfirmationEndFlg;
@@ -2671,10 +2723,14 @@
                     || e.ColumnIndex == (int)DispColumn.DifferentAmount)
                 {
                     // ãƒžã‚¤ãƒŠã‚¹å€¤ã�¯èµ¤
-                    if (CommonMotions.cnvInt(dgv[e.ColumnIndex, e.RowIndex].Value) < 0)
+                    if (e.ColumnIndex == (int)DispColumn.DifferentAmount && CommonMotions.cnvInt(dgv[e.ColumnIndex, e.RowIndex].Value) != 0)
                     {
                         dgv[e.ColumnIndex, e.RowIndex].Style.ForeColor = Color.Red;
                     }
+                    else if (CommonMotions.cnvInt(dgv[e.ColumnIndex, e.RowIndex].Value) < 0)
+                    {
+                        dgv[e.ColumnIndex, e.RowIndex].Style.ForeColor = Color.Red;
+                    }
                     else
                     {
                         dgv[e.ColumnIndex, e.RowIndex].Style.ForeColor = SystemColors.ControlText;
