Index: branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 319)
@@ -14,7 +14,7 @@
         /// <summary>
         /// æœ¬ä½“ãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
         /// </summary>
-        public static int s_SystemVersion = 140;
+        public static int s_SystemVersion = 142;
 
         /// <summary>
         /// ã‚³ãƒ”ãƒ¼ãƒ»ç’°å¢ƒãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
Index: branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsChangeLedgerData.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsChangeLedgerData.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsChangeLedgerData.cs	(revision 319)
@@ -1326,14 +1326,12 @@
                 }
                 else
                 {
-                    // ã‚­ãƒ¼é …ç›®å�–å¾—æ�¡ä»¶ä½œæˆ�
-                    strSQL.Clear();
-                    strSQL.Append(DetailDB.CreatePrimarykeyString(ExcuteRec.ConstructionCode, ExcuteRec.GroupCount));
-
-
-                    // æ˜Žç´°ãƒ‡ãƒ¼ã‚¿ã‚‚å®Ÿè¡Œãƒ‡ãƒ¼ã‚¿ã‚‚å­˜åœ¨ã�—ã�ªã�„
                     if (ExecList.Count < 1)
                     {
+                        // ----- å­˜åœ¨ã�—ã�ªã�„å ´å�ˆã�¯æ˜Žç´°ãƒ‡ãƒ¼ã‚¿ã‚’ä½œã‚‹
+                        // ã‚­ãƒ¼é …ç›®å�–å¾—æ�¡ä»¶ä½œæˆ�
+                        strSQL.Clear();
+                        strSQL.Append(DetailDB.CreatePrimarykeyString(ExcuteRec.ConstructionCode, ExcuteRec.GroupCount));
                         // ãƒ‡ãƒ¼ã‚¿ã�Œã�ªã�„å ´å�ˆã�¯æ–°è¦�è¡Œç•ªå�·ã‚’å�–å¾—ã�™ã‚‹
                         ExcuteRec.LineCount = DetailDB.SelectMaxLineCount(strSQL.ToString(), false) + 1;
                         // ãƒ‡ãƒ¼ã‚¿ã�Œã�ªã�„å ´å�ˆã�¯æ–°è¦�æ˜Žç´°ç•ªå�·ã‚’å�–å¾—ã�™ã‚‹
@@ -1345,7 +1343,20 @@
                             return false;
                         }
                     }
-                    DetailRec.LineCount = ExcuteRec.LineCount;
+                    else
+                    {
+                        // ----- å­˜åœ¨ã�™ã‚‹å ´å�ˆã�¯æ˜Žç´°ãƒ‡ãƒ¼ã‚¿ã‚’æ›´æ–°
+                        // è«‹æ±‚å†…å®¹ã�®æ›´æ–°
+                        if (!DetailDB.UpdateFeild(DetailRec.ConstructionCode
+                                                    ,(int)IOConstructionLedgerDetail.TableColumn.SecondString
+                                                    , DetailRec.SecondString
+                                                    , DetailRec.GroupCount
+                                                    , DetailRec.LineCount
+                                                    , false))
+                        {
+                            return false;
+                        }
+                    }
 
                     // å®Ÿè¡Œãƒ‡ãƒ¼ã‚¿æ–°è¦�ä½œæˆ�
                     if (!ExecDB.InsertAction(ExcuteRec, false))
Index: branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOBillingData.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOBillingData.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOBillingData.cs	(revision 319)
@@ -226,7 +226,10 @@
 
                 strcmd.Append(" SET");
 
-                strcmd.AppendFormat(" BillPrice = {0}", data.BillPrice.ToString());
+                strcmd.AppendFormat(" CompanyCode = {0}", data.CompanyCode);
+                strcmd.AppendFormat(", TargetDate = {0}", data.TargetDate);
+                strcmd.AppendFormat(", SeqNo = {0}", data.SeqNo);
+                strcmd.AppendFormat(", BillPrice = {0}", data.BillPrice.ToString());
 
                 strcmd.Append(", UpdateDate = NOW()");
                 strcmd.Append(AddSQLString);
Index: branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOBillingDataDetail.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOBillingDataDetail.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOBillingDataDetail.cs	(revision 319)
@@ -261,7 +261,11 @@
 
                 strcmd.Append(" SET");
 
-                strcmd.AppendFormat("  ConstructionCode = {0}", data.ConstructionCode.ToString());
+                strcmd.AppendFormat(" CompanyCode = {0}", data.CompanyCode);
+                strcmd.AppendFormat(", TargetDate = {0}", data.TargetDate);
+                strcmd.AppendFormat(", SeqNo = {0}", data.SeqNo);
+                strcmd.AppendFormat(", LineCount = {0}", data.LineCount);
+                strcmd.AppendFormat(", ConstructionCode = {0}", data.ConstructionCode.ToString());
                 strcmd.AppendFormat(", ConstructionRowCnt = {0}", data.ConstructionRowCnt.ToString());
                 strcmd.AppendFormat(", ConstructionColCnt = {0}", data.ConstructionColCnt.ToString());
                 strcmd.AppendFormat(", FieldName = '{0}'", data.FieldName);
Index: branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOPaymentApprovalInfo.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOPaymentApprovalInfo.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOPaymentApprovalInfo.cs	(revision 319)
@@ -300,10 +300,15 @@
 
                 strcmd.Append(" SET");
 
-                strcmd.AppendFormat(" ApprovalPerson = {0}", data.ApprovalPerson.ToString());
-                strcmd.AppendFormat(",ApprovalPersonName = '{0}'", data.ApprovalPersonName);
-                strcmd.AppendFormat(",ApprovalAuthority = {0}", data.ApprovalAuthority.ToString());
-                strcmd.AppendFormat(",ApprovalDate = STR_TO_DATE('{0}','%Y/%m/%d')", data.ApprovalDate.ToShortDateString());
+                strcmd.AppendFormat("  CompanyCode = {0}", data.CompanyCode);
+                strcmd.AppendFormat(", TargetDate = {0}", data.TargetDate);
+                strcmd.AppendFormat(", SeqNo = {0}", data.SeqNo);
+                strcmd.AppendFormat(", LineCount = {0}", data.LineCount);
+                strcmd.AppendFormat(", ApprovalNo = {0}", data.ApprovalNo);
+                strcmd.AppendFormat(", ApprovalPerson = {0}", data.ApprovalPerson);
+                strcmd.AppendFormat(", ApprovalPersonName = '{0}'", data.ApprovalPersonName);
+                strcmd.AppendFormat(", ApprovalAuthority = {0}", data.ApprovalAuthority);
+                strcmd.AppendFormat(", ApprovalDate = STR_TO_DATE('{0}','%Y/%m/%d')", data.ApprovalDate.ToShortDateString());
 
                 strcmd.Append(", UpdateDate = NOW()");
                 strcmd.Append(AddSQLString);
Index: branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOPaymentDataDetail.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOPaymentDataDetail.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOPaymentDataDetail.cs	(revision 319)
@@ -275,18 +275,22 @@
 
                 strcmd.Append(" SET");
 
-                strcmd.AppendFormat(" BillPrice = {0}", data.BillPrice.ToString());
-                strcmd.AppendFormat(",DiscountPrice = {0}", data.DiscountPrice.ToString());
-                strcmd.AppendFormat(",OffsetPrice = {0}", data.OffsetPrice.ToString());
-                strcmd.AppendFormat(",NextCoPrice = {0}", data.NextCoPrice.ToString());
-                strcmd.AppendFormat(",HighwPrice = {0}", data.HighwPrice.ToString());
-                strcmd.AppendFormat(",HardwPrice = {0}", data.HardwPrice.ToString());
-                strcmd.AppendFormat(",IndsWasteTax = {0}", data.IndsWasteTax.ToString());
-                strcmd.AppendFormat(",CnstrPrice = {0}", data.CnstrPrice.ToString());
-                strcmd.AppendFormat(",CnstrPriceExist = {0}", data.CnstrPriceExist.ToString());
-                strcmd.AppendFormat(",ApprovalPersonCode = {0}", data.ApprovalPersonCode.ToString());
-                strcmd.AppendFormat(",ApprovalDate = STR_TO_DATE('{0}','%Y/%m/%d')", data.ApprovalDate.ToShortDateString());
-                strcmd.AppendFormat(",ApprovalEndFlg = {0}", data.ApprovalEndFlg.ToString());
+                strcmd.AppendFormat("  CompanyCode = {0}", data.CompanyCode);
+                strcmd.AppendFormat(", TargetDate = {0}", data.TargetDate);
+                strcmd.AppendFormat(", SeqNo = {0}", data.SeqNo);
+                strcmd.AppendFormat(", LineCount = {0}", data.LineCount);
+                strcmd.AppendFormat(", BillPrice = {0}", data.BillPrice.ToString());
+                strcmd.AppendFormat(", DiscountPrice = {0}", data.DiscountPrice.ToString());
+                strcmd.AppendFormat(", OffsetPrice = {0}", data.OffsetPrice.ToString());
+                strcmd.AppendFormat(", NextCoPrice = {0}", data.NextCoPrice.ToString());
+                strcmd.AppendFormat(", HighwPrice = {0}", data.HighwPrice.ToString());
+                strcmd.AppendFormat(", HardwPrice = {0}", data.HardwPrice.ToString());
+                strcmd.AppendFormat(", IndsWasteTax = {0}", data.IndsWasteTax.ToString());
+                strcmd.AppendFormat(", CnstrPrice = {0}", data.CnstrPrice.ToString());
+                strcmd.AppendFormat(", CnstrPriceExist = {0}", data.CnstrPriceExist.ToString());
+                strcmd.AppendFormat(", ApprovalPersonCode = {0}", data.ApprovalPersonCode.ToString());
+                strcmd.AppendFormat(", ApprovalDate = STR_TO_DATE('{0}','%Y/%m/%d')", data.ApprovalDate.ToShortDateString());
+                strcmd.AppendFormat(", ApprovalEndFlg = {0}", data.ApprovalEndFlg.ToString());
 
                 strcmd.Append(", UpdateDate = NOW()");
                 strcmd.Append(AddSQLString);
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPerson.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPerson.designer.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPerson.designer.cs	(revision 319)
@@ -142,7 +142,7 @@
             this.dgvEntryData.AllowUserToDeleteRows = false;
             this.dgvEntryData.AllowUserToResizeColumns = false;
             this.dgvEntryData.AllowUserToResizeRows = false;
-            this.dgvEntryData.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvEntryData.BackgroundColor = System.Drawing.Color.White;
             this.dgvEntryData.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle1.BackColor = System.Drawing.Color.Black;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.designer.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.designer.cs	(revision 319)
@@ -152,7 +152,7 @@
             this.dgvEntryData.AllowUserToDeleteRows = false;
             this.dgvEntryData.AllowUserToResizeColumns = false;
             this.dgvEntryData.AllowUserToResizeRows = false;
-            this.dgvEntryData.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvEntryData.BackgroundColor = System.Drawing.Color.White;
             this.dgvEntryData.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle1.BackColor = System.Drawing.Color.Black;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs	(revision 319)
@@ -780,7 +780,7 @@
                         { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 82:�¿‹�‹æ•ª–¼�Ì
                         { false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false, false},    // 83:ŒŸ�¸—\’è“ú
                         { false, false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false},    // 84:ŒŸ�¸ŽÀ�s“ú
-                        { false, false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false},    // 85:ŒŸ�¸�¥�³Š®—¹“ú
+                        { false, false, false, false, false, false, false, false, false, true,  true,  false, false, false, false, false, false, false},    // 85:ŒŸ�¸�¥�³Š®—¹“ú
 
                         { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // �y�Å�I�z+ 1:�Á”ï�Åƒtƒ‰ƒO
                         { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // �y�Å�I�z+ 2:Œ³�¿ƒtƒ‰ƒO �¦–¢Žg—p
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.cs	(revision 319)
@@ -1698,5 +1698,18 @@
             }
         }
         #endregion
+
+        #region ƒZƒ‹•`‰æ�ˆ—�
+        /// <summary>
+        /// ƒZƒ‹•`‰æ�ˆ—�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void dgvAllDisplay_CellPainting(object sender, DataGridViewCellPaintingEventArgs e)
+        {
+            // �àŒ‹�‡�ˆ—�
+            DrawTitlePaining(e);
+        }
+        #endregion
     }
 }
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.designer.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.designer.cs	(revision 319)
@@ -45,6 +45,14 @@
             this.btnDataEntry = new System.Windows.Forms.Button();
             this.btnEnd = new System.Windows.Forms.Button();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.pnlApproval = new System.Windows.Forms.Panel();
+            this.lblApprovalCount = new System.Windows.Forms.Label();
+            this.btnPetition = new System.Windows.Forms.Button();
+            this.btnApproval = new System.Windows.Forms.Button();
+            this.pnlApprovalButton = new System.Windows.Forms.Panel();
+            this.btnOnApproval = new System.Windows.Forms.Button();
+            this.btnNotApproval = new System.Windows.Forms.Button();
+            this.btnOnHold = new System.Windows.Forms.Button();
             this.lblLabel06 = new System.Windows.Forms.Label();
             this.label23 = new System.Windows.Forms.Label();
             this.pnlGroup2 = new System.Windows.Forms.Panel();
