Index: branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 302)
+++ branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 303)
@@ -14,7 +14,7 @@
         /// <summary>
         /// æœ¬ä½“ãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
         /// </summary>
-        public static int s_SystemVersion = 116;
+        public static int s_SystemVersion = 118;
 
         /// <summary>
         /// ã‚³ãƒ”ãƒ¼ãƒ»ç’°å¢ƒãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs	(revision 302)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs	(revision 303)
@@ -4528,7 +4528,7 @@
                         // æ”¯æ‰•é‡‘é¡�ã�Œç„¡ã�„å ´å�ˆã�¯å‡¦ç�†ã�—ã�ªã�„
                         if (CommonMotions.cnvInt(wrkRow.Cells[i].Value) == 0) continue;
 
-                        SetRowToSQL(wrkRow, RowLineCnt, i, ref NewList);
+                        SetRowToSQL(wrkRow, (RowLineCnt * 10), i, ref NewList);
                     }
                 } // iRows
 
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/CreateNewTabPage.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/CreateNewTabPage.cs	(revision 302)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/CreateNewTabPage.cs	(revision 303)
@@ -1188,7 +1188,9 @@
                 NewPage.EntryTab.ResumeLayout(false);
                 NewPage.EntryTab.PerformLayout();
                 NewPage.BasePanel.ResumeLayout(false);
+                NewPage.BasePanel.PerformLayout();
                 this.TabCollections.ResumeLayout(false);
+                this.TabCollections.PerformLayout();
                 NewPage.EntryGroupBox[0].ResumeLayout(false);
                 NewPage.EntryGroupBox[0].PerformLayout();
                 NewPage.EntryGroupBox[1].ResumeLayout(false);
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPOConvert.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPOConvert.cs	(revision 302)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPOConvert.cs	(revision 303)
@@ -114,22 +114,29 @@
                 PurOrderDDB.connect(); PurOrderDDB.beginTran();
                 ExecDB.connect(); ExecDB.beginTran();
                 
-                if (!ConvertProc1(LedgerDDB, PurOrderDDB))
-                {
-                    LedgerDDB.rollback();
-                    PurOrderDDB.rollback();
-                    ExecDB.rollback();
-                    return;
-                }
+                //if (!ConvertProc1(LedgerDDB, PurOrderDDB))
+                //{
+                //    LedgerDDB.rollback();
+                //    PurOrderDDB.rollback();
+                //    ExecDB.rollback();
+                //    return;
+                //}
 
-                if (!ConvertProc2(ExecDB, LedgerDDB))
-                {
-                    LedgerDDB.rollback();
-                    PurOrderDDB.rollback();
-                    ExecDB.rollback();
-                    return;
-                }
+                //if (!ConvertProc2(ExecDB, LedgerDDB))
+                //{
+                //    LedgerDDB.rollback();
+                //    PurOrderDDB.rollback();
+                //    ExecDB.rollback();
+                //    return;
+                //}
 
+                //if (!ConvertProc3(ExecDB, LedgerDDB))
+                //{
+                //    LedgerDDB.rollback();
+                //    PurOrderDDB.rollback();
+                //    ExecDB.rollback();
+                //    return;
+                //}
             }
             catch (Exception ex)
             {
@@ -331,5 +338,121 @@
             }
         }
         #endregion
