Index: branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 317)
+++ branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 318)
@@ -14,7 +14,7 @@
         /// <summary>
         /// æœ¬ä½“ãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
         /// </summary>
-        public static int s_SystemVersion = 139;
+        public static int s_SystemVersion = 140;
 
         /// <summary>
         /// ã‚³ãƒ”ãƒ¼ãƒ»ç’°å¢ƒãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.designer.cs	(revision 317)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.designer.cs	(revision 318)
@@ -189,6 +189,8 @@
             this.panel1.Anchor = System.Windows.Forms.AnchorStyles.Top;
             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.pnlApproval);
+            this.panel1.Controls.Add(this.pnlApprovalButton);
             this.panel1.Controls.Add(this.lblLabel06);
             this.panel1.Controls.Add(this.label23);
             this.panel1.Controls.Add(this.pnlGroup2);
@@ -200,9 +202,7 @@
             this.panel1.Controls.Add(this.label19);
             this.panel1.Controls.Add(this.label21);
             this.panel1.Controls.Add(this.label15);
-            this.panel1.Controls.Add(this.pnlApproval);
             this.panel1.Controls.Add(this.label18);
-            this.panel1.Controls.Add(this.pnlApprovalButton);
             this.panel1.Controls.Add(this.label17);
             this.panel1.Controls.Add(this.label16);
             this.panel1.Controls.Add(this.lblConstructionCodelabel);
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRList/FrmDRListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRList/FrmDRListAuxiliary.cs	(revision 317)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRList/FrmDRListAuxiliary.cs	(revision 318)
@@ -83,7 +83,7 @@
                 ClsExcute.ClearSaveParameter(NowPoint);
                 // ----- ‰æ–Ê�î•ñ‘Þ”ð
                 // ŒŸ�õ”N
-                ClsExcute.ProcControlPara[NowPoint].IntSaveParameter.Add(CommonMotions.cnvInt(numUDConstPro.Value));
+                ClsExcute.ProcControlPara[NowPoint].StringSaveParameter.Add(numUDConstPro.Value.ToString());
                 // ’S“–•”��
                 int depCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
                 ClsExcute.ProcControlPara[NowPoint].IntSaveParameter.Add(depCode);
@@ -361,18 +361,16 @@
                 strSub1.Append(", D.DEPARTMENTSTRING");
                 strSub1.Append(", D.DISPLAYORDER");
                 strSub1.Append(", C.DISPLAYORDER");
-                
-                // strSub1.Append(", E.COMPLATEFLG"); 2017/10/30 ‘ä’ ‚ª�o—ˆ‚Ä‚È‚­‚Ä‚à“ü—Í‚Å‚«‚é‚æ‚¤‚É‚·‚é
-                strSub1.Append(", 0");
 
+                strSub1.Append(", 0 As COMPLATEFLG");
+
                 strSub1.Append(" FROM CONSTRUCTIONBASEINFO A");
                 strSub1.Append(", CONSTRUCTIONBASEINFODETAIL B");
                 strSub1.Append(", PERSONINCHARGEMASTER C");
                 strSub1.Append(", DEPARTMENTMASTER D");
 
-                // strSub1.Append(", CONSTRUCTIONLEDGER E"); 2017/10/30 ‘ä’ ‚ª�o—ˆ‚Ä‚È‚­‚Ä‚à“ü—Í‚Å‚«‚é‚æ‚¤‚É‚·‚é
+                strSub1.Append(" WHERE NOT EXISTS (SELECT * FROM PROCEEDINGSDATA Z WHERE Z.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE)");
                 
-                strSub1.Append(" WHERE NOT EXISTS (SELECT * FROM PROCEEDINGSDATA Z WHERE Z.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE)");
                 strSub1.AppendFormat(" And A.TyingFlg != {0}", (int)ConstructionBaseInfo.TyingFlgDef.Tying);
 
                 // �¿‹�Šm”FˆÈ�~‚Í‘Î�ÛŠO