@@ -66,15 +74,7 @@
             this.label19 = new System.Windows.Forms.Label();
             this.label21 = new System.Windows.Forms.Label();
             this.label15 = new System.Windows.Forms.Label();
-            this.pnlApproval = new System.Windows.Forms.Panel();
-            this.lblApprovalCount = new System.Windows.Forms.Label();
-            this.btnPetition = new System.Windows.Forms.Button();
-            this.btnApproval = new System.Windows.Forms.Button();
             this.label18 = new System.Windows.Forms.Label();
-            this.pnlApprovalButton = new System.Windows.Forms.Panel();
-            this.btnOnApproval = new System.Windows.Forms.Button();
-            this.btnNotApproval = new System.Windows.Forms.Button();
-            this.btnOnHold = new System.Windows.Forms.Button();
             this.label17 = new System.Windows.Forms.Label();
             this.label16 = new System.Windows.Forms.Label();
             this.lblConstructionCodelabel = new System.Windows.Forms.Label();
@@ -95,6 +95,10 @@
             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.btnChangeExpenses = 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();
@@ -115,15 +119,11 @@
             this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.btnDispDown = new System.Windows.Forms.Button();
-            this.btnDispUp = new System.Windows.Forms.Button();
-            this.btnOtherProc = new System.Windows.Forms.Button();
-            this.btnChangeExpenses = new System.Windows.Forms.Button();
             this.panel1.SuspendLayout();
+            this.pnlApproval.SuspendLayout();
+            this.pnlApprovalButton.SuspendLayout();
             this.pnlGroup2.SuspendLayout();
             this.pnlGroup1.SuspendLayout();
-            this.pnlApproval.SuspendLayout();
-            this.pnlApprovalButton.SuspendLayout();
             this.panel2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvAllDisplay)).BeginInit();
             this.SuspendLayout();
@@ -221,6 +221,112 @@
             this.panel1.Size = new System.Drawing.Size(1330, 160);
             this.panel1.TabIndex = 0;
             // 
+            // pnlApproval
+            // 
+            this.pnlApproval.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.pnlApproval.AutoSize = true;
+            this.pnlApproval.BackColor = System.Drawing.Color.White;
+            this.pnlApproval.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.pnlApproval.Controls.Add(this.lblApprovalCount);
+            this.pnlApproval.Controls.Add(this.btnPetition);
+            this.pnlApproval.Controls.Add(this.btnApproval);
+            this.pnlApproval.Location = new System.Drawing.Point(1057, 0);
+            this.pnlApproval.Name = "pnlApproval";
+            this.pnlApproval.Size = new System.Drawing.Size(262, 34);
+            this.pnlApproval.TabIndex = 48;
+            // 
+            // lblApprovalCount
+            // 
+            this.lblApprovalCount.BackColor = System.Drawing.Color.Black;
+            this.lblApprovalCount.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.lblApprovalCount.ForeColor = System.Drawing.Color.White;
+            this.lblApprovalCount.Location = new System.Drawing.Point(205, 3);
+            this.lblApprovalCount.Name = "lblApprovalCount";
+            this.lblApprovalCount.Size = new System.Drawing.Size(50, 24);
+            this.lblApprovalCount.TabIndex = 1;
+            this.lblApprovalCount.Text = "4/5";
+            this.lblApprovalCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // btnPetition
+            // 
+            this.btnPetition.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnPetition.BackColor = System.Drawing.Color.White;
+            this.btnPetition.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnPetition.ForeColor = System.Drawing.Color.Red;
+            this.btnPetition.Location = new System.Drawing.Point(3, 3);
+            this.btnPetition.Name = "btnPetition";
+            this.btnPetition.Size = new System.Drawing.Size(100, 24);
+            this.btnPetition.TabIndex = 12;
+            this.btnPetition.Text = "æœªç”³è«‹";
+            this.btnPetition.UseVisualStyleBackColor = false;
+            this.btnPetition.Click += new System.EventHandler(this.btnPetition_Click);
+            // 
+            // btnApproval
+            // 
+            this.btnApproval.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnApproval.BackColor = System.Drawing.Color.White;
+            this.btnApproval.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.btnApproval.ForeColor = System.Drawing.Color.Red;
+            this.btnApproval.Location = new System.Drawing.Point(104, 3);
+            this.btnApproval.Name = "btnApproval";
+            this.btnApproval.Size = new System.Drawing.Size(100, 24);
+            this.btnApproval.TabIndex = 12;
+            this.btnApproval.Text = "æœªæ‰¿èª�";
+            this.btnApproval.UseVisualStyleBackColor = false;
+            this.btnApproval.Click += new System.EventHandler(this.btnApproval_Click);
+            // 
+            // pnlApprovalButton
+            // 
+            this.pnlApprovalButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.pnlApprovalButton.AutoSize = true;
+            this.pnlApprovalButton.BackColor = System.Drawing.Color.White;
+            this.pnlApprovalButton.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.pnlApprovalButton.Controls.Add(this.btnOnApproval);
+            this.pnlApprovalButton.Controls.Add(this.btnNotApproval);
+            this.pnlApprovalButton.Controls.Add(this.btnOnHold);
+            this.pnlApprovalButton.Location = new System.Drawing.Point(1057, 0);
+            this.pnlApprovalButton.Name = "pnlApprovalButton";
+            this.pnlApprovalButton.Size = new System.Drawing.Size(262, 34);
+            this.pnlApprovalButton.TabIndex = 49;
+            this.pnlApprovalButton.Visible = false;
+            // 
+            // btnOnApproval
+            // 
+            this.btnOnApproval.BackColor = System.Drawing.Color.MediumSpringGreen;
+            this.btnOnApproval.Location = new System.Drawing.Point(5, 3);
+            this.btnOnApproval.Name = "btnOnApproval";
+            this.btnOnApproval.Size = new System.Drawing.Size(83, 24);
+            this.btnOnApproval.TabIndex = 34;
+            this.btnOnApproval.TabStop = false;
+            this.btnOnApproval.Text = "æ‰¿èª�";
+            this.btnOnApproval.UseVisualStyleBackColor = false;
+            this.btnOnApproval.Click += new System.EventHandler(this.btnOnApproval_Click);
+            // 
+            // btnNotApproval
+            // 
+            this.btnNotApproval.BackColor = System.Drawing.Color.Red;
+            this.btnNotApproval.Location = new System.Drawing.Point(171, 3);
+            this.btnNotApproval.Name = "btnNotApproval";
+            this.btnNotApproval.Size = new System.Drawing.Size(83, 24);
+            this.btnNotApproval.TabIndex = 35;
+            this.btnNotApproval.TabStop = false;
+            this.btnNotApproval.Text = "ä¸�æ‰¿èª�";
+            this.btnNotApproval.UseVisualStyleBackColor = false;
+            this.btnNotApproval.Click += new System.EventHandler(this.btnNotApproval_Click);
+            // 
+            // btnOnHold
+            // 
+            this.btnOnHold.BackColor = System.Drawing.Color.Yellow;
+            this.btnOnHold.Location = new System.Drawing.Point(88, 3);
+            this.btnOnHold.Name = "btnOnHold";
+            this.btnOnHold.Size = new System.Drawing.Size(83, 24);
+            this.btnOnHold.TabIndex = 36;
+            this.btnOnHold.TabStop = false;
+            this.btnOnHold.Text = "ä¿�ç•™";
+            this.btnOnHold.UseVisualStyleBackColor = false;
+            this.btnOnHold.Click += new System.EventHandler(this.btnOnHold_Click);
+            // 
             // lblLabel06
             // 
             this.lblLabel06.BackColor = System.Drawing.Color.White;
@@ -473,61 +579,6 @@
             this.label15.TabIndex = 36;
             this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // pnlApproval
-            // 
-            this.pnlApproval.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlApproval.AutoSize = true;
-            this.pnlApproval.BackColor = System.Drawing.Color.White;
-            this.pnlApproval.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.pnlApproval.Controls.Add(this.lblApprovalCount);
-            this.pnlApproval.Controls.Add(this.btnPetition);
-            this.pnlApproval.Controls.Add(this.btnApproval);
-            this.pnlApproval.Location = new System.Drawing.Point(1057, 0);
-            this.pnlApproval.Name = "pnlApproval";
-            this.pnlApproval.Size = new System.Drawing.Size(262, 34);
-            this.pnlApproval.TabIndex = 48;
-            // 
-            // lblApprovalCount
-            // 
-            this.lblApprovalCount.BackColor = System.Drawing.Color.Black;
-            this.lblApprovalCount.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.lblApprovalCount.ForeColor = System.Drawing.Color.White;
-            this.lblApprovalCount.Location = new System.Drawing.Point(205, 3);
-            this.lblApprovalCount.Name = "lblApprovalCount";
-            this.lblApprovalCount.Size = new System.Drawing.Size(50, 24);
-            this.lblApprovalCount.TabIndex = 1;
-            this.lblApprovalCount.Text = "4/5";
-            this.lblApprovalCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // btnPetition
-            // 
-            this.btnPetition.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnPetition.BackColor = System.Drawing.Color.White;
-            this.btnPetition.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnPetition.ForeColor = System.Drawing.Color.Red;
-            this.btnPetition.Location = new System.Drawing.Point(3, 3);
-            this.btnPetition.Name = "btnPetition";
-            this.btnPetition.Size = new System.Drawing.Size(100, 24);
-            this.btnPetition.TabIndex = 12;
-            this.btnPetition.Text = "æœªç”³è«‹";
-            this.btnPetition.UseVisualStyleBackColor = false;
-            this.btnPetition.Click += new System.EventHandler(this.btnPetition_Click);
-            // 
-            // btnApproval
-            // 
-            this.btnApproval.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnApproval.BackColor = System.Drawing.Color.White;
-            this.btnApproval.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.btnApproval.ForeColor = System.Drawing.Color.Red;
-            this.btnApproval.Location = new System.Drawing.Point(104, 3);
-            this.btnApproval.Name = "btnApproval";
-            this.btnApproval.Size = new System.Drawing.Size(100, 24);
-            this.btnApproval.TabIndex = 12;
-            this.btnApproval.Text = "æœªæ‰¿èª�";
-            this.btnApproval.UseVisualStyleBackColor = false;
-            this.btnApproval.Click += new System.EventHandler(this.btnApproval_Click);
-            // 
             // label18
             // 
             this.label18.BackColor = System.Drawing.Color.SandyBrown;
@@ -539,57 +590,6 @@
             this.label18.Text = "ç�€ å·¥ æ—¥";
             this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // pnlApprovalButton
-            // 
-            this.pnlApprovalButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlApprovalButton.AutoSize = true;
-            this.pnlApprovalButton.BackColor = System.Drawing.Color.White;
-            this.pnlApprovalButton.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.pnlApprovalButton.Controls.Add(this.btnOnApproval);
-            this.pnlApprovalButton.Controls.Add(this.btnNotApproval);
-            this.pnlApprovalButton.Controls.Add(this.btnOnHold);
-            this.pnlApprovalButton.Location = new System.Drawing.Point(1057, 0);
-            this.pnlApprovalButton.Name = "pnlApprovalButton";
-            this.pnlApprovalButton.Size = new System.Drawing.Size(262, 34);
-            this.pnlApprovalButton.TabIndex = 49;
-            this.pnlApprovalButton.Visible = false;
-            // 
-            // btnOnApproval
-            // 
-            this.btnOnApproval.BackColor = System.Drawing.Color.MediumSpringGreen;
-            this.btnOnApproval.Location = new System.Drawing.Point(5, 3);
-            this.btnOnApproval.Name = "btnOnApproval";
-            this.btnOnApproval.Size = new System.Drawing.Size(83, 24);
-            this.btnOnApproval.TabIndex = 34;
-            this.btnOnApproval.TabStop = false;
-            this.btnOnApproval.Text = "æ‰¿èª�";
-            this.btnOnApproval.UseVisualStyleBackColor = false;
-            this.btnOnApproval.Click += new System.EventHandler(this.btnOnApproval_Click);
-            // 
-            // btnNotApproval
-            // 
-            this.btnNotApproval.BackColor = System.Drawing.Color.Red;
-            this.btnNotApproval.Location = new System.Drawing.Point(171, 3);
-            this.btnNotApproval.Name = "btnNotApproval";
-            this.btnNotApproval.Size = new System.Drawing.Size(83, 24);
-            this.btnNotApproval.TabIndex = 35;
-            this.btnNotApproval.TabStop = false;
-            this.btnNotApproval.Text = "ä¸�æ‰¿èª�";
-            this.btnNotApproval.UseVisualStyleBackColor = false;
-            this.btnNotApproval.Click += new System.EventHandler(this.btnNotApproval_Click);
-            // 
-            // btnOnHold
-            // 
-            this.btnOnHold.BackColor = System.Drawing.Color.Yellow;
-            this.btnOnHold.Location = new System.Drawing.Point(88, 3);
-            this.btnOnHold.Name = "btnOnHold";
-            this.btnOnHold.Size = new System.Drawing.Size(83, 24);
-            this.btnOnHold.TabIndex = 36;
-            this.btnOnHold.TabStop = false;
-            this.btnOnHold.Text = "ä¿�ç•™";
-            this.btnOnHold.UseVisualStyleBackColor = false;
-            this.btnOnHold.Click += new System.EventHandler(this.btnOnHold_Click);
-            // 
             // label17
             // 
             this.label17.BackColor = System.Drawing.Color.White;
