Index: trunk/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 115)
+++ trunk/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 116)
@@ -14,7 +14,7 @@
         /// <summary>
         /// æœ¬ä½“ãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
         /// </summary>
-        public static int s_SystemVersion = 25;
+        public static int s_SystemVersion = 26;
 
         /// <summary>
         /// ã‚³ãƒ”ãƒ¼ãƒ»ç’°å¢ƒãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
Index: trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsChangeBaseInfoData.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsChangeBaseInfoData.cs	(revision 115)
+++ trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsChangeBaseInfoData.cs	(revision 116)
@@ -103,7 +103,7 @@
             IOPurchaseOrderDetail DB18 = new IOPurchaseOrderDetail();               // æ³¨æ–‡æ›¸æ˜Žç´°ãƒ‡ãƒ¼ã‚¿
 
             IOProceedingsData DB19 = new IOProceedingsData();                       // ç™ºæ³¨è€…æ‰“ã�¡å�ˆã‚�ã�›è­°äº‹éŒ²ãƒ‡ãƒ¼ã‚¿
-            IOProceedingsDataAttend DB20 = new IOProceedingsDataAttend();       // ç™ºæ³¨è€…æ‰“ã�¡å�ˆã‚�ã�›è­°äº‹éŒ²ãƒ‡ãƒ¼ã‚¿ï¼ˆå‡ºå¸­è€…ï¼‰
+            IOProceedingsDataAttend DB20 = new IOProceedingsDataAttend();           // ç™ºæ³¨è€…æ‰“ã�¡å�ˆã‚�ã�›è­°äº‹éŒ²ãƒ‡ãƒ¼ã‚¿ï¼ˆå‡ºå¸­è€…ï¼‰
             IOProceedingsDataDetail DB21 = new IOProceedingsDataDetail();           // ç™ºæ³¨è€…æ‰“ã�¡å�ˆã‚�ã�›è­°äº‹éŒ²ãƒ‡ãƒ¼ã‚¿ï¼ˆæ˜Žç´°ï¼‰
             IODailyDataConstruction DB22 = new IODailyDataConstruction();           // æ—¥å ±ãƒ‡ãƒ¼ã‚¿
             IODailyDataDetail DB23 = new IODailyDataDetail();                       // æ—¥å ±ãƒ‡ãƒ¼ã‚¿ (æ˜Žç´°)
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/DataChange.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/DataChange.cs	(revision 115)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/DataChange.cs	(revision 116)
@@ -1198,8 +1198,8 @@
                 DetailRec.SecondString = string.Empty;                                      // �HŽ–“à—e
                 DetailRec.CompanyType = (int)CommonDefine.CodeDataType.Person;              // ‹¦—Í‰ïŽÐƒR�[ƒhƒ^ƒCƒv
                 DetailRec.CompanyCode = ConstructorCode;                                    // ‹¦—Í‰ïŽÐƒR�[ƒh
-                DetailRec.ExecutionAmount = ExecutionAmount;                                // ŽÀ�s‹àŠz
-                DetailRec.AmountConfigRate = AmountConfigRate;                              // ‹àŠz�\�¬—¦
+                //DetailRec.ExecutionAmount = ExecutionAmount;                                // ŽÀ�s‹àŠz
+                //DetailRec.AmountConfigRate = AmountConfigRate;                              // ‹àŠz�\�¬—¦
 
                 DetailRec.SalaryFlg = (int)CommonDefine.SalaryDevision.All;                 // ‹‹—^�U•ª‹æ•ª
                 DetailRec.SalaryDays = workingCount;                                        // ‹‹—^�U•ª“ú�”
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssListAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssListAuxiliary.cs	(revision 115)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssListAuxiliary.cs	(revision 116)
@@ -1387,6 +1387,12 @@
                 // ----- �HŽ–�Ú�×‘ä’ Žæ“¾
                 if (!LedgerDB.ExecuteReader(strSQL, ref arData)) return;
 
+                // •”��‚²‚Æˆê——‚Ì�ê�‡‚Í‘Þ�EŽÒ‚Å‚àƒf�[ƒ^‚ª‚ ‚ê‚Î•\Ž¦‚·‚é
+                if (DispType== (int)DispDataTypeCode.Department)
+                {
+                    GetType2DeleteData(LedgerDB, ref arData);
+                }
+
                 // “Ç�žŽžƒf�[ƒ^ƒJƒEƒ“ƒgŽæ“¾
                 m_initDataCount = arData.Count;
                 if (arData.Count == 0) return;
@@ -1548,7 +1554,7 @@
                 strSQL += " DEPARTMENTMASTER D";
                 strSQL += " WHERE B.CONSTRUCTIONPERSONCODE = C.PERSONCODE";
                 strSQL += " AND C.DEPARTMENTCODE = D.DEPARTMENTCODE";
-                strSQL += " AND C.DELETEFLG = 0";
+                //strSQL += " AND C.DELETEFLG = 0";
 
                 strSQL += " GROUP BY  C.DEPARTMENTCODE, D.DEPARTMENTSTRING, D.DISPLAYORDER";
                 strSQL += " ORDER BY 3 ASC";
@@ -1598,7 +1604,7 @@
                 strSQL += " LEFT JOIN CONSTRUCTIONLEDGER A ON A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE";
                 strSQL += string.Format(" WHERE C.DEPARTMENTCODE = {0}", DepCode);
                 strSQL += " AND C.DELETEFLG = 0";
