Index: branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 222)
+++ branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 223)
@@ -14,7 +14,7 @@
         /// <summary>
         /// æœ¬ä½“ãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
         /// </summary>
-        public static int s_SystemVersion = 48;
+        public static int s_SystemVersion = 49;
 
         /// <summary>
         /// ã‚³ãƒ”ãƒ¼ãƒ»ç’°å¢ƒãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerListAuxiliary.cs	(revision 222)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerListAuxiliary.cs	(revision 223)
@@ -900,6 +900,11 @@
                 strSQL.AppendFormat(" AND (DATE(P.STARTDATE) <= STR_TO_DATE('{0}','%Y/%m/%d')", dtDefaultEnd.ToShortDateString());
                 strSQL.AppendFormat(" AND (STR_TO_DATE('{0}','%Y/%m/%d') <= DATE(P.ENDDATE)", dtDefaultStart.ToShortDateString());
                 strSQL.AppendFormat(" OR STR_TO_DATE('{0}','%Y/%m/%d') = DATE(P.ENDDATE)))", DateTime.MinValue.ToShortDateString());
+                if (CommonMotions.LoginUserData.PersonCode != CommonDefine.AdminCode)
+                {
+                    strSQL.Append(" AND P.DEPARTMENTCODE IN (select PDep.DepartmentCode from PersonDepartmentMaster AS PDep");
+                    strSQL.AppendFormat(" WHERE PDep.PersonCode = {0})", CommonMotions.LoginUserData.PersonCode);
+                }
 
                 // �HŽ–‘ä’ ƒf�[ƒ^‚Ì•”��‚¾‚¯‚ª‘Î�Û
                 if (DepartmentCode == 0)
@@ -1059,6 +1064,12 @@
 
                 strSQL.Append(" AND P.COMPANYCODE IN (SELECT A1.PERSONCODE FROM PERSONINCHARGEMASTER A1 WHERE A1.DELETEFLG = 0");
 
+                if (CommonMotions.LoginUserData.PersonCode != CommonDefine.AdminCode)
+                {
+                    strSQL.Append(" AND A1.DEPARTMENTCODE IN (select PDep.DepartmentCode from PersonDepartmentMaster AS PDep");
+                    strSQL.AppendFormat(" WHERE PDep.PersonCode = {0})", CommonMotions.LoginUserData.PersonCode);
+                }
+
                 if (DepartmentCode != 0) strSQL.AppendFormat(" AND A1.DEPARTMENTCODE = {0}", DepartmentCode);
                 if (PersonCode != 0) strSQL.AppendFormat(" AND A1.PERSONCODE = {0}", PersonCode);
                 
@@ -1077,6 +1088,12 @@
 
                 strSQL.Append(" AND P.COMPANYCODE IN (SELECT A1.PERSONCODE FROM PERSONINCHARGEMASTER A1 WHERE A1.DELETEFLG = 0");
 
+                if (CommonMotions.LoginUserData.PersonCode != CommonDefine.AdminCode)
+                {
+                    strSQL.Append(" AND A1.DEPARTMENTCODE IN (select PDep.DepartmentCode from PersonDepartmentMaster AS PDep");
+                    strSQL.AppendFormat(" WHERE PDep.PersonCode = {0})", CommonMotions.LoginUserData.PersonCode);
+                }
+
                 if (DepartmentCode != 0) strSQL.AppendFormat(" AND A1.DEPARTMENTCODE = {0}", DepartmentCode);
                 if (PersonCode != 0) strSQL.AppendFormat(" AND A1.PERSONCODE = {0}", PersonCode);
 