+
+        #region å¤‰æ�›å‡¦ç�†3
+        /// <summary>
+        /// å¤‰æ�›å‡¦ç�†2
+        /// </summary>
+        private bool ConvertProc3(IOConstructionLedgerExcute ExecDB, IOConstructionLedgerDetail LedgerDDB)
+        {
+            try
+            {
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append(" Where LineCount < 100");
+                strSQL.Append(" Order By ConstructionCode ASC, LineCount DESC");
+                List<ConstructionLedgerDetail> DList = new List<ConstructionLedgerDetail>();
+                LedgerDDB.SelectAction(strSQL.ToString(), ref DList, false);
+                if (DList.Count < 1) return false;
+
+                int nCnt = 1;
+                foreach (ConstructionLedgerDetail CurRec in DList)
+                {
+                    if (CurRec.ConstructionCode == 2016038501
+                    || CurRec.ConstructionCode == 2016005901
+                    || CurRec.ConstructionCode == 2016000801
+                    || CurRec.ConstructionCode == 2016017501
+                    || CurRec.ConstructionCode == 2015042601
+                    || CurRec.ConstructionCode == 2016054501
+                    || CurRec.ConstructionCode == 2016010901
+                    || CurRec.ConstructionCode == 2016061101
+                    || CurRec.ConstructionCode == 2016000501
+                    || CurRec.ConstructionCode == 2016057001
+                    || CurRec.ConstructionCode == 2016000401
+                    || CurRec.ConstructionCode == 2017000101
+                    || CurRec.ConstructionCode == 2016012701
+                    || CurRec.ConstructionCode == 2015035601
+                    || CurRec.ConstructionCode == 2016007201
+                        )
+                    {
+                    }
+                    else
+                    {
+                        continue;
+                    }
+
+                    strSQL.Clear();
+                    strSQL.Append(LedgerDDB.CreatePrimarykeyString(CurRec.ConstructionCode, CurRec.GroupCount, CurRec.LineCount));
+                    if (!LedgerDDB.UpdateFeild(strSQL.ToString()
+                                        , (int)IOConstructionLedgerDetail.TableColumn.LineCount
+                                        , (CurRec.LineCount * 10)
+                                        , false))
+                    {
+                        MessageBox.Show("æ³¨æ–‡æ›¸æ˜Žç´°ãƒ‡ãƒ¼ã‚¿ï¼šè¡Œç•ªå�·æ›´æ–°ã‚¨ãƒ©ãƒ¼");
+                        return false;
+                    }
+                    nCnt++;
+                }
+                lblCount04.Text = nCnt.ToString("0,0");
+                this.Refresh();
+
+                strSQL.Clear();
+                strSQL.Append(" Where LineCount < 100");
+                strSQL.Append(" Order by ConstructionCode ASC, LineCount DESC");
+                List<ConstructionLedgerExcute> DataList = new List<ConstructionLedgerExcute>();
+                ExecDB.SelectAction(strSQL.ToString(), ref DataList, false);
+                if (DataList.Count < 1) return false;
+
+                nCnt = 1;
+                foreach (ConstructionLedgerExcute CurRec in DataList)
+                {
+                    if (CurRec.ConstructionCode == 2016038501
+                    || CurRec.ConstructionCode == 2016005901
+                    || CurRec.ConstructionCode == 2016000801
+                    || CurRec.ConstructionCode == 2016017501
+                    || CurRec.ConstructionCode == 2015042601
+                    || CurRec.ConstructionCode == 2016054501
+                    || CurRec.ConstructionCode == 2016010901
+                    || CurRec.ConstructionCode == 2016061101
+                    || CurRec.ConstructionCode == 2016000501
+                    || CurRec.ConstructionCode == 2016057001
+                    || CurRec.ConstructionCode == 2016000401
+                    || CurRec.ConstructionCode == 2017000101
+                    || CurRec.ConstructionCode == 2016012701
+                    || CurRec.ConstructionCode == 2015035601
+                    || CurRec.ConstructionCode == 2016007201
+                        )
+                    {
+                    }
+                    else
+                    {
+                        continue;
+                    }
+
+                    strSQL.Clear();
+                    strSQL.Append(ExecDB.CreatePrimarykeyString(CurRec.ConstructionCode, CurRec.GroupCount, CurRec.LineCount, CurRec.ColumnCount));
+                    if (!ExecDB.UpdateFeild(strSQL.ToString()
+                                        , (int)IOConstructionLedgerExcute.TableColumn.LineCount
+                                        , (CurRec.LineCount * 10)
+                                        , false))
+                    {
+                        MessageBox.Show("æ³¨æ–‡æ›¸å®Ÿè¡Œãƒ‡ãƒ¼ã‚¿ï¼šåˆ—ä½�ç½®æ›´æ–°ã‚¨ãƒ©ãƒ¼");
+                        return false;
+                    }
+                    nCnt++;
+                }
+
+
+                lblCount05.Text = nCnt.ToString("0,0");
+                this.Refresh();
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+        }
+        #endregion
     }
 }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs	(revision 302)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs	(revision 303)
@@ -840,8 +840,8 @@
                     strSQL.Append("   And B.DetailCount = A.SourceDetailCnt");
                     
                     strSQL.Append(DetailDB.CreatePrimarykeyString(OrderRec.ConstructionCode, OrderRec.SeqNo, -1, 0, "A."));
-                    strSQL.AppendFormat(" And A.GroupCount in ({0}, {1})", (int)PurchaseOrderDetail.GroupCountDef.Detail
-                                                                        , (int)PurchaseOrderDetail.GroupCountDef.StatutoryWelfare);
+                    //strSQL.AppendFormat(" And A.GroupCount in ({0}, {1})", (int)PurchaseOrderDetail.GroupCountDef.Detail
+                    //                                                    , (int)PurchaseOrderDetail.GroupCountDef.StatutoryWelfare);
 
                     strSQL.Append(" ORDER BY A.GroupCount ASC, A.LineCount ASC");
                     DetailData.Clear();
