Index: branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 299)
+++ branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 300)
@@ -14,7 +14,7 @@
         /// <summary>
         /// æœ¬ä½“ãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
         /// </summary>
-        public static int s_SystemVersion = 111;
+        public static int s_SystemVersion = 112;
 
         /// <summary>
         /// ã‚³ãƒ”ãƒ¼ãƒ»ç’°å¢ƒãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
Index: branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsApprovalPermission.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsApprovalPermission.cs	(revision 299)
+++ branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsApprovalPermission.cs	(revision 300)
@@ -260,10 +260,10 @@
                 bool bPetition = false;
                 // ç”³è«‹ãƒ‡ãƒ¼ã‚¿å�–å¾—
                 StringBuilder strSQL = new StringBuilder();
-                strSQL.AppendFormat(" Where PersonCode = {0}", PersonCode.ToString());
-                strSQL.AppendFormat(" And ApprovalCode = {0}", ApprovalCode.ToString());
+                strSQL.AppendFormat(" Where PersonCode = {0}", PersonCode);
+                strSQL.AppendFormat(" And ApprovalCode = {0}", ApprovalCode);
                 strSQL.AppendFormat(" And DATE(EntryDate) = DATE(STR_TO_DATE('{0}','%Y/%m/%d'))", ApprovalDate.ToShortDateString());
-                strSQL.AppendFormat(" And OrderNo = {0}", OrderNo.ToString());
+                strSQL.AppendFormat(" And OrderNo = {0}", OrderNo);
                 List<PersonApproval> PetitionList = new List<PersonApproval>();
                 if (!ApprDB.SelectAction(strSQL.ToString(), ref PetitionList)) return bPetition;
                 // ç”³è«‹ãƒ‡ãƒ¼ã‚¿ã�Œç„¡ã�„å ´å�ˆ