@@ -1146,6 +1163,13 @@
                 strSQL.Append(" AND C.CONSTRUCTIONCODE = P.CONSTRUCTIONCODE");
                 strSQL.AppendFormat(" AND C.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.Payroll);
                 strSQL.Append(" AND D.PERSONCODE = B.CONSTRUCTIONPERSONCODE");
+
+                if (CommonMotions.LoginUserData.PersonCode != CommonDefine.AdminCode)
+                {
+                    strSQL.Append(" AND D.DEPARTMENTCODE IN (select PDep.DepartmentCode from PersonDepartmentMaster AS PDep");
+                    strSQL.AppendFormat(" WHERE PDep.PersonCode = {0})", CommonMotions.LoginUserData.PersonCode);
+                }
+
                 if (DepartmentCode != 0) strSQL.AppendFormat(" AND D.DEPARTMENTCODE = {0}", DepartmentCode);
                 if (PersonCode != 0) strSQL.AppendFormat(" AND D.PERSONCODE = {0}", PersonCode);
 
@@ -1155,7 +1179,7 @@
                 OnSalary = CommonMotions.cnvInt(objSalary[0]);
 
                 // �U•ª�Ï‚Ý•ª�ƒ—˜‰vŽæ“¾
-                strSQL = new StringBuilder();
+                strSQL.Clear();
                 strSQL.Append("SELECT SUM(P.NETPROFIT) FROM CONSTRUCTIONLEDGER P, CONSTRUCTIONBASEINFO B, PERSONINCHARGEMASTER D");
                 // �U•ª�Ï‚Ý•ª�ƒ—˜‰v
                 strSQL.Append(" WHERE P.CONSTRUCTIONCODE IN (SELECT A.CONSTRUCTIONCODE  FROM CONSTRUCTIONLEDGERDETAIL A");
@@ -1168,6 +1192,13 @@
                 strSQL.AppendFormat(" AND B.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
                 strSQL.AppendFormat(" AND B.CONSTRUCTIONSTATUSFLG != {0}", NotOrder);
                 strSQL.Append(" AND D.PERSONCODE = B.CONSTRUCTIONPERSONCODE");
+                
+                if (CommonMotions.LoginUserData.PersonCode != CommonDefine.AdminCode)
+                {
+                    strSQL.Append(" AND D.DEPARTMENTCODE IN (select PDep.DepartmentCode from PersonDepartmentMaster AS PDep");
+                    strSQL.AppendFormat(" WHERE PDep.PersonCode = {0})", CommonMotions.LoginUserData.PersonCode);
+                }
+
                 if (DepartmentCode != 0) strSQL.AppendFormat(" AND D.DEPARTMENTCODE = {0}", DepartmentCode);
                 if (PersonCode != 0) strSQL.AppendFormat(" AND D.PERSONCODE = {0}", PersonCode);
 
@@ -1177,7 +1208,7 @@
                 NetIncome = CommonMotions.cnvInt(objNetIncome[0]);
 
                 // �U•ª–³‚µ•ª�ƒ—˜‰vŽæ“¾
-                strSQL = new StringBuilder();
+                strSQL.Clear();
                 strSQL.Append("SELECT SUM(P.NETPROFIT) FROM CONSTRUCTIONLEDGER P, CONSTRUCTIONBASEINFO B, PERSONINCHARGEMASTER D");
                 // �U•ª�Ï‚Ý•ª�ƒ—˜‰v
                 strSQL.Append(" WHERE P.CONSTRUCTIONCODE NOT IN (SELECT A.CONSTRUCTIONCODE  FROM CONSTRUCTIONLEDGERDETAIL A");
@@ -1190,6 +1221,13 @@
                 strSQL.AppendFormat(" AND B.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
                 strSQL.AppendFormat(" AND B.CONSTRUCTIONSTATUSFLG != {0}", NotOrder);
                 strSQL.Append(" AND D.PERSONCODE = B.CONSTRUCTIONPERSONCODE");
+
+                if (CommonMotions.LoginUserData.PersonCode != CommonDefine.AdminCode)
+                {
+                    strSQL.Append(" AND D.DEPARTMENTCODE IN (select PDep.DepartmentCode from PersonDepartmentMaster AS PDep");
+                    strSQL.AppendFormat(" WHERE PDep.PersonCode = {0})", CommonMotions.LoginUserData.PersonCode);
+                }
+
                 if (DepartmentCode != 0) strSQL.AppendFormat(" AND D.DEPARTMENTCODE = {0}", DepartmentCode);
                 if (PersonCode != 0) strSQL.AppendFormat(" AND D.PERSONCODE = {0}", PersonCode);
 
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssListAuxiliary.cs	(revision 222)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssListAuxiliary.cs	(revision 223)
@@ -947,6 +947,12 @@
                 strSQL.AppendFormat(" AND (STR_TO_DATE('{0}','%Y/%m/%d') <= DATE(P.ENDDATE)", dtDefaultStart.ToShortDateString());
                 strSQL.AppendFormat(" OR STR_TO_DATE('{0}','%Y/%m/%d') = DATE(P.ENDDATE)))", DateTime.MinValue.ToShortDateString());
 
+                if (CommonMotions.LoginUserData.PersonCode != CommonDefine.AdminCode)
+                {
+                    strSQL.Append(" AND P.DEPARTMENTCODE IN (select PDep.DepartmentCode from PersonDepartmentMaster AS PDep");
+                    strSQL.AppendFormat(" WHERE PDep.PersonCode = {0})", CommonMotions.LoginUserData.PersonCode);
+                }
+
                 // �HŽ–‘ä’ ƒf�[ƒ^‚Ì•”��‚¾‚¯‚ª‘Î�Û
                 if (DepartmentCode == 0)
                 {
@@ -1104,6 +1110,13 @@
                 strSQL.AppendFormat(" WHERE P.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.Instructor);
                 
                 strSQL.Append(" AND P.COMPANYCODE IN (SELECT P1.PERSONCODE FROM PERSONINCHARGEMASTER P1 WHERE P1.DELETEFLG = 0");
+
+                if (CommonMotions.LoginUserData.PersonCode != CommonDefine.AdminCode)
+                {
+                    strSQL.Append(" AND P1.DEPARTMENTCODE IN (select PDep.DepartmentCode from PersonDepartmentMaster AS PDep");
+                    strSQL.AppendFormat(" WHERE PDep.PersonCode = {0})", CommonMotions.LoginUserData.PersonCode);
+                }
+
                 if (DepartmentCode != 0) strSQL.AppendFormat(" AND P1.DEPARTMENTCODE = {0}", DepartmentCode);
                 if (PersonCode != 0) strSQL.AppendFormat(" AND P1.PERSONCODE = {0}", PersonCode);
 
@@ -1122,6 +1135,13 @@
                 strSQL.AppendFormat(" WHERE P.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.Assistant);
 
                 strSQL.Append(" AND P.COMPANYCODE IN (SELECT P1.PERSONCODE FROM PERSONINCHARGEMASTER P1 WHERE P1.DELETEFLG = 0");
+
+                if (CommonMotions.LoginUserData.PersonCode != CommonDefine.AdminCode)
+                {
+                    strSQL.Append(" AND P1.DEPARTMENTCODE IN (select PDep.DepartmentCode from PersonDepartmentMaster AS PDep");
+                    strSQL.AppendFormat(" WHERE PDep.PersonCode = {0})", CommonMotions.LoginUserData.PersonCode);
+                }
+
                 if (DepartmentCode != 0) strSQL.AppendFormat(" AND P1.DEPARTMENTCODE = {0}", DepartmentCode);
                 if (PersonCode != 0) strSQL.AppendFormat(" AND P1.PERSONCODE = {0}", PersonCode);
 
@@ -1189,8 +1209,15 @@
                 strSQL.Append(" AND C.CONSTRUCTIONCODE = P.CONSTRUCTIONCODE");
                 strSQL.AppendFormat(" AND C.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.Payroll);
                 strSQL.Append(" AND D.PERSONCODE = B.CONSTRUCTIONPERSONCODE");
+
+                if (CommonMotions.LoginUserData.PersonCode != CommonDefine.AdminCode)
+                {
+                    strSQL.Append(" AND D.DEPARTMENTCODE IN (select PDep.DepartmentCode from PersonDepartmentMaster AS PDep");
+                    strSQL.AppendFormat(" WHERE PDep.PersonCode = {0})", CommonMotions.LoginUserData.PersonCode);
+                }
+
                 if (DepartmentCode != 0) strSQL.AppendFormat(" AND D.DEPARTMENTCODE = {0}", DepartmentCode);
-                if (PersonCode != 0) strSQL.AppendFormat(" AND D.PERSONCODE = {0}", PersonCode);
+                //if (PersonCode != 0) strSQL.AppendFormat(" AND D.PERSONCODE = {0}", PersonCode);
 
                 ArrayList arList = new ArrayList();
                 if (!LedgerlDB.ExecuteReader(strSQL.ToString(), ref arList)) return;
@@ -1198,7 +1225,7 @@
                 OnSalary = CommonMotions.cnvInt(objSalary[0]);
 
                 // �U•ª�Ï‚Ý•ª�ƒ—˜‰vŽæ“¾
-                strSQL = new StringBuilder();
+                strSQL.Clear();
                 strSQL.Append("SELECT SUM(P.NETPROFIT) FROM CONSTRUCTIONLEDGER P, CONSTRUCTIONBASEINFO B, PERSONINCHARGEMASTER D");
                 // �U•ª�Ï‚Ý•ª�ƒ—˜‰v
                 strSQL.Append(" WHERE P.CONSTRUCTIONCODE IN (SELECT A.CONSTRUCTIONCODE  FROM CONSTRUCTIONLEDGERDETAIL A");
@@ -1211,6 +1238,13 @@
                 strSQL.AppendFormat(" AND B.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
                 strSQL.AppendFormat(" AND B.CONSTRUCTIONSTATUSFLG != {0}", NotOrder);
                 strSQL.Append(" AND D.PERSONCODE = B.CONSTRUCTIONPERSONCODE");
+
+                if (CommonMotions.LoginUserData.PersonCode != CommonDefine.AdminCode)
+                {
+                    strSQL.Append(" AND D.DEPARTMENTCODE IN (select PDep.DepartmentCode from PersonDepartmentMaster AS PDep");
+                    strSQL.AppendFormat(" WHERE PDep.PersonCode = {0})", CommonMotions.LoginUserData.PersonCode);
+                }
+
                 if (DepartmentCode != 0) strSQL.AppendFormat(" AND D.DEPARTMENTCODE = {0}", DepartmentCode);
 
                 ArrayList arList2 = new ArrayList();
@@ -1219,7 +1253,7 @@
                 NetIncome = CommonMotions.cnvInt(objNetIncome[0]);
 
                 // �U•ª–³‚µ•ª�ƒ—˜‰vŽæ“¾
-                strSQL = new StringBuilder();
+                strSQL.Clear();
                 strSQL.Append("SELECT SUM(P.NETPROFIT) FROM CONSTRUCTIONLEDGER P, CONSTRUCTIONBASEINFO B, PERSONINCHARGEMASTER D");
                 // �U•ª�Ï‚Ý•ª�ƒ—˜‰v
                 strSQL.Append(" WHERE P.CONSTRUCTIONCODE NOT IN (SELECT A.CONSTRUCTIONCODE  FROM CONSTRUCTIONLEDGERDETAIL A");
@@ -1232,6 +1266,13 @@
                 strSQL.AppendFormat(" AND B.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
                 strSQL.AppendFormat(" AND B.CONSTRUCTIONSTATUSFLG != {0}", NotOrder);
                 strSQL.Append(" AND D.PERSONCODE = B.CONSTRUCTIONPERSONCODE");
+
+                if (CommonMotions.LoginUserData.PersonCode != CommonDefine.AdminCode)
+                {
+                    strSQL.Append(" AND D.DEPARTMENTCODE IN (select PDep.DepartmentCode from PersonDepartmentMaster AS PDep");
+                    strSQL.AppendFormat(" WHERE PDep.PersonCode = {0})", CommonMotions.LoginUserData.PersonCode);
+                }
+
                 if (DepartmentCode != 0) strSQL.AppendFormat(" AND D.DEPARTMENTCODE = {0}", DepartmentCode);
 
                 ArrayList arList3 = new ArrayList();
Index: branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 222)
+++ branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 223)
@@ -32,7 +32,7 @@
 // ã�™ã�¹ã�¦ã�®å€¤ã‚’æŒ‡å®šã�™ã‚‹ã�‹ã€�ä¸‹ã�®ã‚ˆã�†ã�« '*' ã‚’ä½¿ã�£ã�¦ãƒ“ãƒ«ãƒ‰ã�Šã‚ˆã�³ãƒªãƒ“ã‚¸ãƒ§ãƒ³ç•ªå�·ã‚’ 
 // æ—¢å®šå€¤ã�«ã�™ã‚‹ã�“ã�¨ã�Œã�§ã��ã�¾ã�™:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.48")]
-[assembly: AssemblyFileVersion("1.0.0.48")]
+[assembly: AssemblyVersion("1.0.0.49")]
+[assembly: AssemblyFileVersion("1.0.0.49")]
 // Log4netã‚’ä½¿ç”¨ã�™ã‚‹
 [assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]
\ No newline at end of file