@@ -393,17 +391,35 @@
 
                 strSub1.AppendFormat(" AND A.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
                 strSub1.Append(" AND C.DEPARTMENTCODE = D.DEPARTMENTCODE");
-                // strSub1.Append(" AND E.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE"); 2017/10/30 ‘ä’ ‚ª�o—ˆ‚Ä‚È‚­‚Ä‚à“ü—Í‚Å‚«‚é‚æ‚¤‚É‚·‚é
                 // “ü—Í‚³‚ê‚½�HŽ–“ú•ñ‚ª‚ ‚é�HŽ–
-                strSub2.Append(" UNION (SELECT A.CONSTRUCTIONCODE, B.DETAILSTRING , D.PERSONCODE, D.PERSONNAME, MAX(DATE_FORMAT(C.PROCEEDINGSDATADATE,'%Y/%m/%d'))");
-                strSub2.Append(" , E.DEPARTMENTCODE, E.DEPARTMENTSTRING, E.DISPLAYORDER, D.DISPLAYORDER, F.COMPLATEFLG");
-                strSub2.Append(" FROM CONSTRUCTIONBASEINFO A, CONSTRUCTIONBASEINFODETAIL B, PROCEEDINGSDATA C, PERSONINCHARGEMASTER D, DEPARTMENTMASTER E, CONSTRUCTIONLEDGER F");
+                strSub2.Append(" UNION (");
+                strSub2.Append("   SELECT");
+                strSub2.Append("     A.CONSTRUCTIONCODE");
+                strSub2.Append("     , B.DETAILSTRING");
+                strSub2.Append("     , D.PERSONCODE");
+                strSub2.Append("     , D.PERSONNAME");
+                strSub2.Append("     , MAX(DATE_FORMAT(C.PROCEEDINGSDATADATE, '%Y/%m/%d'))");
+                strSub2.Append("     , E.DEPARTMENTCODE");
+                strSub2.Append("     , E.DEPARTMENTSTRING");
+                strSub2.Append("     , E.DISPLAYORDER");
+                strSub2.Append("     , D.DISPLAYORDER");
+                strSub2.Append("     , F.COMPLATEFLG As COMPLATEFLG");
+                strSub2.Append("   FROM");
+                strSub2.Append("     CONSTRUCTIONBASEINFO A");
+                strSub2.Append("     Inner Join CONSTRUCTIONBASEINFODETAIL B");
+                strSub2.Append("       ON A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE");
+                strSub2.AppendFormat(" AND B.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
+                strSub2.Append("     left join CONSTRUCTIONLEDGER F");
+                strSub2.Append("       on F.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE");
+                strSub2.Append("     , PROCEEDINGSDATA C");
+                strSub2.Append("     , PERSONINCHARGEMASTER D");
+                strSub2.Append("     , DEPARTMENTMASTER E");
+
                 strSub2.AppendFormat(" WHERE A.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
                 // ’S“–ŽÒ‘I‘ð‚ª‚ ‚é�ê�‡
                 if (PersonCode > 0)
                     strSub2.AppendFormat(" AND (A.ConstructionPersonCode = {0} OR A.ConstructionInstructor = {0} OR A.ConstrSubPersonCode = {0})", PersonCode);
 
-                strSub2.AppendFormat(" AND (A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE AND B.DETAILNO = {0})", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
                 strSub2.Append(" AND A.CONSTRUCTIONCODE = C.CONSTRUCTIONCODE");
                 strSub2.Append(" AND D.PERSONCODE = A.CONSTRUCTIONPERSONCODE");
                 // •”��‘I‘ð‚ª‚ ‚éŽž
@@ -410,12 +426,22 @@
                 if (DepartmentCode > 0)
                     strSub2.AppendFormat(" AND D.DEPARTMENTCODE = {0}", DepartmentCode);
                 strSub2.Append(" AND D.DEPARTMENTCODE = E.DEPARTMENTCODE");
-                strSub2.Append(" AND F.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE");
 
-                strSQL.Append(strSub1.ToString() + strSecurity.ToString() + strSub2.ToString() + strSecurity.ToString());
-                strSQL.Append(" GROUP BY A.CONSTRUCTIONCODE, B.DETAILSTRING, D.PERSONCODE, D.PERSONNAME, E.DEPARTMENTCODE, E.DEPARTMENTSTRING, E.DISPLAYORDER, D.DISPLAYORDER, F.COMPLATEFLG)");
+                strSQL.Append(strSub1.ToString());
+                strSQL.Append(strSecurity.ToString());
+                strSQL.Append(strSub2.ToString());
+                strSQL.Append(strSecurity.ToString());
+                strSQL.Append(" GROUP BY A.CONSTRUCTIONCODE");
+                strSQL.Append(", B.DETAILSTRING");
+                strSQL.Append(" , D.PERSONCODE");
+                strSQL.Append(" , D.PERSONNAME");
+                strSQL.Append(" , E.DEPARTMENTCODE");
+                strSQL.Append(" , E.DEPARTMENTSTRING");
+                strSQL.Append(" , E.DISPLAYORDER");
+                strSQL.Append(" , D.DISPLAYORDER");
+                strSQL.Append(" , F.COMPLATEFLG)");
                 // Order by •t��
-                strSQL.Append(" ORDER BY 10 ASC, 8 ASC, 9 ASC, 6 ASC, 7 ASC, 3 ASC");
+                strSQL.Append(" ORDER BY ifnull(COMPLATEFLG, 0) ASC, 8 ASC, 9 ASC, 6 ASC, 7 ASC, 3 ASC");
 
             }
             catch (Exception ex)
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs	(revision 317)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs	(revision 318)
@@ -1186,25 +1186,15 @@
                 int nConstrCode = CommonMotions.cnvInt(CurRow.Cells[m_Genba_Column].Value);
 
                 // ----- ƒ_ƒCƒAƒ�ƒO•\Ž¦ƒpƒ‰ƒ�ƒ^ƒZƒbƒg
+                // ‹N“®Œ³ƒZƒbƒg
+                frm.StartupSource = (int)ClsExcute.ProcessExecuteNo.RequestSummaryList;
+                // �HŽ–”Ô�†ƒZƒbƒg
                 frm.ConstructionCode = CommonMotions.cnvInt(CurRow.Cells[m_Genba_Column].Value);
-                frm.StartupSource = (int)ClsExcute.ProcessExecuteNo.RequestSummaryList;
+                // Žx•¥‹æ•ªƒZƒbƒg
                 frm.SelectLabourKind = m_Labourkind;
-
-                // Œ»�ê’PˆÊ“ü—Í‚Í•s–¾ƒ{ƒ^ƒ“•\Ž¦
-                if (rdbProject.Checked)
-                {   // Œ»�ê•s–¾‚Ì�ê�‡‚Íƒ_ƒCƒAƒ�ƒO‚ð•\Ž¦‚µ‚È‚¢
-                    if (nConstrCode < 0)
-                    {
-                        MessageBox.Show("Œ»�ê‚ª“ü—Í‚³‚ê‚Ä‚¢‚È‚¢‚Ì‚Å�A‹ÆŽÒ‚ð‘I‘ð‚Å‚«‚Ü‚¹‚ñ�B",
-                                        "‘I‘ð•s”\ƒ�ƒbƒZ�[ƒW",
-                                        MessageBoxButtons.OK,
-                                        MessageBoxIcon.Error);
-                        return;
-                    }
-                    frm.DispAddUnknown = true;
-                }
-
-                // •s–¾‚Ì‘Î�ˆ‚ÅƒR�[ƒh‚ðƒZƒbƒg‚·‚é
+                // •s–¾ƒ{ƒ^ƒ“•\Ž¦
+                frm.DispAddUnknown = true;
+                // •s–¾‚Ì‘Î�ˆ‚Å‹ÆŽÒƒR�[ƒh‚ðƒZƒbƒg‚·‚é
                 frm.SelectData.CompanyCode = nCompanyCode;
 
                 // ‹¦—Í‰ïŽÐ‘I‘ð•\Ž¦
@@ -1228,16 +1218,6 @@
 
                 int[] nRowCol = new int[2];
                 Array.Clear(nRowCol, 0, nRowCol.Length);
-                // •s–¾‘I‘ðŽžˆÈŠO‚Í‘ä’ •\Ž¦‚·‚é
-                if (!DialogResult.Yes.Equals(frm.EndButton))
-                {
-                    if (!DispSelectLedger(selRec.CompanyCode, nConstrCode, frm2, ref nRowCol))
-                    {
-                        // ‘I‘ð–³‚µ‚ÍƒNƒŠƒA
-                        selRec = new SubContractorMaster();
-                    }
-                }
-                
                 if (rdbCompany.Checked)
                 {
                     // ----- ‹ÆŽÒ
@@ -1245,6 +1225,12 @@
                 }
                 else
                 {
+                    // ‹ÆŽÒ•s–¾ˆÈŠO‚Í‘ä’ •\Ž¦
+                    if (selRec.CompanyCode > 0)
+                    {
+                        // ‘ä’ ‚æ‚è�s‚ð‘I‘ð
+                        DispSelectLedger(selRec.CompanyCode, nConstrCode, frm2, ref nRowCol);
+                    }
                     // ----- Œ»�ê
                     InsdgvProject2Project(selRec, nRowCol);
                 }
@@ -1272,7 +1258,7 @@
             int No = 0;
             try
             {
-                // Šù‚É‘I‘ð‚³‚ê‚Ä‚¢‚é‹ÆŽÒ‚ð”»’è‚·‚é
+                // ƒ_ƒCƒAƒ�ƒO‚Å‘I‘ð‚³‚ê‚½‹ÆŽÒ‚ªŠù‚É‚ ‚ê‚ÎŽæ“¾‚·‚é
                 DataGridViewRow[] rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == selRec.CompanyCode
                                                                                 && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == (int)RowVisibleDef.Visible
                                                                                 && cnvRowState(x.Cells[(int)DispColumn.RowState].Value) != DataRowState.Deleted)
@@ -2158,7 +2144,7 @@
                 DataGridViewRow[] ExistenceData = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == CompanyCode
                                                                                             && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×
                                                                                             && cnvRowState(x.Cells[(int)DispColumn.RowState].Value) != DataRowState.Added)
-                                                                                .ToArray();
+                                                                                            .ToArray();
 
                 if (ExistenceData.Count() == 0)
                 {
@@ -2166,7 +2152,7 @@
 
                     DataGridViewRow[] Rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == CompanyCode
                                                                                     && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.–¾�×)
-                            .ToArray();
+                                                                                    .ToArray();
                     int escSeqNo = 0;
                     int LineCount = 1;
                     foreach (DataGridViewRow r in Rows)
Index: branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmInputComment.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmInputComment.cs	(revision 317)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmInputComment.cs	(revision 318)
@@ -249,7 +249,7 @@
                 if (m_EndButton == DialogResult.None) m_EndButton = DialogResult.No;
             }
             // å‰�ãƒ—ãƒ­ã‚»ã‚¹ã�«æˆ»ã‚‹
-            ClsExcute.BackProcess();
+            //ClsExcute.BackProcess();
         }
         #endregion
 
Index: branches/src/ProcessManagement/ProcessManagement/ProcessManage.xlsx
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 317)
+++ branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 318)
@@ -32,7 +32,7 @@
 // ã�™ã�¹ã�¦ã�®å€¤ã‚’æŒ‡å®šã�™ã‚‹ã�‹ã€�ä¸‹ã�®ã‚ˆã�†ã�« '*' ã‚’ä½¿ã�£ã�¦ãƒ“ãƒ«ãƒ‰ã�Šã‚ˆã�³ãƒªãƒ“ã‚¸ãƒ§ãƒ³ç•ªå�·ã‚’ 
 // æ—¢å®šå€¤ã�«ã�™ã‚‹ã�“ã�¨ã�Œã�§ã��ã�¾ã�™:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.39")]
-[assembly: AssemblyFileVersion("1.0.1.39")]
+[assembly: AssemblyVersion("1.0.1.40")]
+[assembly: AssemblyFileVersion("1.0.1.40")]
 // Log4netã‚’ä½¿ç”¨ã�™ã‚‹
 [assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]
\ No newline at end of file