Index: branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOPersonApproval.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOPersonApproval.cs	(revision 299)
+++ branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOPersonApproval.cs	(revision 300)
@@ -453,13 +453,13 @@
             StringBuilder strWork = new StringBuilder();
             try
             {
-                strWork.AppendFormat(" Where {0}PersonCode = {1}", APara, PersonCode.ToString());
-                strWork.AppendFormat(" And {0}ApprovalCode = {1}", APara, ApprovalCode.ToString());
+                strWork.AppendFormat(" Where {0}PersonCode = {1}", APara, PersonCode);
+                strWork.AppendFormat(" And {0}ApprovalCode = {1}", APara, ApprovalCode);
                 strWork.AppendFormat(" And DATE({0}OrderDate) = DATE(STR_TO_DATE('{1}','%Y/%m/%d'))", APara, OrderDate.ToShortDateString());
                 if (OrderNo != 0)
-                    strWork.AppendFormat(" And {0}OrderNo = {1}", APara, OrderNo.ToString());
+                    strWork.AppendFormat(" And {0}OrderNo = {1}", APara, OrderNo);
                 if (SeqNo != 0)
-                    strWork.AppendFormat(" And {0}SeqNo = {1}", APara, SeqNo.ToString());
+                    strWork.AppendFormat(" And {0}SeqNo = {1}", APara, SeqNo);
             }
             catch (Exception ex)
             {
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPerson.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPerson.cs	(revision 299)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPerson.cs	(revision 300)
@@ -708,52 +708,9 @@
         {
             try
             {
-                int iNextProcessNo = 0;
-                // ----- ŽŸ�ˆ—�ƒZƒbƒg
-                switch (m_ApprovalCode)
-                {
-                    case (int)ClsExcute.ApprovalListNo.DRWorkApproval:                      // 8:�o‹ÎŠÇ—��³”F
-                        iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.DRWork;
-                        break;
-                    case (int)ClsExcute.ApprovalListNo.CostomerRegistApproval:              // 9:”­’�ŽÒ“o˜^�³”F
-                        iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.CostomerRegist;
-                        break;
-                    case (int)ClsExcute.ApprovalListNo.SubConstregistApproval:              // 10:‹¦—Í‰ïŽÐ“o˜^�³”F
-                        iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.SubConstrRegist;
-                        break;
-                    case (int)ClsExcute.ApprovalListNo.FeePayment:                          // 11:ŽèŠÔŽx•¥
-                        iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.RequestSummaryList;
-                        break;
-                    case (int)ClsExcute.ApprovalListNo.SubConstrPayment:                    // 12:‹ÆŽÒŽx•¥
-                        iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.RequestSummaryList;
-                        break;
-                }
-                if (iNextProcessNo == 0) return;
+                // ŽŸŒÄ�o�ˆ—�ƒpƒ‰ƒ��[ƒ^ƒZƒbƒg
+                DispTargetData();
 
-                // ----- ‹N“®ƒvƒ�ƒZƒX�Ý’è
-                int NowPoint = ClsExcute.NextProcess(iNextProcessNo);
-
-                // ŽèŠÔ�E‹ÆŽÒŽx•¥‚¢‚Í‹æ•ª‚ªˆê”Ô�Å�‰
-                ClsExcute.ProcControlPara[NowPoint].ArrayParameter.Clear();
-                switch (m_ApprovalCode)
-                {
-                    case (int)ClsExcute.ApprovalListNo.FeePayment:                          // 11:ŽèŠÔŽx•¥
-                        ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add((int)CommonDefine.LabourKinds.Labor);
-                        ClsExcute.ProcControlPara[NowPoint].BoolExecParameter.Add(false);
-                        break;
-                    case (int)ClsExcute.ApprovalListNo.SubConstrPayment:                    // 12:‹ÆŽÒŽx•¥
-                        ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add((int)CommonDefine.LabourKinds.Normal);
-                        ClsExcute.ProcControlPara[NowPoint].BoolExecParameter.Add(false);
-                        break;
-                }
-
-                // ----- ’S“–ŽÒƒR�[ƒhƒZƒbƒg
-                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(m_PersonCode);
-                // Žó•t“ú
-                ClsExcute.ProcControlPara[NowPoint].DateExecParameter.Add(m_SearchDate);
-                // Žó•t”Ô�†
-                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(m_SearchSeqNo);
-
                 m_bTargetFlg = true;
                 m_bEndFlg = true;
                 this.Close();
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPersonAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPersonAuxiliary.cs	(revision 299)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPersonAuxiliary.cs	(revision 300)
@@ -835,6 +835,67 @@
         }
         #endregion
 
+        #region æ¬¡å‘¼å‡ºå‡¦ç�†ãƒ‘ãƒ©ãƒ¡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ(å¯¾è±¡ãƒ‡ãƒ¼ã‚¿ã‚’è¦‹ã‚‹)
+        /// <summary>
+        /// æ¬¡å‘¼å‡ºå‡¦ç�†ãƒ‘ãƒ©ãƒ¡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ(å¯¾è±¡ãƒ‡ãƒ¼ã‚¿ã‚’è¦‹ã‚‹)
+        /// </summary>
+        private void DispTargetData()
+        {
+            try
+            {
+                int iNextProcessNo = 0;
+                // ----- æ¬¡å‡¦ç�†ã‚»ãƒƒãƒˆ
+                switch (m_ApprovalCode)
+                {
+                    case (int)ClsExcute.ApprovalListNo.DRWorkApproval:                      // 8:å‡ºå‹¤ç®¡ç�†æ‰¿èª�
+                        iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.DRWork;
+                        break;
+                    case (int)ClsExcute.ApprovalListNo.CostomerRegistApproval:              // 9:ç™ºæ³¨è€…ç™»éŒ²æ‰¿èª�
+                        iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.CostomerRegist;
+                        break;
+                    case (int)ClsExcute.ApprovalListNo.SubConstregistApproval:              // 10:å�”åŠ›ä¼šç¤¾ç™»éŒ²æ‰¿èª�
+                        iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.SubConstrRegist;
+                        break;
+                    case (int)ClsExcute.ApprovalListNo.FeePayment:                          // 11:æ‰‹é–“æ”¯æ‰•
+                        iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.RequestSummaryList;
+                        break;
+                    case (int)ClsExcute.ApprovalListNo.SubConstrPayment:                    // 12:æ¥­è€…æ”¯æ‰•
+                        iNextProcessNo = (int)ClsExcute.ProcessExecuteNo.RequestSummaryList;
+                        break;
+                }
+                if (iNextProcessNo == 0) return;
+
+                // ----- èµ·å‹•ãƒ—ãƒ­ã‚»ã‚¹è¨­å®š
+                int NowPoint = ClsExcute.NextProcess(iNextProcessNo);
+
+                // æ‰‹é–“ãƒ»æ¥­è€…æ”¯æ‰•ã�„ã�¯åŒºåˆ†ã�Œä¸€ç•ªæœ€åˆ�
+                ClsExcute.ProcControlPara[NowPoint].ArrayParameter.Clear();
+                switch (m_ApprovalCode)
+                {
+                    case (int)ClsExcute.ApprovalListNo.FeePayment:                          // 11:æ‰‹é–“æ”¯æ‰•
+                        ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add((int)CommonDefine.LabourKinds.Labor);
+                        ClsExcute.ProcControlPara[NowPoint].BoolExecParameter.Add(false);
+                        break;
+                    case (int)ClsExcute.ApprovalListNo.SubConstrPayment:                    // 12:æ¥­è€…æ”¯æ‰•
+                        ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add((int)CommonDefine.LabourKinds.Normal);
+                        ClsExcute.ProcControlPara[NowPoint].BoolExecParameter.Add(false);
+                        break;
+                }
+
+                // ----- æ‹…å½“è€…ã‚³ãƒ¼ãƒ‰ã‚»ãƒƒãƒˆ
+                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(m_PersonCode);
+                // å�—ä»˜ç•ªå�·
+                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(m_OrderNo);
+                // å�—ä»˜æ—¥
+                ClsExcute.ProcControlPara[NowPoint].DateExecParameter.Add(m_SearchDate);
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
+        
         #region ---------- >> ç”³è«‹å¾Œå‡¦ç�†
         #region ç”³è«‹å¾Œã�®ãƒ‡ãƒ¼ã‚¿æ›´æ–°å‡¦ç�†ã‚’è¡Œã�†
         /// <summary>
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs	(revision 299)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs	(revision 300)
@@ -2966,13 +2966,13 @@
                     {
                         case (int)DataGroup.ConstructionCosts:       // æ–½å·¥è²»
                             // æ–½å·¥è²»ãƒ»è³¼å…¥å“�ã�®å›ºå®šé …ç›®ä»¥å¤–ã�®è¡Œã�¯å��ç§°ç­‰ã‚’ç·¨é›†å‡ºæ�¥ã‚‹
-                            if (DetailRec.FixDataFlg != 1)
-                            {
-                                for (int i = (int)GridColumn.ItemName; i <= (int)GridColumn.CompanyName; i++)
-                                {
-                                    CurRow.Cells[i].ReadOnly = false;
-                                }
-                            }
+                            //if (DetailRec.FixDataFlg != 1)
+                            //{
+                            //    for (int i = (int)GridColumn.ItemName; i <= (int)GridColumn.CompanyName; i++)
+                            //    {
+                            //        CurRow.Cells[i].ReadOnly = false;
+                            //    }
+                            //}
                             break;
 
                         case (int)DataGroup.Assistant:               // å‰¯æ‹…å½“
@@ -4352,7 +4352,8 @@
                     if (nWrkCompanyCode < 1) continue;
 
                     // æ˜Žç´°è¡Œã�®ä½�ç½®ã�Œå¤‰ã‚�ã�£ã�¦ã�„ã�Ÿæ™‚ã�¯ãƒªã‚¹ãƒˆã�«è¿½åŠ ã�™ã‚‹
-                    PDetailList.Add(new object[] { nWrkCompanyCode, nOldLineCnt, RowLineCnt });
+                    int nSourceCode = CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.SourceCode].Value);               // å…ƒå·¥äº‹ç•ªå�·
+                    PDetailList.Add(new object[] { nWrkCompanyCode, nOldLineCnt, RowLineCnt, nSourceCode });
 
                 } // iRows
 
@@ -4621,7 +4622,7 @@
                     strSQL.Append(" A.ConstructionCode");
                     strSQL.Append(" From purchaseorderdetail as A");
                     strSQL.Append(", purchaseorder as B");
-                    strSQL.AppendFormat(" Where A.ConstructionCode = {0}", m_ConstructionCode);
+                    strSQL.AppendFormat(" Where A.ConstructionCode = {0}", CommonMotions.cnvInt(CurCount[3]));
                     strSQL.AppendFormat(" And A.SourceCode = {0}", m_ConstructionCode);
                     strSQL.AppendFormat(" And A.SourceLineCnt = {0}", CommonMotions.cnvInt(CurCount[1]));
                     strSQL.Append(" And B.ConstructionCode = A.ConstructionCode");
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntry.Designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntry.Designer.cs	(revision 299)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntry.Designer.cs	(revision 300)
@@ -42,6 +42,9 @@
             this.label1 = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
             this.btnInputImage = new System.Windows.Forms.Button();
+            this.label9 = new System.Windows.Forms.Label();
+            this.label8 = new System.Windows.Forms.Label();
+            this.lblFixComment = new System.Windows.Forms.Label();
             this.lblLabel01 = new System.Windows.Forms.Label();
             this.panel2 = new System.Windows.Forms.Panel();
             this.radioButton2 = new System.Windows.Forms.RadioButton();
@@ -54,10 +57,8 @@
             this.lblLabel02 = new System.Windows.Forms.Label();
             this.label14 = new System.Windows.Forms.Label();
             this.label4 = new System.Windows.Forms.Label();
-            this.label9 = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
             this.label11 = new System.Windows.Forms.Label();
-            this.label8 = new System.Windows.Forms.Label();
             this.lblLabel04 = new System.Windows.Forms.Label();
             this.pnlApproval = new System.Windows.Forms.Panel();
             this.lblApprovalCount = new System.Windows.Forms.Label();
@@ -188,6 +189,9 @@
             this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
             this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.panel1.Controls.Add(this.btnInputImage);
+            this.panel1.Controls.Add(this.label9);
+            this.panel1.Controls.Add(this.label8);
+            this.panel1.Controls.Add(this.lblFixComment);
             this.panel1.Controls.Add(this.lblLabel01);
             this.panel1.Controls.Add(this.panel2);
             this.panel1.Controls.Add(this.label17);
@@ -198,16 +202,14 @@
             this.panel1.Controls.Add(this.lblLabel02);
             this.panel1.Controls.Add(this.label14);
             this.panel1.Controls.Add(this.label4);
-            this.panel1.Controls.Add(this.label9);
             this.panel1.Controls.Add(this.label5);
             this.panel1.Controls.Add(this.label11);
-            this.panel1.Controls.Add(this.label8);
             this.panel1.Controls.Add(this.lblLabel04);
             this.panel1.Controls.Add(this.pnlApproval);
             this.panel1.Controls.Add(this.pnlApprovalButton);
-            this.panel1.Location = new System.Drawing.Point(7, 40);
+            this.panel1.Location = new System.Drawing.Point(7, 38);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1330, 108);
+            this.panel1.Size = new System.Drawing.Size(1330, 110);
             this.panel1.TabIndex = 8;
             // 
             // btnInputImage
@@ -216,20 +218,54 @@
             this.btnInputImage.BackColor = System.Drawing.Color.PaleTurquoise;
             this.btnInputImage.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.btnInputImage.ForeColor = System.Drawing.Color.Black;
-            this.btnInputImage.Location = new System.Drawing.Point(820, 71);
+            this.btnInputImage.Location = new System.Drawing.Point(895, 62);
             this.btnInputImage.Name = "btnInputImage";
-            this.btnInputImage.Size = new System.Drawing.Size(170, 25);
+            this.btnInputImage.Size = new System.Drawing.Size(160, 24);
             this.btnInputImage.TabIndex = 54;
             this.btnInputImage.Text = "å…¥åŠ›ä½�ç½®ç¢ºèª�";
             this.btnInputImage.UseVisualStyleBackColor = false;
             this.btnInputImage.Click += new System.EventHandler(this.btnInputImage_Click);
             // 
+            // label9
+            // 
+            this.label9.BackColor = System.Drawing.Color.SandyBrown;
+            this.label9.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label9.Location = new System.Drawing.Point(1081, 62);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(120, 25);
+            this.label9.TabIndex = 35;
+            this.label9.Text = "ç�€ã€€å·¥ã€€æ—¥";
+            this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // label8
+            // 
+            this.label8.BackColor = System.Drawing.Color.White;
+            this.label8.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.label8.ForeColor = System.Drawing.Color.Black;
+            this.label8.Location = new System.Drawing.Point(1209, 62);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(114, 25);
+            this.label8.TabIndex = 36;
+            this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // lblFixComment
+            // 
+            this.lblFixComment.AutoSize = true;
+            this.lblFixComment.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.lblFixComment.ForeColor = System.Drawing.Color.Red;
+            this.lblFixComment.Location = new System.Drawing.Point(820, 88);
+            this.lblFixComment.Name = "lblFixComment";
+            this.lblFixComment.Size = new System.Drawing.Size(452, 16);
+            this.lblFixComment.TabIndex = 98;
+            this.lblFixComment.Text = "â€»é‡‘é¡�å¤‰æ›´æ™‚ã�®æ³•å®šç¦�åˆ©è²»ã�¯8.0%ã�§æ‰‹è¨ˆç®—ã�—ã�¦ã��ã� ã�•ã�„ã€‚";
+            this.lblFixComment.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
             // lblLabel01
             // 
             this.lblLabel01.BackColor = System.Drawing.Color.White;
             this.lblLabel01.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.lblLabel01.ForeColor = System.Drawing.Color.Black;
-            this.lblLabel01.Location = new System.Drawing.Point(134, 5);
+            this.lblLabel01.Location = new System.Drawing.Point(132, 4);
             this.lblLabel01.Name = "lblLabel01";
             this.lblLabel01.Size = new System.Drawing.Size(115, 25);
             this.lblLabel01.TabIndex = 52;
@@ -240,18 +276,18 @@
             this.panel2.BackColor = System.Drawing.Color.White;
             this.panel2.Controls.Add(this.radioButton2);
             this.panel2.Controls.Add(this.radioButton1);
-            this.panel2.Location = new System.Drawing.Point(820, 37);
+            this.panel2.Location = new System.Drawing.Point(820, 33);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(250, 27);
+            this.panel2.Size = new System.Drawing.Size(235, 27);
             this.panel2.TabIndex = 48;
             // 
             // radioButton2
             // 
-            this.radioButton2.Location = new System.Drawing.Point(126, 0);
+            this.radioButton2.Location = new System.Drawing.Point(121, 0);
             this.radioButton2.Name = "radioButton2";
             this.radioButton2.Size = new System.Drawing.Size(120, 28);
             this.radioButton2.TabIndex = 0;
-            this.radioButton2.Text = "æ­£ã€€è¦�ã€€ç‰ˆ";
+            this.radioButton2.Text = "æ­£ è¦� ç‰ˆ";
             this.radioButton2.UseVisualStyleBackColor = true;
             this.radioButton2.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
             // 
@@ -258,12 +294,12 @@
             // radioButton1
             // 
             this.radioButton1.Checked = true;
-            this.radioButton1.Location = new System.Drawing.Point(6, 0);
+            this.radioButton1.Location = new System.Drawing.Point(17, 0);
             this.radioButton1.Name = "radioButton1";
             this.radioButton1.Size = new System.Drawing.Size(120, 28);
             this.radioButton1.TabIndex = 0;
             this.radioButton1.TabStop = true;
-            this.radioButton1.Text = "ç°¡ã€€æ˜“ã€€ç‰ˆ";
+            this.radioButton1.Text = "ç°¡ æ˜“ ç‰ˆ";
             this.radioButton1.UseVisualStyleBackColor = true;
             this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
             // 
@@ -272,9 +308,9 @@
             this.label17.BackColor = System.Drawing.Color.White;
             this.label17.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label17.ForeColor = System.Drawing.Color.Black;
-            this.label17.Location = new System.Drawing.Point(462, 71);
+            this.label17.Location = new System.Drawing.Point(438, 68);
             this.label17.Name = "label17";
-            this.label17.Size = new System.Drawing.Size(350, 25);
+            this.label17.Size = new System.Drawing.Size(374, 25);
             this.label17.TabIndex = 47;
             this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
@@ -282,7 +318,7 @@
             // 
             this.label16.BackColor = System.Drawing.Color.SandyBrown;
             this.label16.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label16.Location = new System.Drawing.Point(334, 71);
+            this.label16.Location = new System.Drawing.Point(310, 68);
             this.label16.Name = "label16";
             this.label16.Size = new System.Drawing.Size(120, 25);
             this.label16.TabIndex = 46;
@@ -294,7 +330,7 @@
             this.lblConstructionCodelabel.BackColor = System.Drawing.Color.SandyBrown;
             this.lblConstructionCodelabel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.lblConstructionCodelabel.ForeColor = System.Drawing.Color.White;
-            this.lblConstructionCodelabel.Location = new System.Drawing.Point(8, 5);
+            this.lblConstructionCodelabel.Location = new System.Drawing.Point(4, 4);
             this.lblConstructionCodelabel.Name = "lblConstructionCodelabel";
             this.lblConstructionCodelabel.Size = new System.Drawing.Size(120, 25);
             this.lblConstructionCodelabel.TabIndex = 30;
@@ -306,7 +342,7 @@
             this.label3.BackColor = System.Drawing.Color.SandyBrown;
             this.label3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label3.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            this.label3.Location = new System.Drawing.Point(8, 38);
+            this.label3.Location = new System.Drawing.Point(4, 36);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(120, 25);
             this.label3.TabIndex = 33;
@@ -318,7 +354,7 @@
             this.lblLabel03.BackColor = System.Drawing.Color.White;
             this.lblLabel03.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.lblLabel03.ForeColor = System.Drawing.Color.Black;
-            this.lblLabel03.Location = new System.Drawing.Point(134, 38);
+            this.lblLabel03.Location = new System.Drawing.Point(132, 36);
             this.lblLabel03.Name = "lblLabel03";
             this.lblLabel03.Size = new System.Drawing.Size(550, 25);
             this.lblLabel03.TabIndex = 34;
@@ -329,9 +365,9 @@
             this.lblLabel02.BackColor = System.Drawing.Color.White;
             this.lblLabel02.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.lblLabel02.ForeColor = System.Drawing.Color.Black;
-            this.lblLabel02.Location = new System.Drawing.Point(255, 5);
+            this.lblLabel02.Location = new System.Drawing.Point(255, 4);
             this.lblLabel02.Name = "lblLabel02";
-            this.lblLabel02.Size = new System.Drawing.Size(816, 25);
+            this.lblLabel02.Size = new System.Drawing.Size(800, 25);
             this.lblLabel02.TabIndex = 32;
             this.lblLabel02.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
@@ -339,7 +375,7 @@
             // 
             this.label14.BackColor = System.Drawing.Color.SandyBrown;
             this.label14.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label14.Location = new System.Drawing.Point(1081, 38);
+            this.label14.Location = new System.Drawing.Point(1081, 36);
             this.label14.Name = "label14";
             this.label14.Size = new System.Drawing.Size(120, 25);
             this.label14.TabIndex = 35;
@@ -350,7 +386,7 @@
             // 
             this.label4.BackColor = System.Drawing.Color.SandyBrown;
             this.label4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label4.Location = new System.Drawing.Point(692, 38);
+            this.label4.Location = new System.Drawing.Point(692, 36);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(120, 25);
             this.label4.TabIndex = 35;
@@ -357,22 +393,11 @@
             this.label4.Text = "ç™ºæ³¨æ›¸ã‚¿ã‚¤ãƒ—";
             this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // label9
-            // 
-            this.label9.BackColor = System.Drawing.Color.SandyBrown;
-            this.label9.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label9.Location = new System.Drawing.Point(1081, 5);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(120, 25);
-            this.label9.TabIndex = 35;
-            this.label9.Text = "ç�€ã€€å·¥ã€€æ—¥";
-            this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
             // label5
             // 
             this.label5.BackColor = System.Drawing.Color.SandyBrown;
             this.label5.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label5.Location = new System.Drawing.Point(8, 71);
+            this.label5.Location = new System.Drawing.Point(4, 68);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(120, 25);
             this.label5.TabIndex = 35;
@@ -384,31 +409,20 @@
             this.label11.BackColor = System.Drawing.Color.White;
             this.label11.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label11.ForeColor = System.Drawing.Color.Black;
-            this.label11.Location = new System.Drawing.Point(1209, 38);
+            this.label11.Location = new System.Drawing.Point(1209, 36);
             this.label11.Name = "label11";
             this.label11.Size = new System.Drawing.Size(114, 25);
             this.label11.TabIndex = 36;
             this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // label8
-            // 
-            this.label8.BackColor = System.Drawing.Color.White;
-            this.label8.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label8.ForeColor = System.Drawing.Color.Black;
-            this.label8.Location = new System.Drawing.Point(1209, 5);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(114, 25);
-            this.label8.TabIndex = 36;
-            this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
             // lblLabel04
             // 
             this.lblLabel04.BackColor = System.Drawing.Color.White;
             this.lblLabel04.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.lblLabel04.ForeColor = System.Drawing.Color.Black;
-            this.lblLabel04.Location = new System.Drawing.Point(134, 71);
+            this.lblLabel04.Location = new System.Drawing.Point(132, 68);
             this.lblLabel04.Name = "lblLabel04";
-            this.lblLabel04.Size = new System.Drawing.Size(190, 25);
+            this.lblLabel04.Size = new System.Drawing.Size(170, 25);
             this.lblLabel04.TabIndex = 36;
             this.lblLabel04.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
@@ -421,7 +435,7 @@
             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(1060, 66);
+            this.pnlApproval.Location = new System.Drawing.Point(1060, 0);
             this.pnlApproval.Name = "pnlApproval";
             this.pnlApproval.Size = new System.Drawing.Size(262, 34);
             this.pnlApproval.TabIndex = 51;
@@ -476,7 +490,7 @@
             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(1060, 66);
+            this.pnlApprovalButton.Location = new System.Drawing.Point(1060, 0);
             this.pnlApprovalButton.Name = "pnlApprovalButton";
             this.pnlApprovalButton.Size = new System.Drawing.Size(262, 34);
             this.pnlApprovalButton.TabIndex = 53;
@@ -1749,5 +1763,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column8;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column11;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column12;
+        private System.Windows.Forms.Label lblFixComment;
     }
 }
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs	(revision 299)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs	(revision 300)
@@ -63,6 +63,11 @@
 
             m_DspLabelCtrl[(int)DspLblCtrlName.StartingDate] = label8;
             m_DspLabelCtrl[(int)DspLblCtrlName.CompleteDate] = label11;
