Index: trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IORemInvoiceData.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IORemInvoiceData.cs	(revision 409)
+++ trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IORemInvoiceData.cs	(revision 410)
@@ -55,7 +55,6 @@
 
         #endregion
 
-
         #region SELECTã€€SQLä½œæˆ�
         private string CreateSelectSQL()
         {
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudgetAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudgetAuxiliary.cs	(revision 409)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudgetAuxiliary.cs	(revision 410)
@@ -1922,14 +1922,15 @@
             try
             {
                 // å·¥äº‹äºˆç®—æ›¸ãƒ‡ãƒ¼ã‚¿ã‚’èª­ã�¿è¾¼ã‚€
-                string strSQL = BudgetDB.CreatePrimarykeyString(m_ConstructionCode);
+                StringBuilder strSQL = new StringBuilder();
+                strSQL.Append(BudgetDB.CreatePrimarykeyString(m_ConstructionCode));
                 ConstructionBudget BudgetRec = new ConstructionBudget();
-                if (!BudgetDB.SelectAction(strSQL, ref BudgetRec)) return false;
+                if (!BudgetDB.SelectAction(strSQL.ToString(), ref BudgetRec)) return false;
 
                 // å·¥äº‹äºˆç®—æ›¸æ˜Žç´°ãƒ‡ãƒ¼ã‚¿ã‚’èª­ã�¿è¾¼ã‚€
-                strSQL += " ORDER BY GroupCount ASC, LineCount ASC";
+                strSQL.Append(" ORDER BY GroupCount ASC, LineCount ASC");
                 List<ConstructionBudgetDetail> DetailList = new List<ConstructionBudgetDetail>();
-                if (!DetailDB.SelectAction(strSQL, ref DetailList)) return false;
+                if (!DetailDB.SelectAction(strSQL.ToString(), ref DetailList)) return false;
                 if (DetailList.Count == 0) return false;
 
                 DataGridViewEX dgv = dgvAllDisplay;
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInputAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInputAuxiliary.cs	(revision 409)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInputAuxiliary.cs	(revision 410)
@@ -4252,7 +4252,7 @@
                 // æ‰¿èª�æ©Ÿèƒ½ç•ªå�·ã‚»ãƒƒãƒˆ
                 frm.ApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals("è«‹æ±‚æ‰¿èª�")).Key;
                 // å�—ä»˜ç•ªå�·
-                frm.OrderNo = CommonDefine.s_Default_OrderNo;
+                frm.OrderNo = m_nMaxOrderNo;
 
                 // è¦‹ã�ˆã�ªã�„ç”»é�¢ã‚’å‡ºã�™
                 frm.WindowState = FormWindowState.Minimized;
@@ -4264,7 +4264,7 @@
                 if (!frm.OneApprovalProcess) return false;
 
                 // å®Œäº†ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸
-                CommonMotions.EntryEndMessage("ç©�ç®—è¦‹ç©�æ›¸", "ç¢ºèª�");
+                CommonMotions.EntryEndMessage("è«‹æ±‚æ‰¿èª�", "ç¢ºèª�");
 
                 return true;
             }
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmCancelInvoice.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmCancelInvoice.Designer.cs	(revision 409)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmCancelInvoice.Designer.cs	(revision 410)
@@ -284,7 +284,7 @@
             // 
             this.btnCancel.BackColor = System.Drawing.Color.Red;
             this.btnCancel.ForeColor = System.Drawing.Color.White;
-            this.btnCancel.Location = new System.Drawing.Point(832, 509);
+            this.btnCancel.Location = new System.Drawing.Point(832, 498);
             this.btnCancel.Name = "btnCancel";
             this.btnCancel.Size = new System.Drawing.Size(140, 40);
             this.btnCancel.TabIndex = 22;
@@ -295,7 +295,7 @@
             // 
             this.btnExecProc1.BackColor = System.Drawing.Color.Green;
             this.btnExecProc1.ForeColor = System.Drawing.Color.White;
-            this.btnExecProc1.Location = new System.Drawing.Point(680, 509);
+            this.btnExecProc1.Location = new System.Drawing.Point(680, 498);
             this.btnExecProc1.Name = "btnExecProc1";
             this.btnExecProc1.Size = new System.Drawing.Size(140, 40);
             this.btnExecProc1.TabIndex = 21;