@@ -827,6 +827,61 @@
             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);
+            // 
+            // btnChangeExpenses
+            // 
+            this.btnChangeExpenses.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.btnChangeExpenses.BackColor = System.Drawing.Color.Gold;
+            this.btnChangeExpenses.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold);
+            this.btnChangeExpenses.Location = new System.Drawing.Point(223, 656);
+            this.btnChangeExpenses.Name = "btnChangeExpenses";
+            this.btnChangeExpenses.Size = new System.Drawing.Size(130, 30);
+            this.btnChangeExpenses.TabIndex = 103;
+            this.btnChangeExpenses.Text = "çµŒè²»å¤‰æ›´";
+            this.btnChangeExpenses.UseVisualStyleBackColor = false;
+            this.btnChangeExpenses.Visible = false;
+            this.btnChangeExpenses.Click += new System.EventHandler(this.btnChangeExpenses_Click);
+            // 
             // dgvAllDisplay
             // 
             this.dgvAllDisplay.AllowUserToAddRows = false;
@@ -836,7 +891,7 @@
             this.dgvAllDisplay.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.White;
             this.dgvAllDisplay.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
@@ -878,6 +933,7 @@
             this.dgvAllDisplay.TabIndex = 1;
             this.dgvAllDisplay.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvAllDisplay_CellDoubleClick);
             this.dgvAllDisplay.CellEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvAllDisplay_CellEnter);
+            this.dgvAllDisplay.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.dgvAllDisplay_CellPainting);
             this.dgvAllDisplay.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvAllDisplay_CellValueChanged);
             this.dgvAllDisplay.SelectionChanged += new System.EventHandler(this.dgvAllDisplay_SelectionChanged);
             this.dgvAllDisplay.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dgvAllDisplay_KeyDown);
@@ -1087,61 +1143,6 @@
             this.Column17.Visible = false;
             this.Column17.Width = 5;
             // 
-            // 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);
-            // 
-            // btnChangeExpenses
-            // 
-            this.btnChangeExpenses.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnChangeExpenses.BackColor = System.Drawing.Color.Gold;
-            this.btnChangeExpenses.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9.75F, System.Drawing.FontStyle.Bold);
-            this.btnChangeExpenses.Location = new System.Drawing.Point(223, 656);
-            this.btnChangeExpenses.Name = "btnChangeExpenses";
-            this.btnChangeExpenses.Size = new System.Drawing.Size(130, 30);
-            this.btnChangeExpenses.TabIndex = 103;
-            this.btnChangeExpenses.Text = "çµŒè²»å¤‰æ›´";
-            this.btnChangeExpenses.UseVisualStyleBackColor = false;
-            this.btnChangeExpenses.Visible = false;
-            this.btnChangeExpenses.Click += new System.EventHandler(this.btnChangeExpenses_Click);
-            // 
             // FrmConstructionBudget
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -1175,12 +1176,12 @@
             this.SizeChanged += new System.EventHandler(this.FrmConstructionBudget_SizeChanged);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
+            this.pnlApproval.ResumeLayout(false);
+            this.pnlApprovalButton.ResumeLayout(false);
             this.pnlGroup2.ResumeLayout(false);
             this.pnlGroup2.PerformLayout();
             this.pnlGroup1.ResumeLayout(false);
             this.pnlGroup1.PerformLayout();
-            this.pnlApproval.ResumeLayout(false);
-            this.pnlApprovalButton.ResumeLayout(false);
             this.panel2.ResumeLayout(false);
             this.panel2.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvAllDisplay)).EndInit();
@@ -1242,6 +1243,14 @@
         private System.Windows.Forms.RadioButton radioButton1;
         private System.Windows.Forms.RadioButton radioButton5;
         private System.Windows.Forms.RadioButton radioButton4;
+        private System.Windows.Forms.Label label9;
+        private System.Windows.Forms.TextBox textBox2;
+        private System.Windows.Forms.RadioButton radioButton6;
+        private System.Windows.Forms.Panel pnlGroup1;
+        private System.Windows.Forms.Panel pnlGroup2;
+        private System.Windows.Forms.Label lblLabel06;
+        private System.Windows.Forms.Label label23;
+        private System.Windows.Forms.Button btnChangeExpenses;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
@@ -1261,13 +1270,5 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column13;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column16;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column17;
-        private System.Windows.Forms.Label label9;
-        private System.Windows.Forms.TextBox textBox2;
-        private System.Windows.Forms.RadioButton radioButton6;
-        private System.Windows.Forms.Panel pnlGroup1;
-        private System.Windows.Forms.Panel pnlGroup2;
-        private System.Windows.Forms.Label lblLabel06;
-        private System.Windows.Forms.Label label23;
-        private System.Windows.Forms.Button btnChangeExpenses;
     }
 }
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudgetAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudgetAuxiliary.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudgetAuxiliary.cs	(revision 319)
@@ -27,16 +27,17 @@
         {
             try
             {
+                DataGridView dgv = dgvAllDisplay;
                 // åˆ�æœŸã‚µã‚¤ã‚ºä¿�æŒ�
                 m_FormWidthSize = this.Width;
-                m_GridWidthSize = dgvAllDisplay.Width;
+                m_GridWidthSize = dgv.Width;
                 m_WindowWidth = this.Width;
                 m_WindowHeight = this.Height;
 
                 // ã‚°ãƒªãƒƒãƒ‰ã‚«ãƒ©ãƒ å¹…å�–å¾—
-                int ColCount = dgvAllDisplay.ColumnCount;
+                int ColCount = dgv.ColumnCount;
                 m_CellSize = new int[ColCount];
-                foreach (DataGridViewColumn wrkCell in dgvAllDisplay.Columns)
+                foreach (DataGridViewColumn wrkCell in dgv.Columns)
                 {
                     m_CellSize[wrkCell.Index] = wrkCell.Width;
                 }
@@ -697,6 +698,12 @@
 
                 // è¡¨ç¤ºã�—ã�Ÿè¡Œã‚’æ›¸è¾¼ã�¿ç¦�æ­¢ã�«ã�™ã‚‹
                 dgv.Rows[rowcnt].ReadOnly = true;
+
+                // è‡ªç¤¾æ–½å·¥ã�¯ã‚¿ã‚¤ãƒˆãƒ«è¡Œã‚«ã‚¹ã‚¿ãƒžã‚¤ã‚º
+                if (TitleNo == (int)FrmConstructionBudget.DataGroup.MyConstruction)
+                {
+                    SetCustomTitle(dgv.Rows[rowcnt]);
+                }
             }
             catch (System.Exception ex)
             {
@@ -705,6 +712,112 @@
         }
         #endregion
 
+        #region ã‚¿ã‚¤ãƒˆãƒ«è¡Œã‚«ã‚¹ã‚¿ãƒžã‚¤ã‚º
+        /// <summary>
+        /// ã‚¿ã‚¤ãƒˆãƒ«è¡Œã‚«ã‚¹ã‚¿ãƒžã‚¤ã‚º
+        /// </summary>
+        /// <param name="CustomRow"></param>
+        private void SetCustomTitle(DataGridViewRow CustomRow)
+        {
+            try
+            {
+                // è‡ªç¤¾æ–½å·¥ã�®æ™‚ã�¯ã‚¿ã‚¤ãƒˆãƒ«ã‚’ã‚«ã‚¹ã‚¿ãƒžã‚¤ã‚ºã�™ã‚‹
+                CustomRow.Cells[(int)GridColumn.TextName].Value = "â€»ä»®è¨­è²»ã�¯å·¥äº‹å�—æ³¨é‡‘é¡�ã�®ï¼•ï¼…ç¨‹åº¦ã�Œç›®å®‰ã�§ã�™";
+                CustomRow.Cells[(int)GridColumn.TextName].Style.ForeColor = Color.Red;
+
+                int nParcent = 4;
+                int nOrderValue = CommonMotions.cnvInt(label6.Text);
+                double nDispValue = 0;
+                for (int ix = (int)GridColumn.EstimatePrice; ix < (int)GridColumn.Percent; ix++)
+                {
+                    switch (ix)
+                    {
+                        case (int)GridColumn.EstimatePrice:          // ç©�ç®—æ™‚è¦‹ç©�é‡‘é¡�
+                            nDispValue = nOrderValue * (nParcent / 100.0);
+                            break;
+                        case (int)GridColumn.NegotiationPrice:       // ç©�ç®—æ™‚äº¤æ¸‰é‡‘é¡�
+                        case (int)GridColumn.HopePrice:              // ç™ºæ³¨å¸Œæœ›é‡‘é¡�
+                        case (int)GridColumn.ExecPrice:              // å®Ÿè¡Œé‡‘é¡�
+                            nParcent++;
+                            nDispValue = nOrderValue * (nParcent / 100.0);
+                            break;
+                        case (int)GridColumn.Negotiation:            // äº¤æ¸‰ãƒ•ãƒ©ã‚°
+                            break;
+                    }
+                    if ((int)GridColumn.Negotiation == ix) continue;
+
+                    CustomRow.Cells[ix].Value = string.Format("{0}%) {1}", nParcent, CommonMotions.cnvRound(nDispValue).ToString("#,0"));
+                    CustomRow.Cells[ix].Style.ForeColor = Color.Red;
+                    CustomRow.Cells[ix].Style.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+                }
+
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
+        #region ã‚»ãƒ«çµ�å�ˆæ��ç”»å‡¦ç�†
+        /// <summary>
+        /// ã‚»ãƒ«çµ�å�ˆæ��ç”»å‡¦ç�†
+        /// </summary>
+        /// <param name="e"></param>
+        private void DrawTitlePaining(DataGridViewCellPaintingEventArgs e)
+        {
+            try
+            {
+                if (e.RowIndex < 0) return;
+                int nRowCnt = e.RowIndex;
+                int nColCnt = e.ColumnIndex;
+                DataGridView dgv = dgvAllDisplay;
+                DataGridViewRow CurRow = dgv.Rows[nRowCnt];
+
+                // è‡ªç¤¾æ–½å·¥ã‚¿ã‚¤ãƒˆãƒ«ä»¥å¤–ã�¯å‡¦ç�†ã�—ã�ªã�„
+                int GroupNo = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value);
+                if (GroupNo != (int)FrmConstructionBudget.DataGroup.MyConstruction) return;
+                if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.TitleFlg].Value) != 1) return;
+
+                // ç©�ç®—æ™‚è¦‹ç©�é‡‘é¡�ï½žæ§‹æˆ�æ¯”çŽ‡ã‚’çµ�å�ˆ
+                bool bDraw = true;
+                switch (nColCnt)
+                {
+                    case (int)GridColumn.TextName:               // å·¥äº‹å†…å®¹å��ç§°
+                        e.AdvancedBorderStyle.Left = DataGridViewAdvancedCellBorderStyle.Single;
+
+
+                        Rectangle rect = e.CellBounds;
+                        rect.Width += dgv.Columns[(int)GridColumn.CompanyName].Width;
+
+                        rect.X--;
+                        rect.Y--;
+                        e.Graphics.FillRectangle(new SolidBrush(e.CellStyle.BackColor), rect);
+                        e.Graphics.DrawRectangle(new Pen(dgv.GridColor), rect);
+                        TextRenderer.DrawText(e.Graphics,
+                                                e.FormattedValue.ToString(),
+                                                e.CellStyle.Font, rect, e.CellStyle.ForeColor,
+                                                TextFormatFlags.HorizontalCenter | TextFormatFlags.Bottom);
+                        break;
+                    case (int)GridColumn.CompanyType:            // å�”åŠ›æ¥­è€…ã‚³ãƒ¼ãƒ‰ã‚¿ã‚¤ãƒ—
+                    case (int)GridColumn.CompanyCode:            // å�”åŠ›æ¥­è€…ã‚³ãƒ¼ãƒ‰
+                        break;
+                    case (int)GridColumn.CompanyName:            // å�”åŠ›æ¥­è€…å��ç§°
+                        e.AdvancedBorderStyle.Left = DataGridViewAdvancedCellBorderStyle.None;
+                        break;
+                    default:
+                        bDraw = false;
+                        break;
+                }
+                if (bDraw) e.Handled = true;
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+
         #region è¡Œã�®å…¥åŠ›ãƒ­ãƒƒã‚¯
         /// <summary>
         /// è¡Œã�®ãƒ­ãƒƒã‚¯ã‚’åˆ¶å¾¡ã�™ã‚‹
@@ -1823,8 +1936,6 @@
                     CreateDataRow(RowData);
                     icnt++;
                 }
-                // ç©ºç™½è¡Œ
-                AddEmptyRow();
 
                 return true;
             }
@@ -1836,6 +1947,9 @@
             finally
             {
                 DetailDB.close(); DetailDB = null;
+
+                // ç©ºç™½è¡Œ
+                AddEmptyRow();
             }
         }
         #endregion
@@ -1888,9 +2002,6 @@
                     icnt++;
                 }
 
-                // ç©ºç™½è¡Œ
-                AddEmptyRow();
-
                 return true;
             }
             catch (Exception ex)
@@ -1901,6 +2012,9 @@
             finally
             {
                 DetailDB.close(); DetailDB = null;
+
+                // ç©ºç™½è¡Œ
+                AddEmptyRow();
             }
         }
         #endregion