+        
+            // ã�“ã�“ã�§å›ºå®šæ–‡å­—ã�®è¡¨ç¤º
+            lblFixComment.Text = string.Format("â€»é‡‘é¡�å¤‰æ›´æ™‚ã�®{0}ã�¯{1}ï¼…ã�§æ‰‹è¨ˆç®—ã�—ã�¦ã��ã� ã�•ã�„ã€‚"
+                                                                ,s_StatutoryWelfareName
+                                                                , CommonMotions.SystemMasterData.StatutoryWelfareRate.ToString("0.0"));
         }
         #endregion
         
@@ -992,10 +997,12 @@
         }
         #endregion
 
+        #region å�°å¸³ç™ºæ³¨é‡‘é¡�ãƒ†ãƒ¼ãƒ–ãƒ«
         /// <summary>
         /// å�°å¸³ç™ºæ³¨é‡‘é¡�ãƒ†ãƒ¼ãƒ–ãƒ«
         /// </summary>
         private List<KeyValuePair<int, int>> LedgerOrderPrice = new List<KeyValuePair<int, int>>();
+        #endregion
 
         #region å�°å¸³ç™ºæ³¨é‡‘é¡�ãƒ†ãƒ¼ãƒ–ãƒ«ä½œæˆ�
         /// <summary>
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs	(revision 299)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs	(revision 300)
@@ -583,12 +583,10 @@
         {
             try
             {
-                // ƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒg
+                // ‘Î�ÛŒŽƒRƒ“ƒ{ƒ{ƒbƒNƒXƒZƒbƒg
                 LoadTargetMonth(ref m_Payday);
 
                 // ’S“–ŽÒ�³”F�î•ñ‚ÌŽæ“¾
-                int DepCode = 0;
-                int PersonCode = 0;
                 //if (ClsExcute.ProcControlPara.Count > 0)
                 //{
                 //    int cnt = ClsExcute.ProcControlPara.Count - 1;
@@ -609,12 +607,14 @@
                 //    }
                 //}
 
+                int DepCode = 0;
+                int PersonCode = 0;
                 // ƒpƒ‰ƒ��[ƒ^�‰ŠúƒZƒbƒg
                 SetInitParametar(ref DepCode, ref PersonCode);
 
                 // ƒRƒ“ƒ{ƒ{ƒbƒNƒX�‰Šú•\Ž¦
                 InitCombBox(DepCode, PersonCode);
-                
+
                 // ƒ†�[ƒUŒ ŒÀ�Ý’è
                 ClsSecurityPermission.SetUserType(m_UserInfo);
 
@@ -667,7 +667,8 @@
                     bool Pettition = false;
                     if ((m_PaInfo is PaymentApprovalInfo))
                     {
-                        Pettition = ClsApprovalPermission.CheckPersonPetition2(m_PaInfo.ApprovalPerson, ApprovalCode, m_PaInfo.ApprovalDate, (int)CommonDefine.s_Default_OrderNo);
+                        //Pettition = ClsApprovalPermission.CheckPersonPetition2(m_PaInfo.ApprovalPerson, ApprovalCode, m_PaInfo.ApprovalDate, (int)CommonDefine.s_Default_OrderNo);
+                        Pettition = ClsApprovalPermission.CheckPersonPetition(m_PaInfo.ApprovalPerson, ApprovalCode, m_PaInfo.ApprovalDate, (int)CommonDefine.s_Default_OrderNo);
                     }
                     // ƒ�ƒOƒCƒ“ŽÒ‚ª�³”FŽÒ‚©‚ðŠm”F‚·‚é
                     bool Approvaler = ClsApprovalPermission.CheckUserForApprover(ApprovalCode, DepartmentCode);
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.designer.cs	(revision 299)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.designer.cs	(revision 300)
@@ -603,13 +603,13 @@
             this.groupBoxEx1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
             this.groupBoxEx1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
             this.groupBoxEx1.BorderColor = System.Drawing.Color.Gray;
+            this.groupBoxEx1.Controls.Add(this.pnlApproval);
+            this.groupBoxEx1.Controls.Add(this.pnlApprovalButton);
             this.groupBoxEx1.Controls.Add(this.label11);
             this.groupBoxEx1.Controls.Add(this.cmbPerson);
             this.groupBoxEx1.Controls.Add(this.cmbDepartment);
             this.groupBoxEx1.Controls.Add(this.label4);
             this.groupBoxEx1.Controls.Add(this.panel2);
-            this.groupBoxEx1.Controls.Add(this.pnlApproval);
-            this.groupBoxEx1.Controls.Add(this.pnlApprovalButton);
             this.groupBoxEx1.Controls.Add(this.lblPaymentDate);
             this.groupBoxEx1.Controls.Add(this.label5);
             this.groupBoxEx1.Controls.Add(this.label2);
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs	(revision 299)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs	(revision 300)
@@ -51,6 +51,9 @@
 
                 DepCode = PersonRec.DepartmentCode;
                 PersonCode = PaymentPersonCode;
+
+                cmbDepartment.Enabled = false;
+                cmbPerson.Enabled = false;
             }
             catch (Exception ex)
             {
@@ -3406,7 +3409,7 @@
                 StringBuilder sql = new StringBuilder();
                 bool bNewData = false;
                 // SQL�ì�¬
-                CreateSQLType2Exists(m_PaInfo, ref sql);
+                CreateSQLType2Exists(ref sql);
 
                 // Order By Set
                 SetSQLOrder(ref sql);
@@ -3692,8 +3695,9 @@
             try
             {
                 DataGridView dgv = getShowingView();
+                DataGridViewRow CurRow = dgv.Rows[LineCount];
 
-                int DepCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.DetailName].Value);
+                int DepCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.DetailName].Value);
 
                 int SaleCode = CommonMotions.cnvInt(work[(int)ClickGetData.SalesPersonCode]);
                 int ConstrPersonCode = CommonMotions.cnvInt(work[(int)ClickGetData.ConstructionPersonCode]);