@@ -2154,7 +2154,7 @@
                 // æ®‹ã�£ã�Ÿæ˜Žç´°è¡Œã‚’ç¢ºèª�ã�™ã‚‹
                 int nDataCnt = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispDetailGridColumn.DataType].Value)
                                                                                 == (int)PurchaseOrderDetail.DataTypeFlagDef.CommonData
-                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispDetailGridColumn.PriceValue].Value) != 0)
+                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispDetailGridColumn.LedgerDetailNo].Value) > 0)
                                                                 .Count();
                 if (nDataCnt < 1)
                 {
@@ -2339,6 +2339,7 @@
 
                 // ãƒ‡ãƒ¼ã‚¿ç·¨é›†ã�«é–¢ã�™ã‚‹ãƒœã‚¿ãƒ³ã‚’é�žè¡¨ç¤ºã�«ã�™ã‚‹
                 panel2.Enabled = false;
+                btnLineDelete.Visible = false;                      // è¡Œå‰Šé™¤ãƒœã‚¿ãƒ³
                 btnDataEntry.Visible = false;                       // ç™»éŒ²ãƒœã‚¿ãƒ³
                 btnDataDelete.Visible = false;                      // å‰Šé™¤ãƒœã‚¿ãƒ³
                 btnDispUp.Visible = false;                          // è¡Œã‚¢ãƒƒãƒ—ãƒœã‚¿ãƒ³
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs	(revision 302)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs	(revision 303)
@@ -648,34 +648,7 @@
 
                 // �³”Fƒ{ƒ^ƒ“‚Ì•\Ž¦�§Œä
                 ApprovalDispControl();
-                //// �\�¿�E�³”F•\Ž¦�ˆ—�
-                //InitApprovalDisplay();
 
-                //// �³”F‰æ–Ê‚Ì�u�³”F‘Î�Ûƒf�[ƒ^‚ðŒ©‚é�v‚©‚ç‚Ì‹N“®Žž‚Í�³”Fƒ{ƒ^ƒ“‚Ì•\Ž¦‚ª‚ ‚é
-                //bool bApproval = ClsApprovalPermission.ExceApprovalScreen((int)ClsExcute.SubFormExecuteNo.ApprovalPerson);
-                //if (bApproval)
-                //{
-                //    // �³”F‘Î�ÛƒR�[ƒh‚ðŽæ“¾‚·‚é
-                //    int ApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals(s_MyProcessName[m_Labourkind])).Key;
-                //    // �HŽ–ˆÄŒ�‚ÌŠÇ—�•”��‚ðŽæ“¾‚·‚é
-                //    //int DepartmentCode = ClsApprovalPermission.GetFromPersonAndApprovalTheDepartment(m_PersonCode, ApprovalCode, m_CreateDate, m_SeqNo);
-                //    int DepartmentCode = CommonMotions.LoginUserData.DepartmentCode;
-                //    // ˆÄŒ�‚É‘Î‚µ‚Ä�\�¿‚ª‚³‚ê‚Ä‚¢‚é‚©‚ðŠm”F‚·‚é
-                //    bool Pettition = false;
-                //    if (!m_FirstFlg)
-                //    {
-                //        //Pettition = ClsApprovalPermission.CheckPersonPetition2(m_PaInfo.ApprovalPerson, ApprovalCode, m_PaInfo.ApprovalDate, (int)CommonDefine.s_Default_OrderNo);
-                //        Pettition = ClsApprovalPermission.CheckPersonPetition(m_PaymentPersonCode, ApprovalCode, m_OrderDate, (int)CommonDefine.s_Default_OrderNo);
-                //    }
-                //    // ƒ�ƒOƒCƒ“ŽÒ‚ª�³”FŽÒ‚©‚ðŠm”F‚·‚é
-                //    bool Approvaler = ClsApprovalPermission.CheckUserForApprover(ApprovalCode, DepartmentCode);
-                //    // �\�¿’†‚Åƒ�ƒOƒCƒ“ŽÒ‚ª�³”FŽÒ‚Ì�ê�‡‚Í�³”Fƒ{ƒ^ƒ“‚ð•\Ž¦‚·‚é
-                //    if (Pettition && Approvaler)
-                //    {
-                //        pnlApprovalButton.Visible = true;
-                //    }
-                //}
-
                 m_initDataLoad = false;
             }
             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 302)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs	(revision 303)
@@ -2756,28 +2756,25 @@
 
                 // �³”F‰æ–Ê‚Ì�u�³”F‘Î�Ûƒf�[ƒ^‚ðŒ©‚é�v‚©‚ç‚Ì‹N“®Žž‚Í�³”Fƒ{ƒ^ƒ“‚Ì•\Ž¦‚ª‚ ‚é
                 bool bApproval = ClsApprovalPermission.ExceApprovalScreen((int)ClsExcute.SubFormExecuteNo.ApprovalPerson);