@@ -1982,9 +2096,6 @@
                     icnt++;
                 }
 
-                // ç©ºç™½è¡Œ
-                AddEmptyRow();
-
                 return true;
             }
             catch (Exception ex)
@@ -1995,6 +2106,9 @@
             finally
             {
                 DetailDB.close(); DetailDB = null;
+
+                // ç©ºç™½è¡Œ
+                AddEmptyRow();
             }
         }
         #endregion
@@ -2093,8 +2207,6 @@
                     // è¡Œè¡¨ç¤º
                     SetOutSourceCosts_Estimate_Row(icnt, ComponentName, ItemName, BreakCode, CompanyName, dSumaryWork);
                 }
-                // ç©ºç™½è¡Œã�«ã�™ã‚‹
-                AddEmptyRow();
 
                 return true;
             }
@@ -2106,6 +2218,9 @@
             finally
             {
                 DetailDB.close(); DetailDB = null;
+
+                // ç©ºç™½è¡Œã�«ã�™ã‚‹
+                AddEmptyRow();
             }
         }
         #endregion
@@ -2209,9 +2324,6 @@
                     icnt++;
                 }
 
-                // ç©ºç™½è¡Œ
-                AddEmptyRow();
-
                 return true;
             }
             catch (Exception ex)
@@ -2222,6 +2334,9 @@
             finally
             {
                 DetailDB.close(); DetailDB = null;
+
+                // ç©ºç™½è¡Œ
+                AddEmptyRow();
             }
         }
         #endregion
@@ -2283,9 +2398,6 @@
                     icnt++;
                 }
 
-                // ç©ºç™½è¡Œ
-                AddEmptyRow();
-
                 return true;
             }
             catch (Exception ex)
@@ -2296,6 +2408,9 @@
             finally
             {
                 DetailDB.close(); DetailDB = null;
+
+                // ç©ºç™½è¡Œ
+                AddEmptyRow();
             }
         }
         #endregion
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.designer.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.designer.cs	(revision 319)
@@ -788,7 +788,7 @@
             this.dgvAllDisplay.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.White;
             this.dgvAllDisplay.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs	(revision 319)
@@ -2572,9 +2572,6 @@
                         TotalValue += (int)ExcRec.PaymentAmount;
                         break;
                     }
-                    //int i = ExcRec.ColumnCount;
-                    //RowData[i] = ExcRec.PaymentAmount.ToString("#,0");
-                    //TotalValue += (int)ExcRec.PaymentAmount;
                 }
 
                 // å�ˆè¨ˆæ¬„ä½�ç½®å�–å¾—
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstruction.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstruction.designer.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstruction.designer.cs	(revision 319)
@@ -765,7 +765,7 @@
             this.dataGridViewEX4.AllowUserToResizeRows = false;
             this.dataGridViewEX4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.dataGridViewEX4.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dataGridViewEX4.BackgroundColor = System.Drawing.Color.White;
             this.dataGridViewEX4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control;
@@ -883,7 +883,7 @@
             this.dataGridViewEX3.AllowUserToResizeRows = false;
             this.dataGridViewEX3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.dataGridViewEX3.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dataGridViewEX3.BackgroundColor = System.Drawing.Color.White;
             this.dataGridViewEX3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Control;
@@ -1037,7 +1037,7 @@
             this.dataGridViewEX2.AllowUserToResizeRows = false;
             this.dataGridViewEX2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.dataGridViewEX2.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dataGridViewEX2.BackgroundColor = System.Drawing.Color.White;
             this.dataGridViewEX2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Control;
@@ -1244,7 +1244,7 @@
             this.dataGridViewEX1.AllowUserToResizeRows = false;
             this.dataGridViewEX1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.dataGridViewEX1.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dataGridViewEX1.BackgroundColor = System.Drawing.Color.White;
             this.dataGridViewEX1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Control;
@@ -1483,7 +1483,7 @@
             this.dgvAllDisplay.AllowUserToResizeRows = false;
             this.dgvAllDisplay.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.White;
             this.dgvAllDisplay.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Control;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudget.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudget.designer.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudget.designer.cs	(revision 319)
@@ -31,12 +31,12 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            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 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();
             this.label1 = new System.Windows.Forms.Label();
             this.btnDataDelete = new System.Windows.Forms.Button();
             this.btnDataEntry = new System.Windows.Forms.Button();
@@ -583,16 +583,16 @@
             this.dgvAllDisplay.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.White;
             this.dgvAllDisplay.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle7.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvAllDisplay.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, 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.dgvAllDisplay.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
             this.dgvAllDisplay.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvAllDisplay.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.Column1,
@@ -626,8 +626,8 @@
             // 
             // Column1
             // 
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column1.DefaultCellStyle = dataGridViewCellStyle8;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column1.DefaultCellStyle = dataGridViewCellStyle2;
             this.Column1.Frozen = true;
             this.Column1.HeaderText = "â„–";
             this.Column1.Name = "Column1";
@@ -683,8 +683,8 @@
             // 
             // Column5
             // 
-            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.Column5.DefaultCellStyle = dataGridViewCellStyle9;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.Column5.DefaultCellStyle = dataGridViewCellStyle3;
             this.Column5.Frozen = true;
             this.Column5.HeaderText = "é …ã€€ã€€ç›®ãƒ»å�”åŠ›ä¼šç¤¾";
             this.Column5.Name = "Column5";
@@ -694,8 +694,8 @@
             // 
             // Column6
             // 
-            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.Column6.DefaultCellStyle = dataGridViewCellStyle10;
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.Column6.DefaultCellStyle = dataGridViewCellStyle4;
             this.Column6.Frozen = true;
             this.Column6.HeaderText = "å†…ã€€ã€€ã€€ã€€ã€€å®¹";
             this.Column6.Name = "Column6";
@@ -705,9 +705,9 @@
             // 
             // Column7
             // 
-            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle11.NullValue = null;
-            this.Column7.DefaultCellStyle = dataGridViewCellStyle11;
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle5.NullValue = null;
+            this.Column7.DefaultCellStyle = dataGridViewCellStyle5;
             this.Column7.HeaderText = "è¦‹ç©�æ™‚é‡‘é¡�";
             this.Column7.Name = "Column7";
             this.Column7.ReadOnly = true;
@@ -717,8 +717,8 @@
             // 
             // Column8
             // 
-            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.Column8.DefaultCellStyle = dataGridViewCellStyle12;
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.Column8.DefaultCellStyle = dataGridViewCellStyle6;
             this.Column8.HeaderText = "äº¤æ¸‰æ™‚é‡‘é¡�";
             this.Column8.Name = "Column8";
             this.Column8.Resizable = System.Windows.Forms.DataGridViewTriState.False;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudget.resx
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudget.resx	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudget.resx	(revision 319)
@@ -123,9 +123,6 @@
   <metadata name="lblCellTotal.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="lblCellTotal.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="Column14.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInput.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInput.designer.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInput.designer.cs	(revision 319)
@@ -779,7 +779,7 @@
             this.dgvEntryData.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.dgvEntryData.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvEntryData.BackgroundColor = System.Drawing.Color.White;
             this.dgvEntryData.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.ControlDark;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInputAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInputAuxiliary.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInputAuxiliary.cs	(revision 319)
@@ -197,7 +197,7 @@
                 newpage.EntryDGV.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
                 | System.Windows.Forms.AnchorStyles.Left)
                 | System.Windows.Forms.AnchorStyles.Right)));
-                newpage.EntryDGV.BackgroundColor = Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+                newpage.EntryDGV.BackgroundColor = Color.White;
                 newpage.EntryDGV.BorderStyle = BorderStyle.Fixed3D;
                 newpage.EntryCellStyle[0].Alignment = DataGridViewContentAlignment.MiddleCenter;
                 newpage.EntryCellStyle[0].BackColor = SystemColors.Control;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Proceedings/FrmProceedings.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Proceedings/FrmProceedings.designer.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Proceedings/FrmProceedings.designer.cs	(revision 319)
@@ -682,7 +682,7 @@
             this.dgvPerson.AllowUserToResizeColumns = false;
             this.dgvPerson.AllowUserToResizeRows = false;
             this.dgvPerson.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.dgvPerson.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvPerson.BackgroundColor = System.Drawing.Color.White;
             this.dgvPerson.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
@@ -828,7 +828,7 @@
             this.dgvAllDisplay.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.White;
             this.dgvAllDisplay.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/CreateNewTabPage.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/CreateNewTabPage.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/CreateNewTabPage.cs	(revision 319)
@@ -183,7 +183,7 @@
                 NewPage.Group4DataGridView.AllowUserToDeleteRows = false;
                 NewPage.Group4DataGridView.AllowUserToResizeColumns = false;
                 NewPage.Group4DataGridView.AllowUserToResizeRows = false;
-                NewPage.Group4DataGridView.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+                NewPage.Group4DataGridView.BackgroundColor = System.Drawing.Color.White;
                 NewPage.Group4DataGridView.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
                 NewPage.Group4DataGridView.ColumnHeadersDefaultCellStyle = NewPage.Group4CellDefaultStyle;
                 NewPage.Group4DataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
@@ -898,7 +898,7 @@
                 wrkGrid.AllowUserToDeleteRows = false;
                 wrkGrid.AllowUserToResizeColumns = false;
                 wrkGrid.AllowUserToResizeRows = false;
-                wrkGrid.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+                wrkGrid.BackgroundColor = System.Drawing.Color.White;
                 wrkGrid.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
                 wrkGrid.ColumnHeadersDefaultCellStyle = NewPage.Group1CellDefaultStyle;
                 wrkGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs	(revision 319)