@@ -307,7 +307,7 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.BackColor = System.Drawing.Color.PaleGoldenrod;
-            this.ClientSize = new System.Drawing.Size(984, 561);
+            this.ClientSize = new System.Drawing.Size(984, 541);
             this.Controls.Add(this.btnCancel);
             this.Controls.Add(this.btnExecProc1);
             this.Controls.Add(this.groupBoxEx2);
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmRequestPrintSel.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmRequestPrintSel.Designer.cs	(revision 409)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmRequestPrintSel.Designer.cs	(revision 410)
@@ -135,7 +135,7 @@
             this.btnGenerate.Enabled = false;
             this.btnGenerate.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.btnGenerate.ForeColor = System.Drawing.Color.Black;
-            this.btnGenerate.Location = new System.Drawing.Point(896, 620);
+            this.btnGenerate.Location = new System.Drawing.Point(1024, 620);
             this.btnGenerate.Name = "btnGenerate";
             this.btnGenerate.Size = new System.Drawing.Size(120, 30);
             this.btnGenerate.TabIndex = 33;
@@ -355,12 +355,13 @@
             this.btnDel.Enabled = false;
             this.btnDel.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.btnDel.ForeColor = System.Drawing.Color.White;
-            this.btnDel.Location = new System.Drawing.Point(1024, 620);
+            this.btnDel.Location = new System.Drawing.Point(896, 620);
             this.btnDel.Name = "btnDel";
             this.btnDel.Size = new System.Drawing.Size(120, 30);
             this.btnDel.TabIndex = 40;
             this.btnDel.Text = "è«‹æ±‚å�–æ¶ˆ";
             this.btnDel.UseVisualStyleBackColor = false;
+            this.btnDel.Visible = false;
             this.btnDel.Click += new System.EventHandler(this.btnDel_Click);
             // 
             // panel2
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs	(revision 409)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs	(revision 410)
@@ -2799,28 +2799,29 @@
         {
             try
             {
-                if (dgv.CurrentRow == null)
-                    return;
+                DataGridViewRow CurRow = dgv.Rows[RowIndex];
+                if (CurRow == null) return;
+                if (dgv.CurrentRow == null) return;
 
-                if (RowIndex == -1)
-                    return;
+                if (RowIndex < 0) return;
 
                 // ‹¦—Í‹à—L–³�w�›�x
-                if (CommonMotions.cnvInt(dgv[(int)DispColumn.KyoryokuUmu, RowIndex].Value) == 1)
+                if (CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.KyoryokuUmu].Value) == 1)
                 {
-                    dgv.Rows[RowIndex].Cells[(int)DispColumn.KyoryokuKin].Value = CommonMotions.cnvRound(CommonMotions.cnvDouble(dgv.Rows[RowIndex].Cells[(int)DispColumn.KojiSeikyu].Value)
-                                                                                                            * (CommonMotions.SystemMasterData.ConsumptionTax / 100));
+                    double wrkValue = CommonMotions.cnvDouble(CurRow.Cells[(int)DispColumn.KojiSeikyu].Value);
+                    double dCooperationRate = (CommonMotions.SystemMasterData.CooperationRate / 100);
+                    CurRow.Cells[(int)DispColumn.KyoryokuKin].Value = CommonMotions.cnvRound(wrkValue * dCooperationRate);
                 }
                 else
                 {
-                    dgv.Rows[RowIndex].Cells[(int)DispColumn.KyoryokuKin].Value = "";
+                    CurRow.Cells[(int)DispColumn.KyoryokuKin].Value = "";
                 }
 
                 // �¬ŒvŽZ�o
-                ShoukeiSanshutu((int)DispColumn.KyoryokuKin, Code_Column, CommonMotions.cnvInt(dgv[Code_Column, RowIndex].Value));
+                ShoukeiSanshutu((int)DispColumn.KyoryokuKin, Code_Column, CommonMotions.cnvInt(CurRow.Cells[Code_Column].Value));
 
                 // �‡Œv’lŽZ�o