@@ -3701,25 +3705,26 @@
                 int InstrCode = CommonMotions.cnvInt(work[(int)ClickGetData.ConstructionInstructor]);
 
                 // •s–¾ˆÈŠO‚Íˆê’U•s‰ÂŽ‹‚É‚·‚é
-                dgv.Rows[LineCount].Visible = false;
-                dgv.Rows[LineCount].Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.UnVisible;
+                CurRow.Visible = false;
+                CurRow.Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.UnVisible;
 
                 // ‘�–±’S“–
                 if (m_UserInfo.m_GeneralAffairsFlg == (int)SecurityMaster.GeneAffDef.GeneralDep)
                 {
                     // •ÛŒì‹æ•ª”ÍˆÍ‚ÉŠÖŒW‚È‚­‘S•”��‚ÌŽQ�Æ‚ð‰Â”\‚Æ‚µ�A•Ò�W‰Â”\�€–Ú‚Í‘�–±•”–å“ü—Í—“‚Ì‚Ý‚Æ‚·‚é�B
-                    dgv.Rows[LineCount].Visible = true;
-                    dgv.Rows[LineCount].Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
+                    CurRow.Visible = true;
+                    CurRow.Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
                 }
                 // “Á•ÊŒ ŒÀ‚Ì�ê�‡
                 else if (m_UserInfo.m_Type == CommonDefine.SecurityRankPos.SpecialAuthority)
                 {
                     // •ÛŒì‹æ•ª”ÍˆÍ‚ÉŠÖŒW‚È‚­‘S•”��‚ÌŽQ�Æ‚ð‰Â”\‚Æ‚µ�A‘�–±•”–å“ü—Í—“ˆÈŠO‚Í•Ò�W‰Â”\‚Æ‚·‚é�B
-                    dgv.Rows[LineCount].Visible = true;
-                    dgv.Rows[LineCount].Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
+                    CurRow.Visible = true;
+                    CurRow.Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
                 }
                 // �Š‘®’·�A“�Š‡ŽÒ‚Ì�ê�‡