@@ -944,7 +944,14 @@
         {
             if (m_initDataLoad) return;
 
-            DispShowView();
+            if (!DispShowView())
+            {
+                // •Ï�X‹‘”Û‚Í�ó‘Ô‚ðŠî‚É–ß‚·
+                rdbCompany.CheckedChanged -= new System.EventHandler(this.rdbCompany_CheckedChanged);
+                if (rdbCompany.Checked) rdbCompany.Checked = false;
+                else rdbCompany.Checked = true;
+                rdbCompany.CheckedChanged += new System.EventHandler(this.rdbCompany_CheckedChanged);
+            }
         }
         #endregion
 
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs	(revision 319)
@@ -64,24 +64,34 @@
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void DispShowView()
+        private bool DispShowView()
         {
-            if (m_bChengeAns == true)
+            try
             {
-                if (MessageBox.Show("ƒf�[ƒ^‚É•Ï�X‚ª‚ ‚è‚Ü‚·�A“o˜^‚¹‚¸‚É‘Î�Û‚ð•Ï�X‚µ‚Ä‚æ‚ë‚µ‚¢‚Å‚·‚©�H�B", "Šm”F"
-                    , MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.No)
+                if (m_bChengeAns == true)
                 {
-                    return;
+                    if (MessageBox.Show("ƒf�[ƒ^‚É•Ï�X‚ª‚ ‚è‚Ü‚·�A“o˜^‚¹‚¸‚É‘Î�Û‚ð•Ï�X‚µ‚Ä‚æ‚ë‚µ‚¢‚Å‚·‚©�H�B", "Šm”F"
+                        , MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.No)
+                    {
+                        return false;
+                    }
                 }
-            }
 
-            showView();
-            SetColumnID();
-            controlButton();
+                showView();
+                SetColumnID();
+                controlButton();
 
-            // •\Ž¦
-            InitDataLoad();
-            DispGridData();
+                // •\Ž¦
+                InitDataLoad();
+                DispGridData();
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
         }
         #endregion
 
@@ -1175,6 +1185,7 @@
             FrmConstructionLedger frm2 = new FrmConstructionLedger();
             DataGridView dgv = getShowingView();
             DataGridViewRow CurRow = dgv.CurrentRow;
+            IOConstructionBaseInfo IoCbi = new IOConstructionBaseInfo();
             try
             {
                 // �³”F�Ï‚Ý‚Í�ˆ—�‚µ‚È‚¢
@@ -1218,22 +1229,30 @@
 
                 int[] nRowCol = new int[2];
                 Array.Clear(nRowCol, 0, nRowCol.Length);
+                int nNewMakeRowIndex = -1;
+                if (nConstrCode > 0 && selRec.CompanyCode > 0)
+                {
+                    // ‹ÆŽÒ�E�HŽ–‚ª�Ý’è�Ï‚Ý‚Í‘ä’ ‚æ‚è�s‚ð‘I‘ð
+                    if (!DispSelectLedger(selRec.CompanyCode, nConstrCode, frm2, ref nRowCol)) return;
+                }
+
                 if (rdbCompany.Checked)
                 {
                     // ----- ‹ÆŽÒ
-                    InsdgvCompany2Company(selRec, nRowCol);
+                    InsdgvCompany2Company(selRec, nRowCol, ref nNewMakeRowIndex);
                 }
                 else
                 {
-                    // ‹ÆŽÒ•s–¾ˆÈŠO‚Í‘ä’ •\Ž¦
-                    if (selRec.CompanyCode > 0)
-                    {
-                        // ‘ä’ ‚æ‚è�s‚ð‘I‘ð
-                        DispSelectLedger(selRec.CompanyCode, nConstrCode, frm2, ref nRowCol);
-                    }
                     // ----- Œ»�ê
-                    InsdgvProject2Project(selRec, nRowCol);
+                    InsdgvProject2Project(selRec, nRowCol, ref nNewMakeRowIndex);
                 }
+
+                if (nConstrCode > 0 && selRec.CompanyCode > 0)
+                {   // ----- •s–¾Žž‚Í�ˆ—�‚µ‚È‚¢
+                    // ’�•¶�‘—X‘—�E’�•¶�‘•Ô‘—�E—\ŽZ�‘‚Ì’lŽæ“¾
+                    SetMaruBatsuKigou(dgv, IoCbi, frm.ConstructionCode, nNewMakeRowIndex);
+                }
+                m_bChengeAns = true;
             }
             catch (System.Exception ex)
             {
@@ -1243,6 +1262,7 @@
             {
                 frm.Dispose(); frm = null;
                 frm2.Dispose(); frm2 = null;
+                IoCbi.close(); IoCbi = null;
             }
         }
         #endregion
@@ -1252,23 +1272,40 @@
         /// ‹ÆŽÒƒOƒŠƒbƒh‹ÆŽÒ’Ç‰Á�ˆ—�
         /// </summary>
         /// <param name="selRec"></param>
-        private void InsdgvCompany2Company(SubContractorMaster selRec, int[] nRowCol)
+        private void InsdgvCompany2Company(SubContractorMaster selRec, int[] nRowCol, ref int nNewMakeRowIndex)
         {
             DataGridView dgv = getShowingView();
-            int No = 0;
+            DataGridViewRow CurRow = dgv.CurrentRow;
+            int MakeIndex = -1;
             try
             {
+                // •s–¾�s‚Å‹ÆŽÒ‘I‘ðŽž
+                int nRowCompCode = CommonMotions.cnvInt(CurRow.Cells[m_Company_Column].Value);
+                string strRowCompName = CommonMotions.cnvString(CurRow.Cells[m_CompanyNM_Column].Value);
+                if (nRowCompCode == 0 && strRowCompName.Equals(s_UnknownString) && selRec.CompanyCode != 0)
+                {
+                    CurRow.Cells[m_Company_DispColumn].Value = selRec.CompanyCode;
+                    CurRow.Cells[m_CompanyNM_Column].Value = selRec.CompanyName;
+                    CurRow.Cells[(int)DispColumn.CompanyDispOrder].Value = selRec.DisplayOrder;
+                    if (cnvRowState(CurRow.Cells[(int)DispColumn.RowState].Value) == DataRowState.Unchanged)
+                        CurRow.Cells[(int)DispColumn.RowState].Value = DataRowState.Modified;
+
+                    ResetNo();
+                    m_bChengeAns = true;
+                    return;
+                }
+
                 // ƒ_ƒCƒAƒ�ƒO‚Å‘I‘ð‚³‚ê‚½‹ÆŽÒ‚ªŠù‚É‚ ‚ê‚ÎŽæ“¾‚·‚é
-                DataGridViewRow[] rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == selRec.CompanyCode
+                DataGridViewRow[] rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_DispColumn].Value) == selRec.CompanyCode
                                                                                 && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == (int)RowVisibleDef.Visible
+                                                                                && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                                                 && cnvRowState(x.Cells[(int)DispColumn.RowState].Value) != DataRowState.Deleted)
                                                                             .ToArray();
-                bool bInsertRow = true;
-                if (rows.Count() > 1) bInsertRow = false;
 
                 // No’l
                 string cell = dgv.Rows.Cast<DataGridViewRow>().Where(x => cnvRowState(x.Cells[(int)DispColumn.RowState].Value) != DataRowState.Deleted)
                                                               .Max(y => (string)y.Cells[(int)DispColumn.No].Value.ToString());
+                int No = 0;
                 if (cell == null)
                 {
                     No = 1;
@@ -1278,21 +1315,14 @@
                     No = CommonMotions.cnvInt(cell) + 1;
                 }
 
-                int MakeIndex = -1;
                 MakeIndex = SearchRowIndexCompany(selRec.CompanyCode, true);
 
-                // Šù‚É•\Ž¦‚³‚ê‚Ä‚¢‚é‹ÆŽÒ‚Í�A�¬Œv�s‚Ì�ã‚É•s–¾‚ð’Ç‰Á‚·‚é
-                if (!bInsertRow)
-                {
-                    MakeIndex -= (int)RowsTypeDef.�‡Œv;
-                }
-
                 // ƒf�[ƒ^“ü—Í�s
                 MakeNewRow(selRec.CompanyCode, selRec.CompanyName, 0, No, nRowCol, ref MakeIndex, -1, MakeIndex, string.Empty);
                 dgv.Rows[MakeIndex].Cells[(int)DispColumn.CompanyDispOrder].Value = selRec.DisplayOrder;
                 dgv.Rows[MakeIndex].Cells[(int)DispColumn.RowState].Value = DataRowState.Added;
 
-                if (bInsertRow)
+                if (rows.Count() < 1)
                 {
                     MakeIndex++;
                     // �‡Œv�s’Ç‰Á
@@ -1307,6 +1337,10 @@
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
             }
+            finally
+            {
+                nNewMakeRowIndex = MakeIndex;
+            }
         }
         #endregion
 
@@ -1315,7 +1349,7 @@
         /// Œ»�êƒOƒŠƒbƒh‹ÆŽÒ’Ç‰Á�ˆ—�
         /// </summary>
         /// <param name="selRec"></param>
-        private void InsdgvProject2Project(SubContractorMaster selRec, int[] nRowCol)
+        private void InsdgvProject2Project(SubContractorMaster selRec, int[] nRowCol, ref int nNewMakeRowIndex)
         {
             DataGridView dgv = getShowingView();
             DataGridViewRow CurRow = dgv.CurrentRow;
@@ -1323,6 +1357,24 @@
             int MakeIndex = -1;
             try
             {
+                int nRowCompCode = CommonMotions.cnvInt(CurRow.Cells[m_Company_Column].Value);
+                string strRowCompName = CommonMotions.cnvString(CurRow.Cells[m_CompanyNM_Column].Value);
+                // ----- •s–¾�s‚Å‚Ì‘I‘ð
+                if (nRowCompCode == 0 && strRowCompName.Equals(s_UnknownString) && selRec.CompanyCode != 0)
+                {
+                    // •s–¾�s‚Å‹ÆŽÒ‚ð‘I‘ð‚µ‚½�ê�‡‚ÍƒZƒbƒg‚·‚é
+                    CurRow.Cells[m_Company_DispColumn].Value = selRec.CompanyCode;
+                    CurRow.Cells[m_CompanyNM_Column].Value = selRec.CompanyName;
+                    if (cnvRowState(CurRow.Cells[(int)DispColumn.RowState].Value) == DataRowState.Unchanged)
+                    {
+                        CurRow.Cells[(int)DispColumn.RowState].Value = DataRowState.Modified;
+                    }
+                    ResetNo();
+
+                    m_bChengeAns = true;
+                    return;
+                }
+
                 // �HŽ–ƒR�[ƒhŽæ“¾
                 int nConstrCode = CommonMotions.cnvInt(CurRow.Cells[m_Genba_Column].Value);
                 if (nConstrCode < 1) return;
@@ -1349,56 +1401,41 @@
 
                 // ‘I‘ð‹ÆŽÒ‚ª“¯ˆê�HŽ–“à‚É‚ ‚é‚©‚ð”»’è‚·‚é
                 DataGridViewRow[] SelRows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Genba_Column].Value) == nConstrCode
-                                                                                && CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == selRec.CompanyCode
+                                                                                && CommonMotions.cnvInt(x.Cells[m_Company_DispColumn].Value) == selRec.CompanyCode
                                                                                 && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == (int)RowVisibleDef.Visible
                                                                                 && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×)
-                                                                            .OrderBy(y => CommonMotions.cnvInt(y.Cells[m_Company_Column].Value))
+                                                                            .OrderBy(y => CommonMotions.cnvInt(y.Cells[m_Company_DispColumn].Value))
                                                                             .ToArray();
 
-                bool bLastAdd = true;
-                if (SelRows.Count() > 0) bLastAdd = false;
-
-                if (s_UnknownString.Equals(CommonMotions.cnvString(CurRow.Cells[m_CompanyNM_Column].Value)))
+                // ----- ’Ê�í�s‚Å‚Ì‘I‘ð
+                if (SelRows.Count() < 1)
                 {
-                    // ----- •s–¾�s‚Å‚Ì‘I‘ð
-                    if (selRec.CompanyCode > 0)
-                    {
-                        // •s–¾�s‚Å‹ÆŽÒ‚ð‘I‘ð‚µ‚½�ê�‡‚ÍƒZƒbƒg‚·‚é
-                        MakeIndex = CurRow.Index;
-                        CurRow.Cells[m_Company_DispColumn].Value = selRec.CompanyCode;
-                        CurRow.Cells[m_CompanyNM_Column].Value = selRec.CompanyName;
-                        if (cnvRowState(CurRow.Cells[(int)DispColumn.RowState].Value) == DataRowState.Unchanged)
-                            CurRow.Cells[(int)DispColumn.RowState].Value = DataRowState.Modified;
-                    }
+                    // ----- �¬Œv�s‚Ì�ã‚É’Ç‰Á‚·‚é
+                    MakeIndex = SearchRowIndexProject(nConstrCode, true) + 1;
                 }
                 else
                 {
-                    // ----- ’Ê�í�s‚Å‚Ì‘I‘ð
-                    if (bLastAdd)
-                    {
-                        // ----- �¬Œv�s‚Ì�ã‚É’Ç‰Á‚·‚é
-                        MakeIndex = SearchRowIndexProject(nConstrCode, true) + 1;
-                    }
-                    else
-                    {
-                        // ----- ‘¶�Ý‹ÆŽÒ‚Ì�ÅŒã‚É’Ç‰Á‚·‚é
-                        int DataCnt = SelRows.Count();
-                        MakeIndex = SelRows[DataCnt].Index - 1;
-                    }
-                    // ƒf�[ƒ^�s�ì�¬
-                    MakeNewRow(selRec.CompanyCode, selRec.CompanyName, nConstrCode, iNo, nRowCol, ref MakeIndex, -1, MakeIndex, strConstrName);
-                    dgv.Rows[MakeIndex].Cells[(int)DispColumn.CompanyDispOrder].Value = selRec.DisplayOrder;
-                    dgv.Rows[MakeIndex].Cells[(int)DispColumn.RowState].Value = DataRowState.Added;
+                    // ----- ‘¶�Ý‹ÆŽÒ‚Ì�ÅŒã‚É’Ç‰Á‚·‚é
+                    int DataCnt = SelRows.Count();
+                    MakeIndex = SelRows[DataCnt].Index - 1;
                 }
+                // ƒf�[ƒ^�s�ì�¬
+                MakeNewRow(selRec.CompanyCode, selRec.CompanyName, nConstrCode, iNo, nRowCol, ref MakeIndex, -1, MakeIndex, strConstrName);
+                dgv.Rows[MakeIndex].Cells[(int)DispColumn.CompanyDispOrder].Value = selRec.DisplayOrder;
+                dgv.Rows[MakeIndex].Cells[(int)DispColumn.RowState].Value = DataRowState.Added;
+
                 ResetNo();
 
                 m_bChengeAns = true;
-
             }
             catch (System.Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
             }
+            finally
+            {
+                nNewMakeRowIndex = MakeIndex;
+            }
         }
         #endregion
 
@@ -1407,29 +1444,77 @@
         /// ‹ÆŽÒƒOƒŠƒbƒh‚ÅŽw’è‚µ‚½‰ïŽÐƒR�[ƒh�‡‚ÌŽŸ‚ÌƒCƒ“ƒfƒbƒNƒX‚ðŽæ“¾‚·‚é
         /// </summary>
         /// <returns></returns>
-        private int SearchRowIndexCompany(int CompnayCode, bool bCompany)
+        private int SearchRowIndexCompany(int nCompCode, bool bCompany, int nConstrCode = 0)
         {
             try
             {
                 int Result = 0;
                 DataGridView dgv = getShowingView();
+                // ‹ÆŽÒ‚ªŠù‚É‚ ‚ê‚ÎŽæ“¾‚·‚é
+                DataGridViewRow[] rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_DispColumn].Value) == nCompCode
+                                                                                && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == (int)RowVisibleDef.Visible
+                                                                                && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
+                                                                                && cnvRowState(x.Cells[(int)DispColumn.RowState].Value) != DataRowState.Deleted)
+                                                                            .OrderBy(y => CommonMotions.cnvInt(y.Cells[(int)DispColumn.LineCount].Value))
+                                                                            .ToArray();
                 DataGridViewRow SelRow = null;
                 if (bCompany)
                 {
-                    // ‹ÆŽÒŒŸ�õ
-                    SelRow = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) > CompnayCode
-                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×)
-                                                                .FirstOrDefault();
+                    // ----- ‹ÆŽÒŒŸ�õ
+                    if (rows.Count() > 0)
+                    {
+                        SelRow = rows.Cast<DataGridViewRow>().FirstOrDefault();
+
+                        Result = SelRow == null ? -1 : SelRow.Index;
+                        Result ++;
+                    }
+                    else
+                    {
+                        SelRow = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) > nCompCode
+                                                                                && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == (int)RowVisibleDef.Visible
+                                                                                && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
+                                                                                && cnvRowState(x.Cells[(int)DispColumn.RowState].Value) != DataRowState.Deleted)
+                                                                            .OrderBy(y => CommonMotions.cnvInt(y.Cells[(int)DispColumn.LineCount].Value))
+                                                                            .FirstOrDefault();
+
+                        if (SelRow == null)
+                        {
+                            Result = dgv.RowCount;
+                        }
+                        else
+                        {
+                            Result = SelRow.Index;
+                        }
+                    }
                 }
                 else
                 {
-                    // Œ»�êŒŸ�õ
-                    SelRow = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == CompnayCode
-                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×)
-                                                                .LastOrDefault();
+                    // ----- Œ»�êŒŸ�õ
+                    if (rows.Count() > 0)
+                    {
+                        SelRow = rows.Cast<DataGridViewRow>().LastOrDefault();
+
+                        Result = SelRow == null ? -1 : SelRow.Index;
+                        Result++;
+                    }
+                    else
+                    {
+                        SelRow = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_DispColumn].Value) < nCompCode
+                                                                            && CommonMotions.cnvInt(x.Cells[m_Genba_Column].Value) == nConstrCode
+                                                                            && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×)
+                                                                        .LastOrDefault();
+
+                        if (SelRow == null)
+                        {
+                            Result = dgv.RowCount;
+                        }
+                        else
+                        {
+                            Result = SelRow.Index;
+                        }
+                    }
                 }
 