-                SetSubGoukei(dgv, (int)DispColumn.KojiSeikyu, (int)DispColumn.KyoryokuKin, Code_Column, CommonMotions.cnvInt(dgv[Code_Column, RowIndex].Value), RowsTypeDef.‹¦—Í‹à);
+                SetSubGoukei(dgv, (int)DispColumn.KojiSeikyu, (int)DispColumn.KyoryokuKin, Code_Column, CommonMotions.cnvInt(CurRow.Cells[Code_Column].Value), RowsTypeDef.‹¦—Í‹à);
             }
             catch (Exception ex)
             {
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SalesConfirm/FrmSalesConfirm.Designer.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SalesConfirm/FrmSalesConfirm.Designer.cs	(revision 409)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SalesConfirm/FrmSalesConfirm.Designer.cs	(revision 410)
@@ -400,7 +400,9 @@
             this.comboBox1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.comboBox1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
             this.comboBox1.FormattingEnabled = true;
+            this.comboBox1.IntegralHeight = false;
             this.comboBox1.Location = new System.Drawing.Point(422, 5);
+            this.comboBox1.MaxDropDownItems = 12;
             this.comboBox1.Name = "comboBox1";
             this.comboBox1.Size = new System.Drawing.Size(130, 24);
             this.comboBox1.TabIndex = 2;
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SalesConfirm/FrmSalesConfirm.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SalesConfirm/FrmSalesConfirm.cs	(revision 409)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SalesConfirm/FrmSalesConfirm.cs	(revision 410)
@@ -85,6 +85,14 @@
         private static Color s_RowSelectColor = Color.LightBlue;
 
         /// <summary>
+        /// ç™ºæ³¨åŒºåˆ†
+        /// </summary>
+        private long s_OrderCotegory = 1 << 5;
+        /// <summary>
+        /// ç™ºæ³¨è€…é�¸æŠž
+        /// </summary>
+        private long s_Orderers = 1 << 4;
+        /// <summary>
         /// æœˆé�¸æŠž
         /// </summary>
         private long s_SelectedMonth = 1 << 3;
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SalesConfirm/FrmSalesConfirmAuxiliary.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SalesConfirm/FrmSalesConfirmAuxiliary.cs	(revision 409)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SalesConfirm/FrmSalesConfirmAuxiliary.cs	(revision 410)
@@ -248,19 +248,29 @@
                 sql.Append(" C1.ConstructionCode = A1.REQCONSTRUCTIONCODE");
                 sql.AppendFormat(" AND C1.ConstructionPeriod = {0}", numericUpDown2.Value);
                 sql.Append(" Group By A1.REQUESTMONTH");
-                sql.Append(" Order By A1.REQUESTMONTH");
+                sql.Append(" Order By A1.REQUESTMONTH DESC");
 
                 var data = new ArrayList();
                 ReqHDB.ExecuteReader(sql.ToString(), ref data);
-
-                int GetMonth = 0;
+                int BreakKey = -1;
                 foreach (object[] objRec in data)
                 {
-                    GetMonth = CommonMotions.cnvInt(objRec[0]);
+                    int GetMonth = CommonMotions.cnvInt(objRec[0]);
+                    int nYear = CommonMotions.cnvTruncate(GetMonth / 100);
+                    int nMonth = (GetMonth % 100);
+                    string wrk1 = nYear.ToString();
+                    string wrk2 = string.Empty;
+                    if (nMonth < 10) wrk2 = string.Format("  {0}", nMonth);
+                    else wrk2 = string.Format(" {0}", nMonth);
 
-                    listMonth.Add(new KeyValuePair<int, String>(GetMonth, string.Format("{0}”N{1}ŒŽ",
-                                                                                        CommonMotions.cnvTruncate(GetMonth / 100),
-                                                                                        GetMonth % 100)));
+                    if (BreakKey != nYear)
+                    {
+                        if (BreakKey > 1) listMonth.Add(new KeyValuePair<int, String>(0, "*--------*"));
+
+                        BreakKey = nYear;
+                    }
+
+                listMonth.Add(new KeyValuePair<int, String>(GetMonth, string.Format("{0}”N{1}ŒŽ", wrk1, wrk2)));
                 }
             }
             catch (Exception ex)