-                else if (m_UserInfo.m_Type == CommonDefine.SecurityRankPos.LimitedAuthority || m_UserInfo.m_Type == CommonDefine.SecurityRankPos.FreeAuthority)
+                else if (m_UserInfo.m_Type == CommonDefine.SecurityRankPos.LimitedAuthority
+                        || m_UserInfo.m_Type == CommonDefine.SecurityRankPos.FreeAuthority)
                 {
                     // ŽQ�Æ•”��‚É‚ ‚é‚©‚Ìƒ`ƒFƒbƒN
                     foreach (PersonDepartmentMaster RefDepRec in CommonMotions.LoginUserDepartment)
@@ -3727,8 +3732,8 @@
                         // Ž©•ª‚ªŒ ŒÀ‚ð•ÛŽ�‚·‚é•”��‚Ì�HŽ–‚Ì‚Ý•\Ž¦‚·‚é
                         if (RefDepRec.DepartmentCode != DepCode)
                         {
-                            dgv.Rows[LineCount].Visible = true;
-                            dgv.Rows[LineCount].Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
+                            CurRow.Visible = true;
+                            CurRow.Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
                         }
                     }
                 }
@@ -3740,8 +3745,8 @@
                         // ‰c‹Æ’S“–
                         if (CommonMotions.LoginUserData.PersonCode == SaleCode)
                         {
-                            dgv.Rows[LineCount].Visible = true;
-                            dgv.Rows[LineCount].Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
+                            CurRow.Visible = true;
+                            CurRow.Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
                         }
                         // �HŽ–’S“–
                         if (CommonMotions.LoginUserData.PersonCode == ConstrPersonCode
@@ -3748,8 +3753,8 @@
                             || CommonMotions.LoginUserData.PersonCode == SubPersonCode
                             || CommonMotions.LoginUserData.PersonCode == InstrCode)
                         {
-                            dgv.Rows[LineCount].Visible = true;
-                            dgv.Rows[LineCount].Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
+                            CurRow.Visible = true;
+                            CurRow.Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
                         }
                     }
                     else if (m_UserInfo.m_SecRange == ClsSecurityPermission.SecRangeType.OneDepartment)