-                Result = SelRow == null ? -1 : SelRow.Index;
                 return Result;
             }
             catch (System.Exception ex)
@@ -1527,7 +1612,7 @@
                 cell = null;
                 if (iGroupSeqNo == -1)
                 {
-                    cell = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == CompanyCode
+                    cell = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_DispColumn].Value) == CompanyCode
                                                                             && cnvRowState(x.Cells[(int)DispColumn.RowState].Value) != DataRowState.Deleted)
                                                             .Max(y => (string)y.Cells[(int)DispColumn.GroupSeqNo].Value.ToString());
                     if (cell == null)
@@ -1536,7 +1621,7 @@
                     }
                     else
                     {
-                        DataGridViewRow[] RowList = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == CompanyCode
+                        DataGridViewRow[] RowList = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_DispColumn].Value) == CompanyCode
                                                                                 && cnvRowState(x.Cells[(int)DispColumn.RowState].Value) != DataRowState.Deleted
                                                                                 && CommonMotions.cnvInt(x.Cells[(int)DispColumn.GroupSeqNo].Value) == CommonMotions.cnvInt(cell))
                                                                                 .ToArray();
@@ -1553,7 +1638,7 @@
                 // �s”Ô�†
                 int lineCnt = 0;
                 // ‘Î�Û‹ÆŽÒ‚ª‘¶�Ý‚·‚é‚©‚ðƒ`ƒFƒbƒN‚·‚é
-                DataGridViewRow[] CompList = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == CompanyCode
+                DataGridViewRow[] CompList = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_DispColumn].Value) == CompanyCode
                                                                           && CommonMotions.cnvInt(x.Cells[(int)DispColumn.GroupSeqNo].Value) == iGroupSeqNo
                                                                           && cnvRowState(x.Cells[(int)DispColumn.RowState].Value) != DataRowState.Deleted)
                                                                           .ToArray();
@@ -1560,7 +1645,7 @@
 
                 if (CompList.Count() > 0)
                 {
-                    lineCnt = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == CompanyCode
+                    lineCnt = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_DispColumn].Value) == CompanyCode
                                                                               && CommonMotions.cnvInt(x.Cells[(int)DispColumn.GroupSeqNo].Value) == iGroupSeqNo
                                                                               && cnvRowState(x.Cells[(int)DispColumn.RowState].Value) != DataRowState.Deleted)
                                                                      .Max(y => CommonMotions.cnvInt(y.Cells[(int)DispColumn.LineCount].Value));
@@ -1671,45 +1756,56 @@
             {
                 DataGridViewRow CurRow = dgv.CurrentRow;
 
-                int nCompnyCode = CommonMotions.cnvInt(CurRow.Cells[m_Company_Column].Value);
+                int nCompnyCode = CommonMotions.cnvInt(CurRow.Cells[m_Company_DispColumn].Value);
                 int nConstrCode = CommonMotions.cnvInt(CurRow.Cells[m_Genba_Column].Value);
-                if (rdbCompany.Checked)
-                {   // ‹ÆŽÒ
-                    // ‹¦—Í‹ÆŽÒƒR�[ƒh‚ª–³‚¯‚ê‚Î�ˆ—�‚µ‚È‚¢
-                    if (nCompnyCode < 1) return;
-                    frm.DispAddUnknown = true;
-                }
 
                 // �³”F�Ï‚Ý‚Í�ˆ—�‚µ‚È‚¢
-                bool bReadOnly = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.ApprovalEndFlg].Value) == 1 ? true : false;
-                if (bReadOnly) return;
+                int nApprovalEndFlg = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.ApprovalEndFlg].Value);
+                if (nApprovalEndFlg == (int)PaymentDataDetail.ApprovalEndFlgDef.Approval) return;
 
                 int nPersonCode = CommonMotions.LoginUserData.PersonCode;
 
-                int nSelConstrCode = 0;
-
-                // �HŽ–ŒŸ�õ
+                // ----- ƒ_ƒCƒAƒ�ƒO•\Ž¦ƒpƒ‰ƒ�ƒ^ƒZƒbƒg
+                // ‹N“®Œ³ƒZƒbƒg
+                frm.ProcessNo = (int)ClsExcute.ProcessExecuteNo.RequestSummaryList;
+                // ŒŸ�õƒ^ƒCƒvƒZƒbƒg
                 frm.PersonCharge = (int)FrmConstructionDiag.PersonChargePoint.Construction;
+                // �HŽ–’S“–ŽÒƒR�[ƒh
                 frm.PersonCode = nPersonCode;
-                frm.ProcessNo = (int)ClsExcute.ProcessExecuteNo.RequestSummaryList;
+                // ŒŸ�õƒ^ƒCƒv
                 frm.SelectType = (int)FrmConstructionDiag.SelectConstructionType.RengeOngoing;
+                // •¡�”�s‘I‘ð
                 frm.SetGridMultiSelect = false;
+                // •s–¾ƒ{ƒ^ƒ“•\Ž¦
+                frm.DispAddUnknown = true;
 
                 frm.ShowDialog();
+                
                 // �I—¹ƒR�[ƒhŠm”F
                 if (DialogResult.Cancel.Equals(frm.EndButton)) return;
+
                 // ‘I‘ð–³‚µ‚Í�ˆ—�‚µ‚È‚¢
-                if (frm.ConstructionCode == 0) return;
-                nSelConstrCode = frm.ConstructionCode;
+                int nSelConstrCode = 0;
 
+                // •s–¾ˆÈŠO‚Í‘I‘ðƒf�[ƒ^‚ðŽæ“¾‚·‚é
+                if (!DialogResult.Yes.Equals(frm.EndButton))
+                {
+                    // ‘I‘ð’lƒZƒbƒg
+                    nSelConstrCode = frm.ConstructionCode;
+                }
+
                 int[] nRowCol = new int[2];
                 Array.Clear(nRowCol, 0, nRowCol.Length);
                 int nNewMakeRowIndex = -1;
-                
+
+                if (frm.ConstructionCode > 0 && nCompnyCode > 0)
+                {
+                    // —¼•û�Ý’è‚³‚ê‚Ä‚¢‚ê‚Î‘ä’ •\Ž¦•\Ž¦‚·‚é
+                    if (!DispSelectLedger(nCompnyCode, nSelConstrCode, frm2, ref nRowCol)) return;
+                }
+
                 if (rdbCompany.Checked)
                 {
-                    // ‘ä’ •\Ž¦‚Í‹ÆŽÒ’PˆÊ‚Ì“ü—Í‚Ì‚Ý•\Ž¦‚·‚é
-                    if (!DispSelectLedger(nCompnyCode, nSelConstrCode, frm2, ref nRowCol)) return;
                     // ----- ‹ÆŽÒ
                     InsdgvCompany2Project(nCompnyCode, frm.ConstructionCode, frm.ConstructionName, nRowCol, ref nNewMakeRowIndex);
                 }
@@ -1718,12 +1814,48 @@
                     InsdgvProject2Company(nCompnyCode, frm.ConstructionCode, frm.ConstructionName, nRowCol, ref nNewMakeRowIndex);
                 }
 
-                if (frm.ConstructionCode < 1) return;
+                if (frm.ConstructionCode > 0 && nCompnyCode > 0)
+                {   // ----- •s–¾Žž‚Í�ˆ—�‚µ‚È‚¢
+                    // ’�•¶�‘—X‘—�E’�•¶�‘•Ô‘—�E—\ŽZ�‘‚Ì’lŽæ“¾
+                    SetMaruBatsuKigou(dgv, IoCbi, frm.ConstructionCode, nNewMakeRowIndex);
+                }
 
+                m_bChengeAns = true;
+            }
+            catch (System.Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+            finally
+            {
+                frm.Dispose(); frm = null;
+                frm2.Dispose(); frm2 = null;
+                IoCbi.close(); IoCbi = null;
+
+                ResetNo();
+            }
+        }
+        #endregion
+
+        #region ’�•¶�‘—X‘—�E’�•¶�‘•Ô‘—�E—\ŽZ�‘‚Ì’lŽæ“¾
+        /// <summary>
+        /// ’�•¶�‘—X‘—�E’�•¶�‘•Ô‘—�E—\ŽZ�‘‚Ì’lŽæ“¾
+        /// </summary>
+        private void SetMaruBatsuKigou(DataGridView dgv
+                                        , IOConstructionBaseInfo IoCbi
+                                        , int nConstructionCode
+                                        , int nNewMakeRowIndex)
+        {
+            try
+            {
                 // ’�•¶�‘—X‘—�E’�•¶�‘•Ô‘—�E—\ŽZ�‘‚Ì’lŽæ“¾
                 StringBuilder sWhere = new StringBuilder();
                 ArrayList arData = new ArrayList();
-                if (!GetMarubatu(IoCbi, frm.ConstructionCode, ref arData)) throw new Exception("�HŽ–Šî–{�î•ñ�E�³”Fƒf�[ƒ^ƒGƒ‰�[");
+                if (!GetMarubatu(IoCbi, nConstructionCode, ref arData))
+                {
+                    MessageBox.Show("�HŽ–Šî–{�î•ñ�E�³”Fƒf�[ƒ^ƒGƒ‰�[", "ƒf�[ƒ^Žæ“¾ƒGƒ‰�[", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return;
+                }
 
                 if (arData.Count != 0)
                 {
@@ -1733,22 +1865,11 @@
                     dgv.Rows[nNewMakeRowIndex].Cells[(int)DispColumn.CyuumonshoTouchaku].Value = row[1];
                     dgv.Rows[nNewMakeRowIndex].Cells[(int)DispColumn.YosanSho].Value = row[2];
                 }
-
-                m_bChengeAns = true;
-
             }
             catch (System.Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
             }
-            finally
-            {
-                frm.Dispose(); frm = null;
-                frm2.Dispose(); frm2 = null;
-                IoCbi.close(); IoCbi = null;
-
-                ResetNo();
-            }
         }
         #endregion
 
@@ -1803,11 +1924,11 @@
                 DataGridView dgv = getShowingView();
 
                 // ‘Î�Û‹ÆŽÒ‚ðŽæ“¾‚·‚é
-                DataGridViewRow[] SelRows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == nCompnyCode
+                DataGridViewRow[] SelRows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_DispColumn].Value) == nCompnyCode
                                                                                 && CommonMotions.cnvInt(x.Cells[m_Genba_Column].Value) == nSelConstrCode
                                                                                 && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == (int)RowVisibleDef.Visible
                                                                                 && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×)
-                                                                            .OrderBy(y => CommonMotions.cnvInt(y.Cells[m_Company_Column].Value))
+                                                                            .OrderBy(y => CommonMotions.cnvInt(y.Cells[m_Company_DispColumn].Value))
                                                                             .ToArray();
                 // ƒŠƒXƒgƒZƒbƒg
                 frm2.BillDetailList.Clear();
@@ -1814,7 +1935,7 @@
                 foreach (DataGridViewRow CurRow in SelRows)
                 {
                     BillingDataDetail DataCurRec = new BillingDataDetail();
-                    DataCurRec.CompanyCode = CommonMotions.cnvInt(CurRow.Cells[m_Company_Column].Value);
+                    DataCurRec.CompanyCode = CommonMotions.cnvInt(CurRow.Cells[m_Company_DispColumn].Value);
                     DataCurRec.ConstructionRowCnt = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.ConstructionLedgerDetailNo].Value);
                     frm2.BillDetailList.Add(DataCurRec);
                 }
@@ -1844,7 +1965,7 @@
 
                 // ‹ÆŽÒ–¼‚ðŽæ“¾‚·‚é
                 string strCompnyName = string.Empty;
-                DataGridViewRow[] CompNameRows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == nCompanyCode
+                DataGridViewRow[] CompNameRows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_DispColumn].Value) == nCompanyCode
                                                                                 && CommonMotions.cnvString(x.Cells[m_CompanyNM_Column].Value).Length > 0
                                                                                 && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×)
                                                                             .ToArray();