-                strSQL += string.Format(" AND C.EMPLOYEECLASSFLG = {0}", (int)CommonDefine.EmployeeClassFlg.Regular);
+                //strSQL += string.Format(" AND C.EMPLOYEECLASSFLG = {0}", (int)CommonDefine.EmployeeClassFlg.Regular);
                 strSQL += " GROUP BY C.DISPLAYORDER, C.PERSONCODE, C.PERSONNAME, C.EMPLOYEECLASSFLG";
                 strSQL += " ORDER BY 11, 3 ASC";
 
@@ -1610,6 +1616,64 @@
         }
         #endregion
 
+        #region •”��‚²‚Æ‚Ìˆê——ƒf�[ƒ^‚Å’S“–ŽÒ‚Ìƒf�[ƒ^‚ð’Ç‰Á‚ÅŽæ“¾‚·‚é
+        /// <summary>
+        /// •”��‚²‚Æ‚Ìˆê——ƒf�[ƒ^‚Å’S“–ŽÒ‚Ìƒf�[ƒ^‚ð’Ç‰Á‚ÅŽæ“¾‚·‚é
+        /// </summary>
+        private void GetType2DeleteData(IOConstructionLedger LedgerDB, ref ArrayList arData)
+        {
+            string strSQL = string.Empty;
+            try
+            {
+                // SQL‚ÉƒAƒNƒZƒX�§ŒÀ‚ð‚©‚¯‚é
+                string strSecurity = string.Empty;
+                CreateSecuritySQL(ref strSecurity);
+
+                int NotOrder = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("”ñ Žó ’�")).Key;
+                int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
+                // ----- ‚r‚p‚k�ì�¬
+                // ‘¶�Ý�Ú�×‘ä’ ƒf�[ƒ^ŒŸ�õ
+                strSQL = "SELECT";
+
+                strSQL += " C.PERSONCODE";
+                strSQL += " ,C.PERSONNAME";
+                strSQL += " ,C.DISPLAYORDER";
+                strSQL += " ,SUM(A.ORDERSDECISIONPRICE)";
+                strSQL += " ,SUM(A.COMPANYEXPENSES)";
+                strSQL += " ,SUM(A.DEPARTMENTEXPENSES)";
+                strSQL += " ,SUM(A.SALESEXPENSES)";
+                strSQL += " ,SUM(A.TOTALPAYMENT)";
+                strSQL += " ,SUM(A.GROSSPROFIT)";
+                strSQL += " ,SUM(A.NETPROFIT)";
+                strSQL += " ,C.EMPLOYEECLASSFLG";
+
+                strSQL += " FROM PERSONINCHARGEMASTER C";
+                strSQL += " LEFT JOIN CONSTRUCTIONBASEINFO B ON B.CONSTRUCTIONPERSONCODE = C.PERSONCODE";
+                strSQL += string.Format(" AND B.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
+                strSQL += string.Format(" AND B.CONSTRUCTIONSTATUSFLG != {0}", NotOrder);
+                strSQL += string.Format(" AND B.TyingFlg != {0}", (int)CommonDefine.BaseInfoTyingFlg.Tying);
+
+                strSQL += ", CONSTRUCTIONLEDGER A";
+                //strSQL += " LEFT JOIN CONSTRUCTIONLEDGER A ON A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE";
+
+                strSQL += string.Format(" WHERE C.DEPARTMENTCODE = {0}", DepCode);
+                strSQL += " AND A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE";
+
+                strSQL += " AND C.DELETEFLG != 0";
+                //strSQL += string.Format(" AND C.EMPLOYEECLASSFLG = {0}", (int)CommonDefine.EmployeeClassFlg.Regular);
+
+                strSQL += " GROUP BY C.DISPLAYORDER, C.PERSONCODE, C.PERSONNAME, C.EMPLOYEECLASSFLG";
+                strSQL += " ORDER BY 11, 3 ASC";
+
+                if (!LedgerDB.ExecuteReader(strSQL, ref arData)) return;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", ex.Message, strSQL);
+            }
+        }
+        #endregion
+
         #region �¡Šú‚ÌŒo‰ß‹‹—^‚ð•\Ž¦‚·‚é
         /// <summary>
         /// �¡Šú‚ÌŒo‰ß‹‹—^‚ð•\Ž¦‚·‚é
@@ -1694,7 +1758,7 @@
                     int workSalary = CalcElapsedSalary(dtStart, dtMax, PersonCDArray[i], SalaryArray[i]);
                     // —ÝŒv‰ÁŽZ
                     if (workSalary > 0) TotalSalary += workSalary;
-                    Debug.WriteLine(string.Format("Code={0} Val={1} Start={2} End={3}", PersonCDArray[i], workSalary.ToString("0,0"), dtStart, dtMax));
+                    // Debug.WriteLine(string.Format("Code={0} Val={1} Start={2} End={3}", PersonCDArray[i], workSalary.ToString("0,0"), dtStart, dtMax));
 
                     // ŒvŽZŠJŽn�I—¹“ú‚ðŽæ“¾‚·‚é
                     if (dtStart < dtDispStart) dtDispStart = dtStart;
Index: trunk/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 115)
+++ trunk/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 116)
@@ -33,6 +33,6 @@
 // æ—¢å®šå€¤ã�«ã�™ã‚‹ã�“ã�¨ã�Œã�§ã��ã�¾ã�™:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.9.9.25")]
+[assembly: AssemblyFileVersion("0.9.9.26")]
 // Log4netã‚’ä½¿ç”¨ã�™ã‚‹
 [assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement.v12.suo
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