@@ -520,49 +530,58 @@
                 long SelComb = 0;
                 int CntNo = 1;
                 long lTotal = 0;
-                string strConstrName = string.Empty;
-                string strDepName = string.Empty;
-                string strPersonName = string.Empty;
+
+                StringBuilder strOrderCotegory = new StringBuilder();
+                StringBuilder strConstrName = new StringBuilder();
+                StringBuilder strDepName = new StringBuilder();
+                StringBuilder strPersonName = new StringBuilder();
                 foreach (object[] objRec in data)
                 {
-                    strConstrName = string.Empty;
-                    strConstrName = CommonMotions.cnvString(objRec[(int)GetOrder.A2OrderersName1])
-                        + CommonMotions.cnvString(objRec[(int)GetOrder.A2OrderersName2]);
+                    strOrderCotegory.Clear();
+                    strConstrName.Clear();
+                    strDepName.Clear();
+                    strPersonName.Clear();
 
-                    strDepName = CommonMotions.cnvString(objRec[(int)GetOrder.E1DepartmentString]);
-                    strPersonName = CommonMotions.cnvString(objRec[(int)GetOrder.D1PersonName]);
+                    strOrderCotegory.Append(objRec[(int)GetOrder.A2OrderCotegory]);
+                    strConstrName.AppendFormat("{0}{1}", objRec[(int)GetOrder.A2OrderersName1], objRec[(int)GetOrder.A2OrderersName2]);
+                    strDepName.Append(objRec[(int)GetOrder.E1DepartmentString]);
+                    strPersonName.Append(objRec[(int)GetOrder.D1PersonName]);
 
                     SelComb = SelectedCondition();
-                    if (SelComb == 0)
+                    if (SelComb == 0 || SelComb == s_SelectedMonth)
                     {
-                        strDepName = string.Empty;
-                        strPersonName = string.Empty;
+                        strConstrName.Clear();
+                        strDepName.Clear();
+                        strPersonName.Clear();
                     }
-                    else if ((SelComb & s_SelectedDepartment) != 0)
-                    {   // •”��‚Ì‘I‘ð‚ª‚ ‚é�ê�‡
-                        strDepName = string.Empty;
+                    else
+                    {
+                        if ((SelComb & s_SelectedDepartment) != 0)
+                        {   // •”��‚Ì‘I‘ð‚ª‚ ‚é�ê�‡
+                            strDepName.Clear();
+                        }
+                        else if ((SelComb & s_SelectedDepartment) == 0)
+                        {   // •”��‚Ì‘I‘ð‚ª–³‚¢�ê�‡
+                        }
+                        else if ((SelComb & s_SelectedPerson) != 0)
+                        {   // ’S“–ŽÒ‚Ì‘I‘ð‚ª‚ ‚é�ê�‡
+                            strPersonName.Clear();
+                        }
+                        else if ((SelComb & s_SelectedPerson) == 0)
+                        {   // ’S“–ŽÒ‚Ì‘I‘ð‚ª–³‚¢�ê�‡
+                        }
                     }
-                    else if ((SelComb & s_SelectedDepartment) == 0)
-                    {   // •”��‚Ì‘I‘ð‚ª–³‚¢�ê�‡
-                    }
-                    else if ((SelComb & s_SelectedPerson) != 0)
-                    {   // ’S“–ŽÒ‚Ì‘I‘ð‚ª‚ ‚é�ê�‡
-                        strPersonName = string.Empty;
-                    }
-                    else if ((SelComb & s_SelectedPerson) == 0)
-                    {   // ’S“–ŽÒ‚Ì‘I‘ð‚ª–³‚¢�ê�‡
-                    }
 
                     dgv.Rows.Add(CntNo++,
-                                objRec[(int)GetOrder.A2OrderCotegory],
+                                strOrderCotegory.ToString(),
                                 objRec[(int)GetOrder.A2OrderersCode],
                                 objRec[(int)GetOrder.DiviNameString],
-                                strConstrName,
+                                strConstrName.ToString(),
                                 CommonMotions.cnvInt(objRec[(int)GetOrder.Value]).ToString("#,0"),
                                 objRec[(int)GetOrder.E1DepartmentCode],
-                                strDepName,
+                                strDepName.ToString(),
                                 objRec[(int)GetOrder.D1PersonCode],
-                                strPersonName
+                                strPersonName.ToString()
                                 );
                     lTotal += CommonMotions.cnvInt(objRec[(int)GetOrder.Value]);
                 }
@@ -591,6 +610,8 @@
             {
                 long selValue = 0;
 
+                if (CommonMotions.cnvInt(comboBox4.SelectedValue) != 0) selValue += s_OrderCotegory;
+                if (CommonMotions.cnvInt(comboBox5.SelectedValue) != 0) selValue += s_Orderers;
                 if (CommonMotions.cnvInt(comboBox1.SelectedValue) != 0) selValue += s_SelectedMonth;
                 if (CommonMotions.cnvInt(comboBox2.SelectedValue) != 0) selValue += s_SelectedDepartment;
                 if (CommonMotions.cnvInt(comboBox3.SelectedValue) != 0) selValue += s_SelectedPerson;
@@ -612,6 +633,8 @@
         /// <param name="sql"></param>
         private void CreateSelectSQL(StringBuilder sql)
         {
+            StringBuilder strGroup = new StringBuilder();
+            StringBuilder strOrder = new StringBuilder();
             try
             {
                 int SelMonth = CommonMotions.cnvInt(comboBox1.SelectedValue);
@@ -651,7 +674,7 @@
 
                 sql.Append(", SUM(A1.REQUESTAMOUNT) AS Value");
 
-                sql.Append(" from requesthead AS A1");
+                sql.Append(" From requesthead AS A1");
                 sql.Append(" LEFT JOIN orderersmaster AS A2");
                 sql.Append("    ON A2.OrderCotegory = A1.ORDERERSDIVISION");
                 sql.Append("    And A2.OrderersCode = A1.ORDERERSCODE");
@@ -690,53 +713,58 @@
 
 
                 long SelComb = SelectedCondition();
-                StringBuilder strGroup = new StringBuilder();
-                StringBuilder strOrder = new StringBuilder();
+
+                // ”­’�‹æ•ª‚²‚Æ‚É�WŒv
+                strGroup.Append("A2.OrderCotegory");
+                // ‹àŠz�‡‚É•\Ž¦
                 strOrder.Append("Value DESC");
+
                 // ŒŸ�õ�ðŒ�‚É‚æ‚Á‚Ä�WŒv’PˆÊ‚ð•Ï‚¦‚é
-                if (SelComb == 0)
+                if (SelComb == 0 || SelComb == s_SelectedMonth)
                 {   // ‘S‚·‚×‚Ä
-                    strGroup.Append("A2.OrderCotegory, A2.OrderersCode");
-
-                    if (strOrder.ToString().Length > 0) strOrder.Append(",");
-                    strOrder.Append("Divi.DisplayOrder, A2.DisplayOrder");
+                    strOrder.Append(", Divi.DisplayOrder, A2.DisplayOrder");
+                    return;
                 }
-                else if ((SelComb & s_SelectedDepartment) != 0)
-                {   // •”��‚Ì‘I‘ð‚ª‚ ‚é�ê�‡
-                    if (strGroup.ToString().Length > 0) strGroup.Append(", ");
-                    strGroup.Append("A2.OrderCotegory, A2.OrderersCode, D1.PersonCode");
 
-                    if (strOrder.ToString().Length > 0) strOrder.Append(", ");
-                    strOrder.Append("D1.DisplayOrder");
+                // ‘S‚ÄˆÈŠO‚Í”­’�ŽÒ‚²‚Æ‚É�WŒv
+                strGroup.Append(", A2.OrderersCode");
+
+
+                // •”��‘I‘ð
+                if ((SelComb & s_SelectedDepartment) != 0)
+                {   // ‚ ‚é�ê�‡
+                    strGroup.Append(", D1.PersonCode");
+
+                    strOrder.Append(", D1.DisplayOrder");
                 }
                 else if ((SelComb & s_SelectedDepartment) == 0)
-                {   // •”��‚Ì‘I‘ð‚ª–³‚¢�ê�‡
-                    if (strGroup.ToString().Length > 0) strGroup.Append(", ");
-                    strGroup.Append("E1.DepartmentCode");
+                {   // –³‚¢�ê�‡
+                    strGroup.Append(", E1.DepartmentCode");
 
-                    if (strOrder.ToString().Length > 0) strOrder.Append(", ");
-                    strOrder.Append("E1.DisplayOrder");
+                    strOrder.Append(", E1.DisplayOrder");
                 }
-                else if ((SelComb & s_SelectedPerson) != 0)
-                {   // ’S“–ŽÒ‚Ì‘I‘ð‚ª‚ ‚é�ê�‡
+
+                // ’S“–ŽÒ‘I‘ð
+                if ((SelComb & s_SelectedPerson) != 0)
+                {   // ‚ ‚é�ê�‡
                 }
                 else if ((SelComb & s_SelectedPerson) == 0)
-                {   // ’S“–ŽÒ‚Ì‘I‘ð‚ª–³‚¢�ê�‡
-                    if (strGroup.ToString().Length > 0) strGroup.Append(", ");
-                    strGroup.Append("D1.PersonCode");
+                {   // –³‚¢�ê�‡
+                    strGroup.Append(", D1.PersonCode");
 
-                    if (strOrder.ToString().Length > 0) strOrder.Append(", ");
-                    strOrder.Append("D1.DisplayOrder");
+                    strOrder.Append(", D1.DisplayOrder");
                 }
 
-                sql.AppendFormat(" group by {0}", strGroup.ToString());
-                sql.AppendFormat(" order by {0}", strOrder.ToString());
-
             }
             catch (Exception ex)
             {
                 logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
             }
+            finally
+            {
+                sql.AppendFormat(" Group By {0}", strGroup.ToString());
+                sql.AppendFormat(" Order By {0}", strOrder.ToString());
+            }
         }
         #endregion
 
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/Master/System/FrmSystem.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/Master/System/FrmSystem.cs	(revision 409)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/Master/System/FrmSystem.cs	(revision 410)
@@ -1394,14 +1394,18 @@
         {
             try
             {
+                // ã‚·ã‚¹ãƒ†ãƒ ç®¡ç�†è€…ã�¯ã�“ã�®ã�¾ã�¾è¡¨ç¤ºã�™ã‚‹
+                if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode) return;
+
+                // ã‚·ã‚¹ãƒ†ãƒ ç®¡ç�†è€…ä»¥å¤–ã�¯é�‹ç”¨å½¢æ…‹ãƒ•ãƒ©ã‚°ã‚’è¡¨ç¤ºã�—ã�ªã�„
+                groupBoxEx6.Visible = false;
+                groupBoxEx2.Height += 58;
+
                 // è£½å“�ç‰ˆType1ã�¯æ¶ˆè²»ç¨Žä»¥å¤–ã�®è¨­å®šã‚’æ¶ˆã�™
                 switch (ProductDefine.ProductType)
                 {
-                    case (int)ProductDefine.ProductTypeDef.Originals:
-                        groupBoxEx6.Visible = false;
-                        groupBoxEx2.Height += 58;
-                        break;
                     case (int)ProductDefine.ProductTypeDef.MassProductionType1:
+                        // è£½å“�ç‰ˆ
                         foreach (Control CurCtrl in groupBoxEx2.Controls)
                         {
                             if (CurCtrl.Name.Equals("label15")
@@ -1416,6 +1420,9 @@
                             CurCtrl.Visible = false;
                         }
                         break;
+                    case (int)ProductDefine.ProductTypeDef.Originals:
+                        // ã‚ªãƒªã‚¸ãƒŠãƒ«
+                        break;
                 }
             }
             catch (System.Exception ex)
Index: trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.cs	(revision 409)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.cs	(revision 410)
@@ -555,7 +555,7 @@
                                                                 { 0,
                                                                     0,
                                                                     0,
-                                                                    (int)ClsExcute.MaintenanceExecuteNo.SalesConfirm
+                                                                    0,
                                                                 },
         };
         #endregion