@@ -1863,21 +1984,21 @@
                 }
 
                 // ‘I‘ð�HŽ–‚ªŠù‚É‚ ‚é‚©‚ð”»’è‚·‚é
-                DataGridViewRow[] SelRows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == nCompanyCode
+                DataGridViewRow[] SelRows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_DispColumn].Value) == nCompanyCode
                                                                                 && CommonMotions.cnvInt(x.Cells[m_Genba_Column].Value) == nConstructionCode
                                                                                 && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == (int)RowVisibleDef.Visible
                                                                                 && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×)
-                                                                            .OrderBy(y => CommonMotions.cnvInt(y.Cells[m_Company_Column].Value))
+                                                                            .OrderBy(y => CommonMotions.cnvInt(y.Cells[m_Company_DispColumn].Value))
                                                                             .ToArray();
 
                 bool bLastAdd = true;
-                if (SelRows.Count() > 0) bLastAdd = false;
+                 bLastAdd = false;
                 if (nCompanyCode == 0) bLastAdd = false;
 
                 if (bLastAdd)
                 {
                     // ----- �¬Œv�s‚Ì�ã‚É’Ç‰Á‚·‚é
-                    MakeIndex = SearchRowIndexCompany(nCompanyCode, false) + 1;
+                    MakeIndex = SearchRowIndexCompany(nCompanyCode, false, nConstructionCode);
                 }
                 else
                 {
@@ -1948,7 +2069,7 @@
                         Rows[0].Cells[(int)DispColumn.RowState].Value = DataRowState.Modified;
                         Rows[0].Visible = true;
 
-                        Rows[0].Cells[m_Company_Column].Value = 0;
+                        //Rows[0].Cells[m_Company_Column].Value = 0;
                         Rows[0].Cells[m_Company_DispColumn].Value = 0;
                         Rows[0].Cells[m_CompanyNM_Column].Value = s_UnknownString;
                         Rows[0].Cells[m_CompanyNM_Column].ToolTipText = s_UnknownString;
@@ -2044,17 +2165,12 @@
                             if (bFirst)
                             {
                                 r.Cells[(int)DispColumn.No].Value = iNo;
-                                //r.Cells[m_GoukeiCode_Column + 1].Value = k.Key.GoukeiCode;
-                                //r.Cells[m_GoukeiCode_Column + 2].Value = k.Key.GoukeiName;
-                                //r.Cells[m_GoukeiCode_Column + 2].ToolTipText = k.Key.GoukeiName;
                                 bFirst = false;
                                 continue;
                             }
 
                             r.Cells[(int)DispColumn.No].Value = "";
-                            //r.Cells[m_GoukeiCode_Column + 1].Value = k.Key.GoukeiCode;
                             r.Cells[m_CompanyNM_Column].Value = "";
-                            //r.Cells[m_CompanyNM_Column].ToolTipText = k.Key.GoukeiName;
                         }
                         iNo++;
                     }
@@ -2109,8 +2225,6 @@
                             if (bFirst)
                             {
                                 r.Cells[(int)DispColumn.No].Value = iNo;
-                                //r.Cells[m_GoukeiCode_Column + 1].Value = k.GoukeiName;
-                                //r.Cells[m_GoukeiCode_Column + 1].ToolTipText = k.GoukeiName;
                                 bFirst = false;
                                 continue;
                             }
@@ -2117,7 +2231,6 @@
 
                             r.Cells[(int)DispColumn.No].Value = "";
                             r.Cells[m_GenbaNM_Column].Value = "";
-                            //r.Cells[m_GenbaNM_Column].ToolTipText = k.GoukeiName;
                         }
                         iNo++;
                     }
@@ -2141,7 +2254,7 @@
             {
                 DataGridView dgv = getShowingView();
 
-                DataGridViewRow[] ExistenceData = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == CompanyCode
+                DataGridViewRow[] ExistenceData = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_DispColumn].Value) == CompanyCode
                                                                                             && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                                                             && cnvRowState(x.Cells[(int)DispColumn.RowState].Value) != DataRowState.Added)
                                                                                             .ToArray();
@@ -2150,7 +2263,7 @@
                 {
                     int SeqNo = 1;
 
-                    DataGridViewRow[] Rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == CompanyCode
+                    DataGridViewRow[] Rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_DispColumn].Value) == CompanyCode
                                                                                     && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×)
                                                                                     .ToArray();
                     int escSeqNo = 0;
@@ -2842,7 +2955,6 @@
                 if (!IoCbi.ExecuteReader(sql.ToString(), ref arData)) return false;
                 if (arData.Count == 0) return false;
 
-
                 return true;
 
             }
@@ -3073,7 +3185,7 @@
                     // ”ñ•\Ž¦�s‚Í‘Î�ÛŠO
                     if (!CurRow.Visible) continue;
 
-                    CompanyCode = CommonMotions.cnvInt(CurRow.Cells[m_Company_Column].Value);
+                    CompanyCode = CommonMotions.cnvInt(CurRow.Cells[m_Company_DispColumn].Value);
                     LineCount = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.LineCount].Value);
                     SeqNo = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.GroupSeqNo].Value);
                     if (CompanyCode == 0) continue;
@@ -3891,9 +4003,11 @@
                 int BreakKey1 = CommonMotions.cnvInt(objFirst[(int)ClickGetData.COMPANYCODE]);
                 int BreakKey2 = CommonMotions.cnvInt(objFirst[(int)ClickGetData.CONSTRUCTIONCODE]);
                 int BreakKey3 = CommonMotions.cnvInt(objFirst[(int)ClickGetData.ConstructionLedgerDetailNo]);
+                int BreakKey4 = CommonMotions.cnvInt(objFirst[(int)ClickGetData.LINECOUNT]);
                 int SaveKey1 = BreakKey1;
                 int SaveKey2 = BreakKey2;
                 int SaveKey3 = BreakKey3;
+                int SaveKey4 = BreakKey4;
 
                 // �³”FƒŠƒXƒgƒZƒbƒg
                 int ColCnt = (int)DispColumn.Shonin1Code;
@@ -3905,12 +4019,13 @@
                     BreakKey1 = CommonMotions.cnvInt(objRec[(int)ClickGetData.COMPANYCODE]);
                     BreakKey2 = CommonMotions.cnvInt(objRec[(int)ClickGetData.CONSTRUCTIONCODE]);
                     BreakKey3 = CommonMotions.cnvInt(objRec[(int)ClickGetData.ConstructionLedgerDetailNo]);
+                    BreakKey4 = CommonMotions.cnvInt(objRec[(int)ClickGetData.LINECOUNT]);
                     // •s–¾Žž‚Í‘ä’ –¾�×”Ô�†‚É�s”Ô�†‚ðƒZƒbƒg‚·‚é
-                    if (BreakKey1==0)
+                    if (BreakKey1 == 0)
                         BreakKey3 = CommonMotions.cnvInt(objRec[(int)ClickGetData.LINECOUNT]);
 
                     // ‰ïŽÐƒR�[ƒh�E�HŽ–ƒR�[ƒh‚Ì‚Ç‚¿‚ç‚©‚ªˆá‚¦‚Î”²‚¯‚é
-                    if (BreakKey1 != SaveKey1 || BreakKey2 != SaveKey2 || BreakKey3 != SaveKey3) break;
+                    if (BreakKey1 != SaveKey1 || BreakKey2 != SaveKey2 || BreakKey3 != SaveKey3 || BreakKey4 != SaveKey4) break;
                     ReadCnt = ix;
 
                     // �\�¿–³‚Í•\Ž¦‚µ‚È‚¢
@@ -4053,7 +4168,7 @@
                 // ----- �sƒf�[ƒ^
                 DataGridViewRow CurRow = dgv.Rows[LineCount];
                 // ‹ÆŽÒ�E�HŽ–ƒR�[ƒh
-                int CompCode = CommonMotions.cnvInt(CurRow.Cells[m_Company_Column].Value);
+                int CompCode = CommonMotions.cnvInt(CurRow.Cells[m_Company_DispColumn].Value);
                 int ConstrCode = CommonMotions.cnvInt(CurRow.Cells[m_Genba_Column].Value);
 
                 // �\�¿’S“–ŽÒ
@@ -4709,7 +4824,7 @@
 
                 Result = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                                 && cnvRowState(x.Cells[(int)DispColumn.RowState].Value) != DataRowState.Deleted
-                                                                && CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == CompanyCode)
+                                                                && CommonMotions.cnvInt(x.Cells[m_Company_DispColumn].Value) == CompanyCode)
                                                         .Sum(y => CommonMotions.cnvLong(y.Cells[(int)TargetColumn].Value));
 
             }
@@ -4737,7 +4852,7 @@
                 // •K—v�s’Š�o ‹ÆŽÒƒR�[ƒh�A˜A”Ô�A�s”Ô�†�¸�‡
                 DataGridViewRow[] Rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                                                     && cnvRowState(x.Cells[(int)DispColumn.RowState].Value) != DataRowState.Deleted)
-                                                                         .OrderBy(y => y.Cells[m_Company_Column].Value)
+                                                                         .OrderBy(y => y.Cells[m_Company_DispColumn].Value)
                                                                          .ThenBy(y1 => y1.Cells[(int)DispColumn.GroupSeqNo].Value)
                                                                          .ThenBy(y2 => y2.Cells[(int)DispColumn.LineCount].Value)
                                                                          .ToArray();
@@ -4819,7 +4934,7 @@
                                                                     && cnvRowState(x.Cells[(int)DispColumn.RowState].Value) == DataRowState.Deleted)
                                                            .GroupBy(c => new
                                                            {
-                                                               CompanyCode = CommonMotions.cnvInt(c.Cells[m_Company_Column].Value),
+                                                               CompanyCode = CommonMotions.cnvInt(c.Cells[m_Company_DispColumn].Value),
                                                                SeqNo = CommonMotions.cnvInt(c.Cells[(int)DispColumn.GroupSeqNo].Value)
                                                            })
                                                            .ToArray();
@@ -4849,7 +4964,7 @@
                         // ƒOƒŠƒbƒh•\Ž¦ƒf�[ƒ^‚ÌŽæ“¾
                         DataGridViewRow[] checkRow = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                                                                 && cnvRowState(x.Cells[(int)DispColumn.RowState].Value) == DataRowState.Modified
-                                                                                                && CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == listRow.CompanyCode
+                                                                                                && CommonMotions.cnvInt(x.Cells[m_Company_DispColumn].Value) == listRow.CompanyCode
                                                                                                 && CommonMotions.cnvInt(x.Cells[(int)DispColumn.GroupSeqNo].Value) == listRow.SeqNo
                                                                                                 && CommonMotions.cnvInt(x.Cells[(int)DispColumn.LineCount].Value) == listRow.LineCount)
                                                                                     .ToArray();
@@ -4929,7 +5044,7 @@
                 DataGridViewRow[] ExecRows = null;
                 if (SelExec == ExceRemDataDef.SelCompany)
                 {
-                    int SelData = CommonMotions.cnvInt(CurRow.Cells[m_Company_Column].Value);
+                    int SelData = CommonMotions.cnvInt(CurRow.Cells[m_Company_DispColumn].Value);
                     if (dgv == dgvCompany)
                     {
                         ExecRows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == SelData
@@ -5211,7 +5326,7 @@
                 // •\Ž¦‰æ–Ê�ã‚É‹¦—Í‰ïŽÐ‚ª–³‚¢‚©‚ðƒ`ƒFƒbƒN‚·‚é
                 DataGridViewRow[] compRow = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                                                     && cnvRowState(x.Cells[(int)DispColumn.RowState].Value) != DataRowState.Deleted
-                                                                                    && CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == nCompnyCode)
+                                                                                    && CommonMotions.cnvInt(x.Cells[m_Company_DispColumn].Value) == nCompnyCode)
                                                                                 .ToArray();
 
                 ArrayList CLDList = new ArrayList();
@@ -5428,7 +5543,7 @@
 
                 // •K—v�s’Š�o
                 DataGridViewRow[] TargetRows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×)
-                                                                         .OrderBy(y => y.Cells[m_Company_Column].Value)
+                                                                         .OrderBy(y => y.Cells[m_Company_DispColumn].Value)
                                                                          .ThenBy(y1 => y1.Cells[(int)DispColumn.GroupSeqNo].Value)
                                                                          .ThenBy(y2 => y2.Cells[(int)DispColumn.LineCount].Value)
                                                                          .ToArray();
@@ -5626,7 +5741,7 @@
                 // ‘Î�ÛƒOƒŠƒbƒhŽæ“¾
                 DataGridView dgv = getShowingView();
                 int DataCnt = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
-                                                                        && CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == nCompanyCode
+                                                                        && CommonMotions.cnvInt(x.Cells[m_Company_DispColumn].Value) == nCompanyCode
                                                                         && CommonMotions.cnvInt(x.Cells[(int)DispColumn.GroupSeqNo].Value) == nSeqNo
                                                                         && CommonMotions.cnvInt(x.Cells[(int)DispColumn.LineCount].Value) > 0)
                                                                          .Count();
@@ -5677,12 +5792,6 @@
                 // ƒf�[ƒ^ƒZƒbƒg
                 SetRow2BillingDataDetail(CurRow, IoDetail, ref BdDWork, nCompanyCode, nTargetDate);
 