@@ -3760,8 +3765,8 @@
                             // Ž©•ª‚ªŒ ŒÀ‚ð•ÛŽ�‚·‚é•”��‚Ì�HŽ–‚Ì‚Ý•\Ž¦‚·‚é
                             if (RefDepRec.DepartmentCode != DepCode)
                             {
-                                dgv.Rows[LineCount].Visible = true;
-                                dgv.Rows[LineCount].Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
+                                CurRow.Visible = true;
+                                CurRow.Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
                             }
                         }
                     }
@@ -3789,46 +3794,69 @@
                 int SelDepCode = GetDepartmentCode();
                 int SelPersonCode = GetConstrPersonCode();
 
+                // ----- �sƒf�[ƒ^
+                DataGridViewRow CurRow = dgv.Rows[LineCount];
                 // ‹ÆŽÒ�E�HŽ–ƒR�[ƒh
-                int CompCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[m_Company_Column].Value);
-                int ConstrCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[m_Genba_Column].Value);
+                int CompCode = CommonMotions.cnvInt(CurRow.Cells[m_Company_Column].Value);
+                int ConstrCode = CommonMotions.cnvInt(CurRow.Cells[m_Genba_Column].Value);
 
                 // �\�¿’S“–ŽÒ
-                int RowAppDepCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.TantoDepCode].Value);
-                int RowApprovalPersonCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.TantoShoninCode].Value);
+                int RowAppDepCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.TantoDepCode].Value);
+                int RowApprovalPersonCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.TantoShoninCode].Value);
 
                 // Še’S“–ŽÒƒR�[ƒh