-                if (bApproval)
+                if (!bApproval) return;
+
+                // �³”F‘Î�ÛƒR�[ƒh‚ðŽæ“¾‚·‚é
+                int ApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals(s_MyProcessName[m_Labourkind])).Key;
+                // �HŽ–ˆÄŒ�‚ÌŠÇ—�•”��‚ðŽæ“¾‚·‚é
+                int DepartmentCode = CommonMotions.LoginUserData.DepartmentCode;
+                // ˆÄŒ�‚É‘Î‚µ‚Ä�\�¿‚ª‚³‚ê‚Ä‚¢‚é‚©‚ðŠm”F‚·‚é
+                bool Pettition = false;
+                if (!m_FirstFlg)
                 {
-                    // �³”F‘Î�ÛƒR�[ƒh‚ðŽæ“¾‚·‚é
-                    int ApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals(s_MyProcessName[m_Labourkind])).Key;
-                    // �HŽ–ˆÄŒ�‚ÌŠÇ—�•”��‚ðŽæ“¾‚·‚é
-                    //int DepartmentCode = ClsApprovalPermission.GetFromPersonAndApprovalTheDepartment(m_PersonCode, ApprovalCode, m_CreateDate, m_SeqNo);
-                    int DepartmentCode = CommonMotions.LoginUserData.DepartmentCode;
-                    // ˆÄŒ�‚É‘Î‚µ‚Ä�\�¿‚ª‚³‚ê‚Ä‚¢‚é‚©‚ðŠm”F‚·‚é
-                    bool Pettition = false;
-                    if (!m_FirstFlg)
-                    {
-                        //Pettition = ClsApprovalPermission.CheckPersonPetition2(m_PaInfo.ApprovalPerson, ApprovalCode, m_PaInfo.ApprovalDate, (int)CommonDefine.s_Default_OrderNo);
-                        Pettition = ClsApprovalPermission.CheckPersonPetition(m_PaymentPersonCode, ApprovalCode, m_OrderDate, (int)CommonDefine.s_Default_OrderNo);
-                    }
-                    // ƒ�ƒOƒCƒ“ŽÒ‚ª�³”FŽÒ‚©‚ðŠm”F‚·‚é
-                    bool Approvaler = ClsApprovalPermission.CheckUserForApprover(ApprovalCode, DepartmentCode);
-                    // �\�¿’†‚Åƒ�ƒOƒCƒ“ŽÒ‚ª�³”FŽÒ‚Ì�ê�‡‚Í�³”Fƒ{ƒ^ƒ“‚ð•\Ž¦‚·‚é
-                    if (Pettition && Approvaler)
-                    {
-                        pnlApprovalButton.Visible = true;
-                    }
+                    Pettition = ClsApprovalPermission.CheckPersonPetition(m_PaymentPersonCode, ApprovalCode, m_OrderDate, (int)CommonDefine.s_Default_OrderNo);
                 }
+                // ƒ�ƒOƒCƒ“ŽÒ‚ª�³”FŽÒ‚©‚ðŠm”F‚·‚é
+                bool Approvaler = ClsApprovalPermission.CheckUserForApprover(ApprovalCode, DepartmentCode);
+                // �\�¿’†‚Åƒ�ƒOƒCƒ“ŽÒ‚ª�³”FŽÒ‚Ì�ê�‡‚Í�³”Fƒ{ƒ^ƒ“‚ð•\Ž¦‚·‚é
+                if (Pettition && Approvaler)
+                {
+                    pnlApprovalButton.Visible = true;
+                }
             }
             catch (Exception ex)
             {
Index: branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 302)
+++ branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 303)
@@ -32,7 +32,7 @@
 // ã�™ã�¹ã�¦ã�®å€¤ã‚’æŒ‡å®šã�™ã‚‹ã�‹ã€�ä¸‹ã�®ã‚ˆã�†ã�« '*' ã‚’ä½¿ã�£ã�¦ãƒ“ãƒ«ãƒ‰ã�Šã‚ˆã�³ãƒªãƒ“ã‚¸ãƒ§ãƒ³ç•ªå�·ã‚’ 
 // æ—¢å®šå€¤ã�«ã�™ã‚‹ã�“ã�¨ã�Œã�§ã��ã�¾ã�™:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.16")]
-[assembly: AssemblyFileVersion("1.0.1.16")]
+[assembly: AssemblyVersion("1.0.1.18")]
+[assembly: AssemblyFileVersion("1.0.1.18")]
 // Log4netã‚’ä½¿ç”¨ã�™ã‚‹
 [assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]
\ No newline at end of file