-                // �V‹KƒL�[ƒZƒbƒg
-                BdDWork.CompanyCode = nCompanyCode;
-                BdDWork.TargetDate = nTargetDate;
-                BdDWork.SeqNo = nSeqNo;
-                BdDWork.LineCount = nLineCount;
-
                 // ƒf�[ƒ^�‘�ž‚Ý
                 if (!IoBdD.InsertAction(BdDWork, false))
                 {
@@ -6193,6 +6302,9 @@
                 ConstructionLedgerExcute ExcuteRec = new ConstructionLedgerExcute();
                 CreateLedgerData(CurRow, IoDetail, IoSub, ref DetailRec, ref ExcuteRec);
 
+                // �HŽ–”Ô�†–³‚Í�ˆ—�‚µ‚È‚¢
+                if (DetailRec.ConstructionCode < 1) return true;
+
                 if (!ClsChangeLedgerData.EntryExecuteData(IoDetail, IoExec, DetailRec, ExcuteRec))
                 {
                     nErrorCode = (int)EntryErrorCode.AbNormal;
@@ -6223,7 +6335,7 @@
             try
             {
                 int nConstrCode = CommonMotions.cnvInt(CurRow.Cells[m_Genba_Column].Value);
-                int nCompCode = CommonMotions.cnvInt(CurRow.Cells[m_Company_Column].Value);
+                int nCompCode = CommonMotions.cnvInt(CurRow.Cells[m_Company_DispColumn].Value);
                 int nSeqNo = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.GroupSeqNo].Value);
 
                 StringBuilder strSQL = new StringBuilder();
@@ -6234,7 +6346,7 @@
                 // •K—v�s’Š�o
                 DataGridView dgv = getShowingView();
                 DataGridViewRow[] CompanyRows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
-                                                                                         && CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == nCompCode
+                                                                                         && CommonMotions.cnvInt(x.Cells[m_Company_DispColumn].Value) == nCompCode
                                                                                          && CommonMotions.cnvInt(x.Cells[(int)DispColumn.GroupSeqNo].Value) == nSeqNo)
                                                                                  .ToArray();
                 string strName = string.Empty;
@@ -6263,7 +6375,7 @@
                 if (DetailRec.LineCount == 0) DetailRec.LineCount = nLineCnt;
                 DetailRec.SecondString = CommonMotions.cnvString(CurRow.Cells[(int)DispColumn.DetailName].Value);	            // �HŽ–“à—e
                 DetailRec.CompanyType = (int)ConstructionLedgerDetail.CompanyTypeDef.Subconstractor;	                        // ‹¦—Í‰ïŽÐƒR�[ƒhƒ^ƒCƒv
-                DetailRec.CompanyCode = CommonMotions.cnvInt(CurRow.Cells[m_Company_Column].Value);                             // ‹¦—Í‰ïŽÐƒR�[ƒh
+                DetailRec.CompanyCode = CommonMotions.cnvInt(CurRow.Cells[m_Company_DispColumn].Value);                         // ‹¦—Í‰ïŽÐƒR�[ƒh
                 DetailRec.CompanyName = strName; 	                                                                            // ‹¦—Í‰ïŽÐ–¼�Ì
                 DetailRec.IndependentFlg = (int)ConstructionLedgerDetail.IndependentFlgDef.Independent;                         // “Æ—§ƒf�[ƒ^ƒtƒ‰ƒO
                 DetailRec.SourceCode = nConstrCode;                                                                             // Œ³�HŽ–”Ô�†
@@ -6333,6 +6445,9 @@
                 ConstructionLedgerExcute ExcuteRec = new ConstructionLedgerExcute();
                 CreateLedgerData(CurRow, IoDetail, IoSub, ref DetailRec, ref ExcuteRec);
 
+                // �HŽ–”Ô�†–³‚Í�ˆ—�‚µ‚È‚¢
+                if (DetailRec.ConstructionCode < 1) return true;
+                
                 if (!ClsChangeLedgerData.ModifyExecuteData(IoDetail, IoExec, DetailRec, ExcuteRec, bRemove))
                 {
                     nErrorCode = (int)EntryErrorCode.AbNormal;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SubConstrRegist/FrmSubConstrRegist.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SubConstrRegist/FrmSubConstrRegist.designer.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SubConstrRegist/FrmSubConstrRegist.designer.cs	(revision 319)
@@ -930,7 +930,7 @@
             this.dgvJobItem.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.dgvJobItem.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvJobItem.BackgroundColor = System.Drawing.Color.White;
             this.dgvJobItem.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
@@ -1290,7 +1290,7 @@
             this.dgvJobLink.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.dgvJobLink.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvJobLink.BackgroundColor = System.Drawing.Color.White;
             this.dgvJobLink.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/Master/AlwaysEmployment/AlwaysEmployment.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/Master/AlwaysEmployment/AlwaysEmployment.designer.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/Master/AlwaysEmployment/AlwaysEmployment.designer.cs	(revision 319)
@@ -663,7 +663,7 @@
             this.dgvMaster.AllowUserToDeleteRows = false;
             this.dgvMaster.AllowUserToResizeColumns = false;
             this.dgvMaster.AllowUserToResizeRows = false;
-            this.dgvMaster.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvMaster.BackgroundColor = System.Drawing.Color.White;
             this.dgvMaster.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/Master/ApprovalRoute/FrmApprovalRoute.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/Master/ApprovalRoute/FrmApprovalRoute.designer.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/Master/ApprovalRoute/FrmApprovalRoute.designer.cs	(revision 319)
@@ -247,7 +247,7 @@
             this.dgvMaster.AllowUserToDeleteRows = false;
             this.dgvMaster.AllowUserToResizeColumns = false;
             this.dgvMaster.AllowUserToResizeRows = false;
-            this.dgvMaster.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvMaster.BackgroundColor = System.Drawing.Color.White;
             this.dgvMaster.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
@@ -340,7 +340,7 @@
             this.dgvGridData.AllowUserToDeleteRows = false;
             this.dgvGridData.AllowUserToResizeColumns = false;
             this.dgvGridData.AllowUserToResizeRows = false;
-            this.dgvGridData.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvGridData.BackgroundColor = System.Drawing.Color.White;
             this.dgvGridData.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/Master/ConstructionItem/FrmConstructionItem.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/Master/ConstructionItem/FrmConstructionItem.designer.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/Master/ConstructionItem/FrmConstructionItem.designer.cs	(revision 319)
@@ -318,7 +318,7 @@
             this.dgvWorkList.AllowUserToDeleteRows = false;
             this.dgvWorkList.AllowUserToResizeColumns = false;
             this.dgvWorkList.AllowUserToResizeRows = false;
-            this.dgvWorkList.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvWorkList.BackgroundColor = System.Drawing.Color.White;
             this.dgvWorkList.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/Master/ConstructionSpec/FrmConstructionSpec.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/Master/ConstructionSpec/FrmConstructionSpec.designer.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/Master/ConstructionSpec/FrmConstructionSpec.designer.cs	(revision 319)
@@ -358,7 +358,7 @@
             this.dgvItemList.AllowUserToDeleteRows = false;
             this.dgvItemList.AllowUserToResizeColumns = false;
             this.dgvItemList.AllowUserToResizeRows = false;
-            this.dgvItemList.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvItemList.BackgroundColor = System.Drawing.Color.White;
             this.dgvItemList.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
@@ -451,7 +451,7 @@
             this.dgvSpecList.AllowUserToDeleteRows = false;
             this.dgvSpecList.AllowUserToResizeColumns = false;
             this.dgvSpecList.AllowUserToResizeRows = false;
-            this.dgvSpecList.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvSpecList.BackgroundColor = System.Drawing.Color.White;
             this.dgvSpecList.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/Master/Orderer/FrmOrderers.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/Master/Orderer/FrmOrderers.designer.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/Master/Orderer/FrmOrderers.designer.cs	(revision 319)
@@ -815,7 +815,7 @@
             this.dgvMaster.AllowUserToDeleteRows = false;
             this.dgvMaster.AllowUserToResizeColumns = false;
             this.dgvMaster.AllowUserToResizeRows = false;
-            this.dgvMaster.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvMaster.BackgroundColor = System.Drawing.Color.White;
             this.dgvMaster.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/Master/PersonInCharge/FrmPersonInCharge.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/Master/PersonInCharge/FrmPersonInCharge.designer.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/Master/PersonInCharge/FrmPersonInCharge.designer.cs	(revision 319)
@@ -467,7 +467,7 @@
             this.dgvSalary.AllowUserToResizeRows = false;
             this.dgvSalary.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
-            this.dgvSalary.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvSalary.BackgroundColor = System.Drawing.Color.White;
             this.dgvSalary.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
@@ -937,7 +937,7 @@
             this.dgvRefDepartment.AllowUserToResizeRows = false;
             this.dgvRefDepartment.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
-            this.dgvRefDepartment.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvRefDepartment.BackgroundColor = System.Drawing.Color.White;
             this.dgvRefDepartment.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
@@ -1152,7 +1152,7 @@
             this.dgvMaster.AllowUserToDeleteRows = false;
             this.dgvMaster.AllowUserToResizeColumns = false;
             this.dgvMaster.AllowUserToResizeRows = false;
-            this.dgvMaster.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvMaster.BackgroundColor = System.Drawing.Color.White;
             this.dgvMaster.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/Master/SubContractor/FrmSubContractor.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/Master/SubContractor/FrmSubContractor.designer.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/Master/SubContractor/FrmSubContractor.designer.cs	(revision 319)
@@ -1240,7 +1240,7 @@
             this.dgvJobItem.AllowUserToResizeRows = false;
             this.dgvJobItem.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
-            this.dgvJobItem.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvJobItem.BackgroundColor = System.Drawing.Color.White;
             this.dgvJobItem.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
@@ -1301,7 +1301,7 @@
             this.dgvJobLink.AllowUserToResizeRows = false;
             this.dgvJobLink.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
-            this.dgvJobLink.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvJobLink.BackgroundColor = System.Drawing.Color.White;
             this.dgvJobLink.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control;
@@ -1360,7 +1360,7 @@
             this.dgvMaster.AllowUserToDeleteRows = false;
             this.dgvMaster.AllowUserToResizeColumns = false;
             this.dgvMaster.AllowUserToResizeRows = false;
-            this.dgvMaster.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvMaster.BackgroundColor = System.Drawing.Color.White;
             this.dgvMaster.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/Master/Suppliers/FrmSuppliers.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/Master/Suppliers/FrmSuppliers.designer.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/Master/Suppliers/FrmSuppliers.designer.cs	(revision 319)
@@ -494,7 +494,7 @@
             this.dgvMaster.AllowUserToDeleteRows = false;
             this.dgvMaster.AllowUserToResizeColumns = false;
             this.dgvMaster.AllowUserToResizeRows = false;
-            this.dgvMaster.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvMaster.BackgroundColor = System.Drawing.Color.White;
             this.dgvMaster.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmMessageBoardReader.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmMessageBoardReader.designer.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmMessageBoardReader.designer.cs	(revision 319)
@@ -268,7 +268,7 @@
             this.dgvAllDisplay.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.White;
             this.dgvAllDisplay.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.cs	(revision 319)
@@ -1766,11 +1766,6 @@
                             break;
                         }
                     }
-                    //if (iStartCnt == 0 && iEndedCnt == 0)
-                    //{
-                    //    iStartCnt = m_StaffAssignmentMonthLastLine[m_StaffAssignmentMonthLastLine.Length - 2] - 1;
-                    //    iEndedCnt = m_StaffAssignmentMonthLastLine[m_StaffAssignmentMonthLastLine.Length - 1];
-                    //}
                 }
                 else if (TitleLine == s_StaffAssignDaysLine)
                 {
@@ -1784,11 +1779,6 @@
                             break;
                         }
                     }
-                    //if (iStartCnt == 0 && iEndedCnt == 0)
-                    //{
-                    //    iStartCnt = m_StaffAssignmentDaySplitLine[m_StaffAssignmentDaySplitLine.Length - 2] - 1;
-                    //    iEndedCnt = m_StaffAssignmentDaySplitLine[m_StaffAssignmentDaySplitLine.Length - 1];
-                    //}
                 }
                 // ã‚¿ã‚¤ãƒˆãƒ«æ–‡å­—ä½�ç½®é€€é�¿
                 titlePos = iStartCnt;
Index: branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 318)
+++ branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 319)
@@ -32,7 +32,7 @@
 // ã�™ã�¹ã�¦ã�®å€¤ã‚’æŒ‡å®šã�™ã‚‹ã�‹ã€�ä¸‹ã�®ã‚ˆã�†ã�« '*' ã‚’ä½¿ã�£ã�¦ãƒ“ãƒ«ãƒ‰ã�Šã‚ˆã�³ãƒªãƒ“ã‚¸ãƒ§ãƒ³ç•ªå�·ã‚’ 
 // æ—¢å®šå€¤ã�«ã�™ã‚‹ã�“ã�¨ã�Œã�§ã��ã�¾ã�™:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.40")]
-[assembly: AssemblyFileVersion("1.0.1.40")]
+[assembly: AssemblyVersion("1.0.1.42")]
+[assembly: AssemblyFileVersion("1.0.1.42")]
 // Log4netã‚’ä½¿ç”¨ã�™ã‚‹
 [assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]
\ No newline at end of file