-                int RowConstrPersonCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.ConstrPerson].Value);
-                int RowSalesPersonCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.SalesPerson].Value);
-                int RowAssistPersonCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.AssistPerson].Value);
-                int RowInstrPersonCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.InstrPerson].Value);
+                int RowConstrPersonCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.ConstrPerson].Value);
+                int RowSalesPersonCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.SalesPerson].Value);
+                int RowAssistPersonCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.AssistPerson].Value);
+                int RowInstrPersonCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.InstrPerson].Value);
 
                 // Še’S“–ŽÒ•”��
-                int RowConstrDepCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.ConstrDepCode].Value);
-                int RowSalesDepCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.SalesDepCode].Value);
-                int RowAssistDepCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.AssistDepCode].Value);
-                int RowInstrDepCode = CommonMotions.cnvInt(dgv.Rows[LineCount].Cells[(int)DispColumn.InstrDepCode].Value);
+                int RowConstrDepCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.ConstrDepCode].Value);
+                int RowSalesDepCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.SalesDepCode].Value);
+                int RowAssistDepCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.AssistDepCode].Value);
+                int RowInstrDepCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.InstrDepCode].Value);
 
                 // •s–¾‚Í•\Ž¦‚·‚é
                 if (CompCode == 0 || ConstrCode == 0) return;
 
                 // •s–¾ˆÈŠO‚Íˆê’U•s‰ÂŽ‹‚É‚·‚é
-                dgv.Rows[LineCount].Visible = false;
-                dgv.Rows[LineCount].Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.UnVisible;
+                CurRow.Visible = false;
+                CurRow.Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.UnVisible;
 
                 // ----- •”���E’S“–ŽÒ‚ªƒZƒbƒg‚³‚ê‚Ä‚¢‚é
-
-                if (RowApprovalPersonCode != 0)
-                {   // �\�¿�Ï‚Í�\�¿ŽÒ
-                    if (SelPersonCode != 0 && RowApprovalPersonCode != SelPersonCode) return;
+                if (SelDepCode != 0 && SelPersonCode != 0)
+                {
+                    if (RowApprovalPersonCode != 0)
+                    {   // �\�¿�Ï‚Í�\�¿ŽÒ
+                        // •”��
+                        if (RowAppDepCode != SelDepCode) return;
+                        // ’S“–ŽÒ
+                        if (RowApprovalPersonCode != SelPersonCode) return;
+                    }
+                    else if (RowApprovalPersonCode == 0)
+                    {   // �HŽ–’S“–ŽÒ
+                        // •”��
+                        if (RowConstrDepCode != SelDepCode) return;
+                        // ’S“–ŽÒ
+                        if (RowConstrPersonCode != SelPersonCode) return;
+                    }
                 }
-                else if (RowApprovalPersonCode == 0)
-                {   // �\�¿–¢‚Í‰c‹Æ�E’S“–ŽÒ�E•›’S“–ŽÒ�EŽw“±ˆõ
-
+                else if (SelDepCode != 0 && SelPersonCode == 0)
+                {
+                    if (RowApprovalPersonCode != 0)
+                    {   // �\�¿�Ï‚Í�\�¿ŽÒ
+                        // •”��
+                        if (RowAppDepCode != SelDepCode) return;
+                    }
+                    else if (RowApprovalPersonCode == 0)
+                    {   // �HŽ–’S“–ŽÒ
+                        // •”��
+                        if (RowConstrDepCode != SelDepCode) return;
+                    }
                 }
 
-                dgv.Rows[LineCount].Visible = true;
-                dgv.Rows[LineCount].Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
+                CurRow.Visible = true;
+                CurRow.Cells[(int)DispColumn.RowVisible].Value = (int)RowVisibleDef.Visible;
             }
             catch (Exception ex)
             {
@@ -4264,7 +4292,7 @@
         /// </summary>
         /// <param name="PaInfo"></param>
         /// <param name="sql"></param>
-        private void CreateSQLType2Exists(PaymentApprovalInfo PaInfo, ref StringBuilder sql)
+        private void CreateSQLType2Exists(ref StringBuilder sql)
         {
             try
             {
Index: branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 299)
+++ branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 300)
@@ -32,7 +32,7 @@
 // ã�™ã�¹ã�¦ã�®å€¤ã‚’æŒ‡å®šã�™ã‚‹ã�‹ã€�ä¸‹ã�®ã‚ˆã�†ã�« '*' ã‚’ä½¿ã�£ã�¦ãƒ“ãƒ«ãƒ‰ã�Šã‚ˆã�³ãƒªãƒ“ã‚¸ãƒ§ãƒ³ç•ªå�·ã‚’ 
 // æ—¢å®šå€¤ã�«ã�™ã‚‹ã�“ã�¨ã�Œã�§ã��ã�¾ã�™:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.11")]
-[assembly: AssemblyFileVersion("1.0.1.11")]
+[assembly: AssemblyVersion("1.0.1.12")]
+[assembly: AssemblyFileVersion("1.0.1.12")]
 // Log4netã‚’ä½¿ç”¨ã�™ã‚‹
 [assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]
\ No newline at end of file
